diff --git a/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
index 718e4fbdfc0e..560e5d0765e6 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.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/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.4 2012/06/22 19:31:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.5 2012/06/24 18:39:16 ago Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ SRC_URI="${MIRROR}/glext.h.${GLEXT}.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 7ba40244f625..5b48f072d683 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,2 +1,3 @@
 DIST clamav-0.97.3.tar.gz 45793398 RMD160 9fee55f0b115fafa622e1092483e380afd0dc5b9 SHA1 263c7b8b7dc1536652ab64e32263d1c60e138655 SHA256 3a8cece5b7e6b15410f6b8f96ff5591b2c5a72f290ee8a28fefda44cb5ae7aba
 DIST clamav-0.97.4.tar.gz 48386114 RMD160 a8da7621d6c8bce05adf2521f082b3e5e94dd9e1 SHA1 56f90cf8a73acba8f97beca86b42c65c3923935d SHA256 958dd09c9da9ceb50c9e556b3ced9cbdf40e836d2bdc98286ce96e84fd4a5a53
+DIST clamav-0.97.5.tar.gz 14754465 RMD160 882294b892c7660669e9164918b1e08651b37d77 SHA1 1bb317ead4a1a677a9a11a063fc35a63f22309e9 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d
diff --git a/app-antivirus/clamav/clamav-0.97.5.ebuild b/app-antivirus/clamav/clamav-0.97.5.ebuild
new file mode 100644
index 000000000000..a0b30f08225b
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.97.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5.ebuild,v 1.1 2012/06/24 16:34:40 hanno Exp $
+
+EAPI=4
+
+inherit eutils autotools-utils flag-o-matic user
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toc
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-experimental
+		--enable-id-check
+		--with-dbdir=/var/lib/clamav
+		--with-system-tommath
+		$(use_enable bzip2)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
+		$(use_with iconv)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.rc clamd
+	newconfd "${FILESDIR}"/clamd.conf clamd
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/run/clamav
+	fowners clamav:clamav /var/run/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf
+		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+}
diff --git a/app-arch/hardlink++/Manifest b/app-arch/hardlink++/Manifest
deleted file mode 100644
index a5c2467f173a..000000000000
--- a/app-arch/hardlink++/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hardlink++-0.02.tgz 12228 RMD160 249b91706b0203945786c6a0ae25d1d9350b4384 SHA1 7a9cf4f7711cb30c1d0a49f4e0e7e7d06cf27000 SHA256 1f5c80fa3e62d1d3281c2649fde38dfb7700e8b29fedab54e42e83f3d2959182
diff --git a/app-arch/hardlink++/files/hardlink++-0.02-gcc-43-compile-fix.patch b/app-arch/hardlink++/files/hardlink++-0.02-gcc-43-compile-fix.patch
deleted file mode 100644
index 09615f017f65..000000000000
--- a/app-arch/hardlink++/files/hardlink++-0.02-gcc-43-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar hardlink++-0.02/hardlink.h
---- hardlink++-0.02.orig/hardlink.h	2008-12-11 12:57:24.563543862 -0800
-+++ hardlink++-0.02/hardlink.h	2008-12-11 13:02:56.091753425 -0800
-@@ -39,6 +39,7 @@
- 
- // C includes
- #include <unistd.h>
-+#include <stdlib.h>
- #include <dirent.h>
- #include <sys/stat.h>
- 
diff --git a/app-arch/hardlink++/files/hardlink++-0.02-gcc34-optimize-help.patch b/app-arch/hardlink++/files/hardlink++-0.02-gcc34-optimize-help.patch
deleted file mode 100644
index 5600947f192d..000000000000
--- a/app-arch/hardlink++/files/hardlink++-0.02-gcc34-optimize-help.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nuar hardlink++-0.02.orig/hardlink.cpp hardlink++-0.02/hardlink.cpp
---- hardlink++-0.02.orig/hardlink.cpp	2003-08-14 19:25:32.000000000 -0700
-+++ hardlink++-0.02/hardlink.cpp	2005-01-29 19:57:12.312478520 -0800
-@@ -171,7 +171,7 @@
- 
- // If two files have the same inode and are on the same device then they are
- // already hardlinked.
--bool isAlreadyHardlinked(
-+inline bool isAlreadyHardlinked(
-     const struct stat & st1,     // first file's status
-     const struct stat & st2 )    // second file's status
- {
-@@ -185,7 +185,7 @@
- 
- // Determine if a file is eligibile for hardlinking.  Files will only be
- // considered for hardlinking if this function returns true.
--bool eligibleForHardlink(
-+inline bool eligibleForHardlink(
-     const struct stat & st1,     // first file's status
-     const struct stat & st2 )    // second file's status
- {
-@@ -203,7 +203,7 @@
-         );
- }
- 
--bool getFileStatus( const string & filename, struct stat & st )
-+inline bool getFileStatus( const string & filename, struct stat & st )
- {
-     // Get the file status
-     if ( !lstat ( filename.c_str(), &st ) )
-diff -Nuar hardlink++-0.02.orig/hardlink.h hardlink++-0.02/hardlink.h
---- hardlink++-0.02.orig/hardlink.h	2003-08-14 17:24:59.000000000 -0700
-+++ hardlink++-0.02/hardlink.h	2005-01-29 19:55:40.699405824 -0800
-@@ -103,10 +103,10 @@
-     public:
- 	// cStats( void ):dircount(0) {}
- 
--	void foundDirectory( void ) { ++dircount; }
--	void foundRegularFile( void ) { ++regularfiles; }
--	void didComparison( void ) { ++comparisons; }
--	void foundHardlink( const off_t filesize  )
-+	inline void foundDirectory( void ) { ++dircount; }
-+	inline void foundRegularFile( void ) { ++regularfiles; }
-+	inline void didComparison( void ) { ++comparisons; }
-+	inline void foundHardlink( const off_t filesize  )
- 	{
- 	    ++hardlinked_previously;
- 	    bytes_saved_previously += filesize;
diff --git a/app-arch/hardlink++/hardlink++-0.02.ebuild b/app-arch/hardlink++/hardlink++-0.02.ebuild
deleted file mode 100644
index 96bc605b23ad..000000000000
--- a/app-arch/hardlink++/hardlink++-0.02.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/app-arch/hardlink++/hardlink++-0.02.ebuild,v 1.6 2012/05/19 12:33:12 ssuominen Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Save disk space by hardlinking identical files"
-HOMEPAGE="http://www.sodarock.com/hardlink/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc34-optimize-help.patch \
-		"${FILESDIR}"/${P}-gcc-43-compile-fix.patch
-
-	rm -f Makefile
-}
-
-src_compile() {
-	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} hardlink.cpp -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
-
-pkg_postinst() {
-	echo
-	ewarn "This codepath is dead. Migrate to app-arch/hardlink or"
-	ewarn "app-arch/hardlink-fedora instead."
-}
diff --git a/app-arch/lha/lha-114i-r7.ebuild b/app-arch/lha/lha-114i-r7.ebuild
index 70465d70c3d2..8ed10ad8ebb4 100644
--- a/app-arch/lha/lha-114i-r7.ebuild
+++ b/app-arch/lha/lha-114i-r7.ebuild
@@ -1,12 +1,11 @@
-# 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/app-arch/lha/lha-114i-r7.ebuild,v 1.9 2010/04/06 05:46:49 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r7.ebuild,v 1.10 2012/06/24 09:56:04 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
+inherit autotools eutils flag-o-matic
 
-inherit eutils autotools
-
-MY_P="${PN}-1.14i-ac20050924p1"
+MY_P=${PN}-1.14i-ac20050924p1
 
 DESCRIPTION="Utility for creating and opening lzh archives"
 HOMEPAGE="http://lha.sourceforge.jp"
@@ -17,27 +16,32 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-file-list-from-stdin.patch
+
+	sed -i -e '/^AM_C_PROTOTYPES/d' configure.ac || die #423125
+
 	eautoreconf
 }
 
 src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
 	if [[ ${CHOST} == *-interix* ]]; then
 		export ac_cv_header_inttypes_h=no
 		export ac_cv_func_iconv=no
 	fi
+
 	econf
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
+	emake \
+		DESTDIR="${D}" \
 		mandir="${EPREFIX}"/usr/share/man/ja \
-		install || die "emake failed."
+		install
+
 	dodoc ChangeLog Hacking_of_LHa
 }
diff --git a/app-arch/rpm/rpm-4.9.1.3.ebuild b/app-arch/rpm/rpm-4.9.1.3.ebuild
index de45719f4b48..43ab8e157ade 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.7 2012/06/08 17:57:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.8 2012/06/23 17:09:14 armin76 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-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 16081f0610c7..e697be01ac16 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,3 +2,4 @@ DIST xz-4.999.9beta.tar.gz 1037541 RMD160 1253ce01746c748c8549effa5041224044919c
 DIST xz-5.0.1.tar.gz 1236843 RMD160 b4ea20bc85024bbe11cf02941e2259a0d44b8a61 SHA1 a5e7b697d4413f79e36a6c5959ece3db40938c1c SHA256 3770b8872a4322b9502937b4781d523303bf193962c4822899fd3a210878fc80
 DIST xz-5.0.2.tar.gz 1241178 RMD160 9ae8c5021e02ac3122ef323575b7124a2bd20d90 SHA1 2f64e90df16a4cc143bf7ba5788953fac593f4f6 SHA256 57e979baaa40147dde1bbb284e3618f8f18b6532c932648bd57b5aee674b98a7
 DIST xz-5.0.3.tar.gz 1257140 RMD160 81f8a268dad49f46e4b4cacf9dd5bc23525170f5 SHA1 50ce842bea6519537457d9ad90d110a127656786 SHA256 10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf
+DIST xz-5.0.4.tar.gz 1281166 RMD160 1aab29e0c2c2a16e87a5b322f6c760824d275f45 SHA1 3e976d7715fde43422572c70f927bfdae56a94c3 SHA256 d67405798dad645965fe51cf4e40c23d1201fb234378d3c44f5a3787142b83b6
diff --git a/app-arch/xz-utils/xz-utils-5.0.4.ebuild b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
new file mode 100644
index 000000000000..9afde9b98127
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.1 2012/06/23 18:27:00 vapier Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="2"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+inherit eutils multilib
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://tukaani.org/xz/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+src_prepare() {
+	eautopoint
+	eautoreconf
+}
+fi
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	rm "${D}"/usr/share/doc/xz/COPYING* || die
+	mv "${D}"/usr/share/doc/{xz,${PF}} || die
+	prepalldocs
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+}
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 428785e7cd29..f613db23fffb 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1,4 @@
 DIST bacula-5.0.3.tar.gz 3800556 RMD160 0ae8f303b379daffdf09e4eab9b35182759add41 SHA1 4ced1c4f8984a063a1134b59968d163243017611 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4
 DIST bacula-5.2.5.tar.gz 4030327 RMD160 8de3f53bc5f053e66aff05721c5e246762ce260c SHA1 67e984128d15744118c70697641693f487310b64 SHA256 d731884b882178c597d8b7ef3f50c5622c87b1760d87133c24524faf43937f6d
 DIST bacula-5.2.6.tar.gz 4035050 RMD160 2494d9e1c9b8029c4ad699255023cab16c434903 SHA1 471cf224d5566e65a3a6cebd59d13c25f0825a8a SHA256 7cc60df4eccae0c71c26d2cdb4b1a2524f95e880913264cf4f4fcc7a5d949927
+DIST bacula-5.2.9.tar.gz 4104956 RMD160 5f3472beeb4dce28c5d65ac87bb6e30a84cc210b SHA1 6c24f8ab57cd140508967013938739cfca6a66e2 SHA256 f6421fa49007882f79963ed2544920d8aa4488ce28ca3ccd36d130adbf249e27
diff --git a/app-backup/bacula/bacula-5.2.9.ebuild b/app-backup/bacula/bacula-5.2.9.ebuild
new file mode 100644
index 000000000000..60cdd2f6b20e
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.9.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.1 2012/06/24 18:28:00 tomjbe Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit eutils multilib python qt4-r2 user
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	dev-libs/gmp
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql-base[threads] )
+		mysql? ( virtual/mysql )
+		sqlite3? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt4? (
+		x11-libs/qt-svg:4
+		x11-libs/qwt:5
+	)
+	ssl? ( dev-libs/openssl )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( >=sys-libs/readline-4.1 )
+	dev-libs/lzo
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt4; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		# USE=static only supported for bacula-clientonly
+		if use static; then
+			ewarn
+			ewarn "USE=static only supported together with USE=bacula-clientonly."
+			ewarn "Ignoring 'static' useflag."
+			ewarn
+		fi
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
+
+	# bug #310087
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
+
+	# stop build for errors in subdirs
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
+
+	# bug #328701
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-fix-static.patch
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf} \
+			$(use_with mysql) \
+			$(use_with sqlite3) \
+			$(use_with postgres postgresql) \
+			--enable-batch-insert"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt4 bat)"
+	fi
+
+	myconf="${myconf} \
+		--disable-tray-monitor \
+		$(use_with X x) \
+		$(use_with python) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--host=${CHOST} \
+		${myconf}
+	# correct configuration for QT based bat
+	if use qt4 ; then
+		pushd src/qt-console
+		eqmake4
+		popd
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/share/pixmaps
+	doins scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt4 && ! use static ; then
+		insinto /usr/share/pixmaps
+		doins src/qt-console/images/bat_icon.png
+		insinto /usr/share/applications
+		doins scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
+	if ! use qt4; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		# set database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite3 databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt4'."
+	einfo
+}
diff --git a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
index 295455e39a7e..3405b91d1262 100644
--- a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.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-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.4 2012/06/24 08:38:34 flameeyes Exp $
 
 EAPI=4
 
@@ -39,6 +39,10 @@ if [[ ${PV} == "9999" ]]; then
 	src_prepare() {
 		eautoreconf
 	}
+else
+	src_prepare() {
+		epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	}
 fi
 
 src_configure() {
diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
new file mode 100644
index 000000000000..67a8d1426d76
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
@@ -0,0 +1,42 @@
+Index: eid-mw-4.0.2/common/src/socket/socket.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
++++ eid-mw-4.0.2/common/src/socket/socket.cpp
+@@ -21,6 +21,10 @@
+ #include "../eiderrors.h"
+ #include <iostream>
+ 
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ namespace eIDMW
+ {
+ 
+Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
++++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #ifndef SOCKET_ERROR
+ #define SOCKET_ERROR -1
+ #endif
+Index: eid-mw-4.0.2/common/src/util.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/util.cpp
++++ eid-mw-4.0.2/common/src/util.cpp
+@@ -27,6 +27,10 @@
+ 
+ #include <stdlib.h>
+ 
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
diff --git a/app-crypt/gnupg/gnupg-2.0.19.ebuild b/app-crypt/gnupg/gnupg-2.0.19.ebuild
index 156264e17f23..9b7ebc56aef8 100644
--- a/app-crypt/gnupg/gnupg-2.0.19.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.19.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-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.5 2012/05/31 03:13:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.6 2012/06/24 10:39:27 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns bzip2 doc ldap nls readline static selinux smartcard usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
index 6b2a602813c8..7b48e2d6e88e 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999-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-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.5 2012/06/10 18:34:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.6 2012/06/24 15:13:05 ulm Exp $
 
 EAPI=4
 
@@ -191,10 +191,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi
 
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
 	if [[ ${PV##*.} = 9999 ]]; then
-		# These variables are not needed for building. We add them to
-		# configure options because they are stored in the Emacs binary
-		# and available in variable "system-configuration-options".
 		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
 	fi
 
@@ -230,8 +230,6 @@ src_compile() {
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
index 07693372de85..8425a1852b01 100644
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-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/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.2 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.3 2012/06/24 15:12:02 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -174,6 +174,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi
 
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -196,8 +200,6 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/app-editors/emacs/emacs-24.1.ebuild b/app-editors/emacs/emacs-24.1.ebuild
index 006b598681cb..44605eedb0c4 100644
--- a/app-editors/emacs/emacs-24.1.ebuild
+++ b/app-editors/emacs/emacs-24.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-editors/emacs/emacs-24.1.ebuild,v 1.3 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.4 2012/06/24 15:12:02 ulm Exp $
 
 EAPI=4
 
@@ -178,6 +178,10 @@ src_configure() {
 		myconf="${myconf} --without-x --without-ns"
 	fi
 
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -206,8 +210,6 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index c569df81c796..622218ffd9ee 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -3,6 +3,4 @@ DIST vile-9.4a.patch.gz 17204 RMD160 014224261fddff7d1216ec11773e237b98759ee1 SH
 DIST vile-9.4b.patch.gz 63382 RMD160 a489623a64bbd0d2f2318de9ed8308d22f1e101c SHA1 fe0d74e81ec0c1beb0e2e33dab82b8b30304b0d7 SHA256 ea497117967cd3d2af536bca3622578f56e63af52e3aba5733950e175d7f1027
 DIST vile-9.4c.patch.gz 8660 RMD160 c7cc75142a5b806c7e443cefa195d2d4547653aa SHA1 d6c0618062b5507aee052425ab716ddf8dcbe23a SHA256 cdf699023b77c51d360660f67fa34e720715b9a48e65344b20e9cff8e4a619f5
 DIST vile-9.4d.patch.gz 18117 RMD160 d1aaa203546046bb452701e4fc17148970bf6c82 SHA1 fadb4c736ba51f59ad56a0debf61ae6e940e3bff SHA256 6b84efc15f93158dcdab0ce23951de6a041a1dc181c6d84268634842bab0d686
-DIST vile-9.8e.tgz 2197935 RMD160 be8f3c34ad8c430e69f717692e44f800442735da SHA1 bc8f299e19cfc38f8aa0f7d438b06d04b5ef1b3c SHA256 d0ad1d42bb7118e941eb3cda40396abfe9a02e5306711485e6c2e70ec35fe427
-DIST vile-9.8f.tgz 2211083 RMD160 2cc206bc983d8d6c99b8eb7dca43f53826b18fdc SHA1 1c4c8881daae305407d148fc83cab7226d69536b SHA256 9dbd6f9c9935b9287f6e20d50755045f998e8f7b89eb737224942673f23f3340
 DIST vile-9.8g.tgz 2220840 RMD160 4ea510e33fc0c5397c4eab3304c8ea2301ff3842 SHA1 304e3fc706fb94393b6513e36c5a6826c314001f SHA256 7644909e2a64d85c6a3a45d1ad8bb18bce937119507fcc66d705aab8d4522be7
diff --git a/app-editors/vile/vile-9.8e.ebuild b/app-editors/vile/vile-9.8e.ebuild
deleted file mode 100644
index 8b9286d2f2ba..000000000000
--- a/app-editors/vile/vile-9.8e.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8e.ebuild,v 1.3 2011/12/13 21:57:44 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-admin/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/vile/vile-9.8f.ebuild b/app-editors/vile/vile-9.8f.ebuild
deleted file mode 100644
index 75efee843025..000000000000
--- a/app-editors/vile/vile-9.8f.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/app-editors/vile/vile-9.8f.ebuild,v 1.3 2012/02/10 18:01:31 grobian Exp $
-
-EAPI="4"
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-admin/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/vile/vile-9.8g.ebuild b/app-editors/vile/vile-9.8g.ebuild
index c51c230a9eae..bf3d48e04b7d 100644
--- a/app-editors/vile/vile-9.8g.ebuild
+++ b/app-editors/vile/vile-9.8g.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/vile/vile-9.8g.ebuild,v 1.1 2012/03/19 06:42:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.8g.ebuild,v 1.3 2012/06/24 10:38:11 ago Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index c569df81c796..622218ffd9ee 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -3,6 +3,4 @@ DIST vile-9.4a.patch.gz 17204 RMD160 014224261fddff7d1216ec11773e237b98759ee1 SH
 DIST vile-9.4b.patch.gz 63382 RMD160 a489623a64bbd0d2f2318de9ed8308d22f1e101c SHA1 fe0d74e81ec0c1beb0e2e33dab82b8b30304b0d7 SHA256 ea497117967cd3d2af536bca3622578f56e63af52e3aba5733950e175d7f1027
 DIST vile-9.4c.patch.gz 8660 RMD160 c7cc75142a5b806c7e443cefa195d2d4547653aa SHA1 d6c0618062b5507aee052425ab716ddf8dcbe23a SHA256 cdf699023b77c51d360660f67fa34e720715b9a48e65344b20e9cff8e4a619f5
 DIST vile-9.4d.patch.gz 18117 RMD160 d1aaa203546046bb452701e4fc17148970bf6c82 SHA1 fadb4c736ba51f59ad56a0debf61ae6e940e3bff SHA256 6b84efc15f93158dcdab0ce23951de6a041a1dc181c6d84268634842bab0d686
-DIST vile-9.8e.tgz 2197935 RMD160 be8f3c34ad8c430e69f717692e44f800442735da SHA1 bc8f299e19cfc38f8aa0f7d438b06d04b5ef1b3c SHA256 d0ad1d42bb7118e941eb3cda40396abfe9a02e5306711485e6c2e70ec35fe427
-DIST vile-9.8f.tgz 2211083 RMD160 2cc206bc983d8d6c99b8eb7dca43f53826b18fdc SHA1 1c4c8881daae305407d148fc83cab7226d69536b SHA256 9dbd6f9c9935b9287f6e20d50755045f998e8f7b89eb737224942673f23f3340
 DIST vile-9.8g.tgz 2220840 RMD160 4ea510e33fc0c5397c4eab3304c8ea2301ff3842 SHA1 304e3fc706fb94393b6513e36c5a6826c314001f SHA256 7644909e2a64d85c6a3a45d1ad8bb18bce937119507fcc66d705aab8d4522be7
diff --git a/app-editors/xvile/xvile-9.8e.ebuild b/app-editors/xvile/xvile-9.8e.ebuild
deleted file mode 100644
index 5dd3efa7936a..000000000000
--- a/app-editors/xvile/xvile-9.8e.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8e.ebuild,v 1.2 2011/12/13 22:07:53 radhermit Exp $
-
-EAPI=4
-
-inherit versionator
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
diff --git a/app-editors/xvile/xvile-9.8f.ebuild b/app-editors/xvile/xvile-9.8f.ebuild
deleted file mode 100644
index dd91c477d151..000000000000
--- a/app-editors/xvile/xvile-9.8f.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8f.ebuild,v 1.1 2011/12/13 22:02:55 radhermit Exp $
-
-EAPI="4"
-
-inherit versionator
-
-MY_P="${PN/x/}-${PV}"
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="http://invisible-island.net/vile/"
-SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )
-	=app-editors/vile-${PV}
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0
-	>=x11-libs/libICE-1.0.0
-	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-libs/libXpm-3.5.4.2
-	>=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-x \
-		$(use_with perl)
-}
-
-src_install() {
-	dobin xvile
-	dodoc CHANGES* README doc/*.doc
-	dohtml doc/*.html
-}
diff --git a/app-editors/xvile/xvile-9.8g.ebuild b/app-editors/xvile/xvile-9.8g.ebuild
index 4b9efa89e40b..2714a8ec3dfc 100644
--- a/app-editors/xvile/xvile-9.8g.ebuild
+++ b/app-editors/xvile/xvile-9.8g.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/xvile/xvile-9.8g.ebuild,v 1.1 2012/03/19 06:46:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.8g.ebuild,v 1.3 2012/06/24 10:38:35 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86"
 IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )
diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index 5380a02305af..1adcc9617845 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -5,11 +5,9 @@
 	<maintainer>
 		<email>alex.buell@munted.eu</email>
 		<name>Alex Buell</name>
-		<description>Proxy maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer>
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
-		<description>CC him on bugs</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/simh/simh-3.9.0.ebuild b/app-emulation/simh/simh-3.9.0-r1.ebuild
similarity index 93%
rename from app-emulation/simh/simh-3.9.0.ebuild
rename to app-emulation/simh/simh-3.9.0-r1.ebuild
index b1437d9a54a3..44261176fc4d 100644
--- a/app-emulation/simh/simh-3.9.0.ebuild
+++ b/app-emulation/simh/simh-3.9.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/app-emulation/simh/simh-3.9.0.ebuild,v 1.1 2012/05/19 09:52:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0-r1.ebuild,v 1.1 2012/06/23 19:10:37 xmw Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ src_compile() {
 
 src_install() {
 	for BINFILE in BIN/* ; do
-		newbin ${BINFILE} "simh-${BINFILE}"
+		newbin ${BINFILE} "simh-$(basename ${BINFILE})"
 	done
 
 	insinto /usr/share/simh
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index 30427936f3fb..f0df29534a24 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,2 +1 @@
 DIST thinkfan-0.8.0.tar.gz 38396 RMD160 7368dd22ea1dc71d5f0ee6a7ed98220652597757 SHA1 35ba6c8155759947b411d52e092c57664e9179d7 SHA256 aa4062bdb1114224c372afc3796ffd5b0ae40d4442fc17e15af8876d0e7885ed
-DIST thinkfan-0.8_alpha2.tar.gz 26571 RMD160 25b448b133ade35cc5af235dcfe52f8898275821 SHA1 64a10ff959e4e68e630b29c5f74a8159a507a70a SHA256 28f4ee9a833ef4d39258941c7bbcbd49ad6410479417bb4acf05e58da67f10eb
diff --git a/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild b/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild
deleted file mode 100644
index 5fe4817d1c35..000000000000
--- a/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8_alpha2.ebuild,v 1.3 2012/04/19 22:01:18 jdhore Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.3-makefile.patch \
-		"${FILESDIR}"/${PN}-0.7.3-openrc.patch
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
diff --git a/app-misc/ranger/ranger-1.5.4.ebuild b/app-misc/ranger/ranger-1.5.4.ebuild
index c36441f11f9a..a17ca188f09d 100644
--- a/app-misc/ranger/ranger-1.5.4.ebuild
+++ b/app-misc/ranger/ranger-1.5.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-misc/ranger/ranger-1.5.4.ebuild,v 1.2 2012/05/31 13:04:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.5.4.ebuild,v 1.3 2012/06/24 03:42:49 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6 3:3.1"
@@ -8,7 +8,7 @@ PYTHON_USE_WITH="ncurses"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.[45]"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="A vim-inspired file manager for the console"
 HOMEPAGE="http://ranger.nongnu.org/"
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
new file mode 100644
index 000000000000..063ac214ac0f
--- /dev/null
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.1 2012/06/24 03:42:02 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6 3:3.1"
+PYTHON_USE_WITH="ncurses"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+
+inherit distutils git-2
+
+EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="http://ranger.nongnu.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="virtual/pager"
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "Ranger has many optional dependencies to support enhanced file previews."
+	elog "See the README or homepage for more details."
+}
diff --git a/app-office/calligra-l10n/Manifest b/app-office/calligra-l10n/Manifest
index 0f910f41cfe1..2075eb462fb4 100644
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@@ -1,77 +1,51 @@
-DIST calligra-l10n-ca-2.4.1.tar.bz2 445839 RMD160 6808ee093919f2775d8fa67a7573d9a3a84a0c05 SHA1 c80dd3ab66288af837d751aea295fad6b79173fd SHA256 e91358b9c7370a252fc17aca8c04d5aae1e21949eecdf11b29ce099f7a0e15fa
 DIST calligra-l10n-ca-2.4.2.tar.bz2 439286 RMD160 4e051649c8171aa3bc80b4e4671ef0558320f6a4 SHA1 0b20c08f0ab6da0465da36526b1fad96e19f3e42 SHA256 58383b9bdb26f93979ff9a1979d4f3eaa471e3f88fdffd3c80428e4ecdd83ff2
 DIST calligra-l10n-ca-2.4.90.tar.bz2 433807 RMD160 88e229ff8fb8ea671f48da426eea4f00ac84daed SHA1 51f0a7253416100dead7420825527df4e4f24b44 SHA256 ff11bac7db1b0f93115d24a7fb8de72a1d5aff2099e8430d5c053b618b2cf7f7
-DIST calligra-l10n-ca@valencia-2.4.1.tar.bz2 272051 RMD160 8bf42feb86db2f2f66ac382c877bc20ad52987e2 SHA1 6da2ec3b13c5c76ec3779029298eed4c1d5dbc04 SHA256 47ffb1182e24f103d5ea2d458c247abe7e717e6d3030a2ec659766ef4338d55d
 DIST calligra-l10n-ca@valencia-2.4.2.tar.bz2 272019 RMD160 2a0e33e2efefca8f30face62aa7b9a6dda0ba832 SHA1 67e869ac84d5a0733cc0ee07aa49bb1f26f6a8bf SHA256 493973c7c4c00c347cdd646dcd5196133943039acc56a22e1cf3d74c6677bf88
 DIST calligra-l10n-ca@valencia-2.4.90.tar.bz2 372594 RMD160 2f8ce46067f7edd66663aa20eaefbfc5f2447489 SHA1 be16db6bab6863b401c09f2f59f844e1579f2947 SHA256 9af3ccb859181d1ddddeb6c6ec22c3755b89573200becd03f8e8a0518c4c7210
-DIST calligra-l10n-cs-2.4.1.tar.bz2 348465 RMD160 c1c87dfc56156ce1e3e33c119a1394e8a44cd386 SHA1 6ad3988a7b5ad42afffbb7b3e6754a2a15593c61 SHA256 66b39dba1035791ca3f384a345917a1a75c1f3d18d05f9e1418c31f4583f7df5
 DIST calligra-l10n-cs-2.4.2.tar.bz2 348260 RMD160 e4386af3188bdf6f3f7b5e8dc585ef94ee4f7065 SHA1 37ba652b4608e08b5b36241004e384b920732a39 SHA256 f16fe04dca8c1436b548f633f70822f06c8831fa74ae1037c6c39cc9a6a879bf
-DIST calligra-l10n-da-2.4.1.tar.bz2 547245 RMD160 4f0b8b00bed56d9293d729ff66ea2792919d4569 SHA1 925a0e32c9298abecb8518afd139674365d2b5b5 SHA256 7ff2f6120bd8ac686495ef9471cd212a0ff02b5bc96fe8d2b3323a3c1d75b096
 DIST calligra-l10n-da-2.4.2.tar.bz2 547357 RMD160 c2e0b3bbf07966f0cd1896dcf834102068238fe5 SHA1 6fb954850045678f4fd5442d9968e3453d8a6fe1 SHA256 3bd32f32c369a702b517065242a7eacf16c6de17d669c9da43c7a3e53a75c6c4
 DIST calligra-l10n-da-2.4.90.tar.bz2 543489 RMD160 09486c51fc64e642f75bf5dfce243ade7415404f SHA1 5ac9c60cdc77a2591f16f4b12be5b907a08e2f77 SHA256 f3d57ca2c19a38c45a7872ccf49025b66d77ed68424e21e48eb1cf4accbde8bf
-DIST calligra-l10n-de-2.4.1.tar.bz2 717222 RMD160 3d1f191669894b90b53e02330ed0deae6db9b5a7 SHA1 28fac826898d1af82e89c1312bfc4f6b7b7134c1 SHA256 1bdbe3886f907edf1bd590baef5d38f4bf35a6d07b687c078cd5e8156c8fe773
 DIST calligra-l10n-de-2.4.2.tar.bz2 717949 RMD160 aec14375b6ce34949ec415a66a7ea15730593208 SHA1 ea6b67a955bfbba0b096039cd9cc2a7bc6f62eca SHA256 7956e869fbad1d924c75b2f81fdea67096dea2dea654c62ff8eeb33c900b9134
 DIST calligra-l10n-de-2.4.90.tar.bz2 706666 RMD160 65381e50477a7814eff55dfe257f599639d97e61 SHA1 b2c6cbb5353a8140334cdd2b08e260edc93d9076 SHA256 08d8d9ec8bb29bbb9814a8f8deeda32ba686bb9d4d3fbaa6a0ce2a9e08979efd
-DIST calligra-l10n-el-2.4.1.tar.bz2 418084 RMD160 bde144c28c695d4e79ecfd3d3724b5a03cb442ca SHA1 b3af9583ad89413b40757875b608c960975084ad SHA256 0d8632a70cee7c4b4772662862edca9bc031c2e9dddce834d6cfc3ef1af8c000
 DIST calligra-l10n-el-2.4.2.tar.bz2 417911 RMD160 db7ced6e3e11e770bf3269b51946462a6f64c4f1 SHA1 12ba6920c75d8a6037b134b8c8b04ad4a380fdd4 SHA256 f0fb12aba3bde23d3926e7d14503663b14d31368c19bbb6718becc2bb451771d
 DIST calligra-l10n-el-2.4.90.tar.bz2 412482 RMD160 a743cc0582e77bd02a6893e51de911f6eedbddec SHA1 0f28309a7a145227603a955609f0ec57485408c6 SHA256 12cf9e6a0ac40e2d79ddc234ba1b215637fddfb39ecb3783610e816ac66f8e08
-DIST calligra-l10n-en_GB-2.4.1.tar.bz2 391616 RMD160 52d7318df610c5bbc1d4046e2ce8ed13ce2ec890 SHA1 a6a17ea973fdcf8c7b97cb9746c94c956e1b5f77 SHA256 c6ff94d764e2e8d25e2e82eb2238f53f010009a4372af7e6c71d73d0b68d08f9
 DIST calligra-l10n-en_GB-2.4.2.tar.bz2 391579 RMD160 2f6200739622de729aa7f99f5450c4aba4589648 SHA1 c175c35d46384ac6da4084e548904f1827d489fb SHA256 79508089b486298f191c5054ccb4c4d6e864a3c149334be8ac9cf6d7fe96efcd
 DIST calligra-l10n-en_GB-2.4.90.tar.bz2 387239 RMD160 14befdd64d6bde8390de663b7a4c4cb060fbee2b SHA1 52adeb89e1c827342cadc38b8075e42c882c9a02 SHA256 17ca5b5d4820265bf3a3e5cce652a8f4248711304e80e4880af6e0041f447b73
-DIST calligra-l10n-es-2.4.1.tar.bz2 4379808 RMD160 ec77d4422d6d824221a6bcd28aae121651bc7ebf SHA1 889ac2aa840615872bf55d069f7e617704872a5f SHA256 d7bf511c489a1c5295550d596a180e57528bfef24d4ee5da976b53971ee58055
 DIST calligra-l10n-es-2.4.2.tar.bz2 4378526 RMD160 e040638cd6939b0d8e611b5d1fef508cf2518427 SHA1 5080c79fa45535fbdcc8cc470e2a2f4cd5d1af86 SHA256 a7e624b663dcc9e5e970a8b6831d9cdcb7eaf73fd5c6e2cba4b52511827f73cf
 DIST calligra-l10n-es-2.4.90.tar.bz2 4372775 RMD160 4fe34f91c548b3620a3401e84093337c7d9d6bc7 SHA1 f80ccb88e065fc5685a4097867b402ea68f0f8a9 SHA256 4290e89e135792be95806dda59afb9df46aaaadd1d99441ca2a07a9a374ba4c3
-DIST calligra-l10n-et-2.4.1.tar.bz2 686462 RMD160 4ffb7ad12c2172c2a6b6e259aa89190687fbc910 SHA1 45a05296ce9bf067430b0cfb48efb64f9c093cd9 SHA256 9ae5f5a72448043ec5531abad4b62e5e7debcc79ae11649b73fede4653c500a4
 DIST calligra-l10n-et-2.4.2.tar.bz2 686583 RMD160 4d6c34c4f270d0f496b8e3deeb66db168f36ca60 SHA1 2664be246f284cd4a0d5f85f0840df13b8ca7409 SHA256 77549b15b7aaaf5cd79b9344a161063de3ddd08672cbe3eae2d2c601e0600906
 DIST calligra-l10n-et-2.4.90.tar.bz2 682563 RMD160 f2a34bb98eccc5ed24667a8e42a21b23b021acc9 SHA1 37fdf69a65245a56eaf703be9f219ed50ae7731c SHA256 f67d0a837332467666d1fd1ba1ddbe6e6ec96c4cf40492195fe261018a03eaae
-DIST calligra-l10n-fi-2.4.1.tar.bz2 404655 RMD160 357f95edec3a302338346ebd55502342d49a424b SHA1 bf6e9daed60c81e89681741cea131c6d2bde9467 SHA256 be8938bbea19794e55ba2d980084780a69fc7d3aa8a62a68af6a9257fbb865c9
 DIST calligra-l10n-fi-2.4.2.tar.bz2 404798 RMD160 ad165a09a01a8e0802582436177f8c1dc8c8149e SHA1 7cb4b60b966ff61afc9a310da2f6aaa39e22b74d SHA256 d2fd27568fe71cb56627928f5949ea0dd1cf7a96d171c64c32280c790ae8f959
 DIST calligra-l10n-fi-2.4.90.tar.bz2 396183 RMD160 6b2c35cdb9e3bcbadcdd97e63e2b70a559ee628c SHA1 d9da2bedac54d83f46c88eba97208b152a6bdf33 SHA256 1d117072ea4df236e566a87f0522d17b715b7917940c32320ae28e1c970a581d
-DIST calligra-l10n-fr-2.4.1.tar.bz2 5612296 RMD160 39afbdcd2d59d0e98c795a0a975bc965f6398a4e SHA1 b5549206def719a2d7afd4d4332c62b33dc88913 SHA256 6c86b8e69f4bec22e27e50b23f68459715138d922d850ccbff7cd0dca09a692d
 DIST calligra-l10n-fr-2.4.2.tar.bz2 5612463 RMD160 f0cdb53885ab8310660d781ebec3404eec82dc1a SHA1 1e917e287c060f4836082f7ffafb0e29d1183066 SHA256 77af170a2fe143cc986794c0282237f2d0003251b2ca8abef503cfd665e8e59b
 DIST calligra-l10n-fr-2.4.90.tar.bz2 5609284 RMD160 96c022df4fe9c7db40fc6fde355997788e91c86f SHA1 ce8ec9a99acef8ab508deab7736e4d2d0aa0eb79 SHA256 c306a10ca3f175e7eae8a7fe1c011317fe12577061a8c31f3c5cb77b92fdc444
-DIST calligra-l10n-hu-2.4.1.tar.bz2 447794 RMD160 e4bf3f907496fa4f9df924523ef9a7a4d1c78e37 SHA1 f0c865d090d0ad0a1e36bc6cdb19496d2872371b SHA256 c9825c7068eff7576ec90ebd3ef2a6c658c00d0f97a7e0e18db28db0b488087b
 DIST calligra-l10n-hu-2.4.2.tar.bz2 447760 RMD160 22ee67dd12ae153ce53fce9cab08760616218973 SHA1 50d49f111a03c58948f4cf9a885d46c520eba471 SHA256 d46332e92ecf5050ce630ce91d982ade430a15646dfaec906c63759371cbf0ef
 DIST calligra-l10n-hu-2.4.90.tar.bz2 435865 RMD160 1844bdf16668216bb84d3f316f30f603f037a90a SHA1 ca20ed565c683c99011918999ece5f89cbcce4ab SHA256 619c87eb183f5726b501d2bf6215e66980cf48cd6a4e5cf0dc3c20957d53be97
-DIST calligra-l10n-it-2.4.1.tar.bz2 626451 RMD160 2b8790361f9791d2919535447bb80deac7ee5652 SHA1 70bed20680b80d99acddf68c91ce5772c450517d SHA256 d19e62093c887c099de85abaa867b62efeef7fe4b02eb241ce2c7f5d8cdb24cb
 DIST calligra-l10n-it-2.4.2.tar.bz2 626408 RMD160 224a9e96548c832f3184e82c189c0f4ac53b80c2 SHA1 a77263f7f7a02a039e2161834bac74ba1db1b8b9 SHA256 8cf43e50cff18e12a40380267e626fbe51d5c20fbbd92e04826043462977ba9c
 DIST calligra-l10n-it-2.4.90.tar.bz2 559822 RMD160 1f99600c4e30b22b884f1d2c12a57c00905d06b6 SHA1 131564603fbb3d6cc5b16a2c9a62bf0e970322cd SHA256 5eaa1797d2d87ac88faeaf932ba9f9ece956f48baeaa17a323d4c319ab10d4ef
-DIST calligra-l10n-kk-2.4.1.tar.bz2 405347 RMD160 f3052b520d644e7da0de16e7f92eb9f5a0a01495 SHA1 08f8e5a6d977278a27367ef306d47508774ff4b2 SHA256 11c9635ea1cb1c02dbb914d713df965252da78d6eb213d266293a51eee52e31a
 DIST calligra-l10n-kk-2.4.2.tar.bz2 405525 RMD160 379c7baa1d055772086e9c5a5ed51be8aba93422 SHA1 46dc6d748fb3bd3e1080477bba96d0feae029206 SHA256 9be217dd8e3040c26a24260274f8b12b464168ec438adff62f99e00ca55b1685
 DIST calligra-l10n-kk-2.4.90.tar.bz2 400695 RMD160 ff4251ea83c7c270cb5f54cc91e1681d6d57e3c2 SHA1 8eceb4105b338285a3a0ad19a5c603e39f6a342e SHA256 3c0c98bb557a86044e9455cee76ff04a547d3be62e5c49da174d5d72e5abc728
-DIST calligra-l10n-nb-2.4.1.tar.bz2 367089 RMD160 5842220708fd2c0f81406697f185291a50447658 SHA1 064d2b8be1d551dd62197d64ab006cbbc6b0b563 SHA256 c7ec9e41c3f0bcef23dcf38dc5d6ee6ff796f91eaf7c466a61f68a84d262cfc5
 DIST calligra-l10n-nb-2.4.2.tar.bz2 367184 RMD160 51e3aa2764712c72aff8d45f6c448c3f6824dacc SHA1 0b635cd2e7cecfd9a03e81ac57f31d8322218373 SHA256 0f7e99dcc03a556f617918d5f34840353b8df951f1c26b62cfd6a94524f3a38c
 DIST calligra-l10n-nb-2.4.90.tar.bz2 356179 RMD160 f21b7d258df1dadd5087a572d9eac27d0bfdfc4c SHA1 ade47c0dc79756f863ec818f8ea8b5ba1d18448d SHA256 e9313ee78a7657aefa7358680bff6e988e4ab722fe44e6f5be8b3ccac348b176
-DIST calligra-l10n-nds-2.4.1.tar.bz2 413675 RMD160 ccaa5f4d5ed395e71e3407dec87b4c50daf1f1f9 SHA1 69c38219b76e24370f01c3138518708be0d2333e SHA256 a870724d97992877c32b98f56a31f0d6d504affd8668f61eb78ecf1e1c80280d
 DIST calligra-l10n-nds-2.4.2.tar.bz2 413593 RMD160 d64e6db9cca9901dd4e57caf0208abcba7948739 SHA1 8c6cfb9b63b547a474a8edc2b809967173d4435b SHA256 f7da2b4f174ff1f26d43fb985eb2cc2f9b146c27df551095a33417dc0bbbbbfe
 DIST calligra-l10n-nds-2.4.90.tar.bz2 406346 RMD160 aba893b26902a9317d8004184a599ba39a866fbf SHA1 ae81dc2a4ebba8c5cfefed8ab9f015b15cf9822c SHA256 37a4e1754ba37647864a9e23199455306476281623be5c2135269d5759963164
-DIST calligra-l10n-nl-2.4.1.tar.bz2 3101210 RMD160 4381586f0bcd13230c300178cf4d1c59e371a72b SHA1 785d393e2159090e43f4d446971f5ca35fa98ead SHA256 0925debb77f789fda3cdbf3f5eecbc5a9fd7bef5a1d820bc12d190f6a3f6a751
 DIST calligra-l10n-nl-2.4.2.tar.bz2 3101289 RMD160 ba3aea5698348dadea0b4ce0eebb53c0c7814a73 SHA1 abe49752c08037a753ed5c0b0f00a8ebe71e4140 SHA256 3f55de4c0987554bdacc5f083fa4710b33f913ff243ddfc5776c5db0cc3e70a5
 DIST calligra-l10n-nl-2.4.90.tar.bz2 2596129 RMD160 0c1355abf21135e42c415ef45beac0bee0c675a8 SHA1 bff36b30810ff7ddd9a75b581acff5309588c8c4 SHA256 b8479091f8e7a854bc873cc7993bb4c7ebf8a3415f4ecfc4e52f9e303da24bde
-DIST calligra-l10n-pl-2.4.1.tar.bz2 430451 RMD160 e66040cc785568b38be1b2c8a21e6735f7ccb63b SHA1 34fe40f2cca6a607755cdf4aeae67c7cf67ff5cc SHA256 4c6994bbca6741c039960a388a2ae1ae491f02430b5b4d84dfff47997b9d6fe8
 DIST calligra-l10n-pl-2.4.2.tar.bz2 430288 RMD160 eb09c4b312a40fcf4c4b251f995e1bf53c7832b6 SHA1 5e1e162be0a00b2b08644319f76d88fa000d10d0 SHA256 1e9aee796c2ae7f47359d1f2527801c920f568d16765631e7c4ebcd3998fe1a8
 DIST calligra-l10n-pl-2.4.90.tar.bz2 424546 RMD160 103d3795b349a978bd14f2762668a3de286d54fc SHA1 576a2b7563188d92c073928976362a2e06fad008 SHA256 d2ef8d791eed17a3fd8aed0e1fe321dcba67e73da34e5239a1b46f093ee4e810
-DIST calligra-l10n-pt-2.4.1.tar.bz2 661702 RMD160 e7393b6c305fc01ffb58857fb8ee3c35fa33bd5e SHA1 692fe295df06b7d35baac97b51c9edaa7a47a6a2 SHA256 b86800b4775943d8e8c55874bb54f956ecdbe7932871ff12c8788a33cb61529f
 DIST calligra-l10n-pt-2.4.2.tar.bz2 661473 RMD160 f97598e0eada512c3370be622f652bb41d86f5db SHA1 dca99fc4547c3b2e86cd8daeb00dba0edd6d5578 SHA256 07c78220eafdcc4bd650658e969ed44ce63e3c727f4d20af80adcf4472290247
 DIST calligra-l10n-pt-2.4.90.tar.bz2 645009 RMD160 aeeda91d774fd724ff7e99ee61ee48c57df00805 SHA1 ae6008cd2848576beeed4a2d01495f3a7e104300 SHA256 6f651c59d52a05633cc7ff536dc326f50d2214aef9aa98a0e71487ce50e8eed2
-DIST calligra-l10n-pt_BR-2.4.1.tar.bz2 740021 RMD160 7da5bc5803c23632578cbe97272f2d75eab04688 SHA1 e036fc7d5cf6f872200fdd32b1699ef99cb436ed SHA256 9f9886a2af809e1cd19a89d806e78e241341565b78c25e874d61b2198c9c4fc5
 DIST calligra-l10n-pt_BR-2.4.2.tar.bz2 739210 RMD160 e982c86e290c3e7535b2ee195120949dc3f56bd0 SHA1 4bed4f26618134dde280ba27bfa2b0d9ddc57513 SHA256 5e63db1dc1333d8bdebe2552b72c1aec0be0c80f3e8e6bb2672d904af7a0f9a8
 DIST calligra-l10n-pt_BR-2.4.90.tar.bz2 705814 RMD160 370ed3f01c6bda73d7f402244943b1aed03f26f3 SHA1 0e75f852125261234fad3336948728e34842fd7f SHA256 6d60c436140682bd72712a6f6d61015d83b4a9826d8fd635378fcf1e2276b93d
-DIST calligra-l10n-ru-2.4.1.tar.bz2 582180 RMD160 fdc249e2ad8735dfb3c0f73585340e79123f7c31 SHA1 6ed334c95bae2bafbe197348ffec33a6368612d2 SHA256 8bcb3589cb47c39d723f3403d178ab408ebf07572f58f96d9e917293aa09fb91
 DIST calligra-l10n-ru-2.4.2.tar.bz2 582200 RMD160 30852077bf2e8d098beb91e162dde699ac7e9a50 SHA1 357ef2510c72735672227dc2ce862415be4adc81 SHA256 8a7e54ebfaa9dedb2ac599373e4ae08588f1bf5889223b4e4cbe152782c25046
 DIST calligra-l10n-ru-2.4.90.tar.bz2 578671 RMD160 4c9377fe948e12f0a8e99c3bec094f9c7c1954be SHA1 5148cfbe5cc02df3e6e7c843cf7efb331e8c5e3b SHA256 98081e0483a36faf28d15eb5c7d8535e4308c4664feaf0f1c722fdb93dc35132
-DIST calligra-l10n-sk-2.4.1.tar.bz2 367375 RMD160 7a81f6b2cc57db0c66b2754d8bb788b620e2edeb SHA1 04a24876644e9064515fbc7648dc2cb58a743de0 SHA256 c50c19c00a30e8105fcf3664ebeb8873c16dad078ed2272589040801f07db5eb
 DIST calligra-l10n-sk-2.4.2.tar.bz2 368330 RMD160 8fa2a1ba63baeb13f40c922da0f730d3e3d87003 SHA1 6507364b71899d4239144254e3987e0d202d5b96 SHA256 0667b38d459b4998c9eb1968e0807d809a73e77eda23fa5588ee128e5ad1f5e3
 DIST calligra-l10n-sk-2.4.90.tar.bz2 359337 RMD160 17e95ba9ed9cefe9fb335a2f548814e55904ef0a SHA1 0beb14e4207fa92c34d04b3d12dac4da757641e3 SHA256 31e6f85ea572a360a2b43c36e098e5b7ec7b2f114bedddb9a3c478766ad6922b
-DIST calligra-l10n-sv-2.4.1.tar.bz2 2047139 RMD160 5aa92135df6b6839fbcb4b2581eab03c97fe5159 SHA1 349ffc026eaa91804b38f07b485c697e70d98ae6 SHA256 90cda0ea4b307009d33ea1a69e3c31a47fc597b226d0a405d3021f025258d3ac
 DIST calligra-l10n-sv-2.4.2.tar.bz2 2047227 RMD160 b4f77397b11d219f4b244be6a316399bd1ffa052 SHA1 b08e235ecf25e4ef0d77a3616c0dea6dd0e816d3 SHA256 064435b6e06171ae7c0988403f545fcbaf632d1f3d4304847906d3969b05dc58
 DIST calligra-l10n-sv-2.4.90.tar.bz2 2043562 RMD160 1afe8e94d54175ff56b535900323ae9d4a9baba6 SHA1 06d4c5eafee37d5d6415dbaaa8a19a5c5e0d92d1 SHA256 23d5c3f01259c487f31d48b27afe43f1fb06d77aa2987264f7384e29f973723e
-DIST calligra-l10n-uk-2.4.1.tar.bz2 2126067 RMD160 c13c86e901bf9aa995ff9d43862b0918373498a9 SHA1 a4e04b541dfc0645dc158e60156b42aa60b29716 SHA256 f8d0641484383cca74180862e8ea87f173d2b2a930f3a389d4676bf4f15460bd
 DIST calligra-l10n-uk-2.4.2.tar.bz2 2126141 RMD160 e1793bc8f10c1238dfa2a52679f4104675b219cd SHA1 9f74f3399af76b092137a92a075a6e7f6a7b9344 SHA256 2a0124159d0ca3b0ca5806180659c3deb1d3b044cdfffabc2994df93de3989b9
 DIST calligra-l10n-uk-2.4.90.tar.bz2 2122732 RMD160 944adb97a9627f10c24fe31de27adbe334cdc082 SHA1 04543d15ca3cc75804bea3bc785c0915ad918c65 SHA256 8e4d5980140f49c64a4147ec1c93c7089671d1194aaf1de31b8b33ffe9c8fd99
-DIST calligra-l10n-zh_CN-2.4.1.tar.bz2 346321 RMD160 6b55670d5469c284a4f8b35b0f56cb8d6dfca86d SHA1 2635cc9cad771e550a55f54da1fc3c34cc94c652 SHA256 a64c051bf3388eb6c7b863d6dbe0a40c3ae0934acd8b9bd10519fe2e4fa8f49d
 DIST calligra-l10n-zh_CN-2.4.2.tar.bz2 346242 RMD160 6fbcca974de718b2d30325b3fb0d9793ca7677b0 SHA1 f935d413b6988805565e24b06f77722963e7fdcf SHA256 1631ffddf8538b1a70033f774713f43cd6bbd4ee5eecf3f5d2a1c634b0813d84
 DIST calligra-l10n-zh_CN-2.4.90.tar.bz2 343139 RMD160 8eeb88d460c7df801720f4154656d54ec19b486b SHA1 a56e865653679600f9e676722cfb97345ed33679 SHA256 97f5a8754d30631fd1cd7dfd64c9fb9d24accac108e84ee542b898a69ad824be
-DIST calligra-l10n-zh_TW-2.4.1.tar.bz2 386393 RMD160 839342417ff79bcda503ed048e2e956fa1dab929 SHA1 c4386d1fc6a35be3b41d4e49b37cec7a2c27c8e4 SHA256 f5763e13aac69659f1379a2e51f565791ee07d32a2df30c724415e4be0704ecd
 DIST calligra-l10n-zh_TW-2.4.2.tar.bz2 386400 RMD160 1cb6741cdb5c117dcae5b9d05e6241681d43555e SHA1 b4f9ff646563aee6634ab27d878c6fb0e3dbcf3a SHA256 294d50e1398e94f36b045c7ec21ac2ef63950e3ccc67864e50bca39b4216d4e1
 DIST calligra-l10n-zh_TW-2.4.90.tar.bz2 382931 RMD160 e59bc623e631d0a4d3a462c2aa9361f6fe40ca71 SHA1 0d949525f206596192d9a5e52a3a04438331f23a SHA256 27c999d53d964e420068d79171e90054e6621eff435c9b0f912a190e9d6b3788
diff --git a/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild b/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
deleted file mode 100644
index 83d775e0fe7f..000000000000
--- a/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild,v 1.3 2012/06/01 17:14:36 scarabeus Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)
-	)
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild b/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild
index dbb379bef9e1..c63c5d91d974 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.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/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild,v 1.1 2012/06/01 17:18:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.2.ebuild,v 1.2 2012/06/24 14:07:00 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND="!app-office/koffice-l10n"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index bf46d2df8ef2..4bda43003011 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,2 @@
-DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
 DIST calligra-2.4.2.tar.bz2 119318136 RMD160 e884a4e68ea65d24166f3992488413283894c3d8 SHA1 d44a6b321b0b90122b86e074785546f4a2b0d066 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193
-DIST calligra-2.4.90.tar.bz2 119019871 RMD160 8cca77e8b57dfa70e379623dbf09a5f1976a5cd9 SHA1 69c44af5234af420e3eadaf3d2cd0c4b79865370 SHA256 2a83cbfabc357bc93df7cc6d470a1537c962a9a068ade06f34d6cb1cd6a79c4a
-DIST calligra-2.4.91.tar.bz2 119281251 RMD160 642939226080ceb21e25bc986765c8a6ead63392 SHA1 60ea0883c743cec3eb7a9a223498c406652029a4 SHA256 c38042f2151f593ef5e8928ba45c58b52e3af40038fe7ae1333c69907b86a338
+DIST calligra-2.4.91.tar.bz2 119280417 RMD160 723f8c8331203e910f416b5ca0993f85c244cf34 SHA1 299c965a521e93137320ef094e9d68819f3d6001 SHA256 720fdae969102744677b633bae81d31488f8b49d4cfba89ca848faef5764a8a9
diff --git a/app-office/calligra/calligra-2.4.1.ebuild b/app-office/calligra/calligra-2.4.1.ebuild
deleted file mode 100644
index 5c8fd57f08ab..000000000000
--- a/app-office/calligra/calligra-2.4.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.7 2012/06/06 13:39:04 scarabeus Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-EGIT_BRANCH="calligra/2.4"
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.8.1-r1
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-2.4.2.ebuild b/app-office/calligra/calligra-2.4.2.ebuild
index c983fe262c8b..068c8242f0eb 100644
--- a/app-office/calligra/calligra-2.4.2.ebuild
+++ b/app-office/calligra/calligra-2.4.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/app-office/calligra/calligra-2.4.2.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.6 2012/06/24 14:05:50 ago Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.calligra.org/"
 
 LICENSE="GPL-2"
 SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
@@ -121,6 +121,8 @@ PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
 RESTRICT=test
 # bug 394273
 
+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft
 
diff --git a/app-office/calligra/calligra-2.4.49.9999.ebuild b/app-office/calligra/calligra-2.4.49.9999.ebuild
index 35ae166aad1e..975f479f115a 100644
--- a/app-office/calligra/calligra-2.4.49.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.49.9999.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/calligra/calligra-2.4.49.9999.ebuild,v 1.4 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.5 2012/06/23 22:44:01 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -121,6 +121,8 @@ PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
 RESTRICT=test
 # bug 394273
 
+PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
+
 src_configure() {
 	local cal_ft
 
diff --git a/app-office/calligra/calligra-2.4.90.ebuild b/app-office/calligra/calligra-2.4.90.ebuild
deleted file mode 100644
index bf1c0c19e70d..000000000000
--- a/app-office/calligra/calligra-2.4.90.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v 1.5 2012/06/06 13:39:04 scarabeus Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
-	2.[456789].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.8.1-r1
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-2.4.91.ebuild b/app-office/calligra/calligra-2.4.91.ebuild
index 11a2e1851b49..447d2bdc2983 100644
--- a/app-office/calligra/calligra-2.4.91.ebuild
+++ b/app-office/calligra/calligra-2.4.91.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/calligra/calligra-2.4.91.ebuild,v 1.1 2012/06/16 13:50:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.91.ebuild,v 1.2 2012/06/24 11:46:39 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -102,7 +102,7 @@ RDEPEND="
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler
@@ -189,7 +189,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index c9987ddbe216..8e23b915bdde 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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/calligra/calligra-9999.ebuild,v 1.23 2012/06/06 13:39:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.24 2012/06/24 11:46:39 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -42,7 +42,7 @@ SLOT="4"
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"
 
@@ -102,7 +102,7 @@ RDEPEND="
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
+	opengtl? ( >=media-libs/opengtl-0.9.15 )
 	openexr? ( media-libs/openexr )
 	pdf? (
 		app-text/poppler
@@ -189,7 +189,7 @@ src_configure() {
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
diff --git a/app-office/calligra/files/calligra-2.4.2-marble.patch b/app-office/calligra/files/calligra-2.4.2-marble.patch
new file mode 100644
index 000000000000..c8c620a6bd94
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.4.2-marble.patch
@@ -0,0 +1,185 @@
+From 94aa2f51a338c017339129b6c90c2d9da665e528 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Sun, 24 Jun 2012 00:05:21 +0200
+Subject: [PATCH] Marble includes need prefix marble/
+
+---
+ .../forms/widgets/mapbrowser/MapBrowserWidget.cpp  |    2 +-
+ .../forms/widgets/mapbrowser/MapBrowserWidget.h    |    2 +-
+ libs/main/rdf/KoRdfLocation.cpp                    |    4 ++--
+ libs/main/rdf/KoRdfLocationEditWidget.cpp          |    4 ++--
+ plugins/mapshape/MapShape.cpp                      |    2 +-
+ .../mapshape/MapShapeCommandChangeProjection.cpp   |    2 +-
+ plugins/mapshape/MapShapeCommandContentChange.cpp  |    2 +-
+ plugins/mapshape/MapShapeCommandSetMapThemeId.cpp  |    2 +-
+ plugins/mapshape/MapShapeCommandZoom.cpp           |    2 +-
+ plugins/mapshape/MapTool.cpp                       |    2 +-
+ plugins/reporting/maps/KoReportItemMaps.cpp        |    4 ++--
+ plugins/reporting/maps/KoReportItemMaps.h          |    2 +-
+ 12 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
+index 0983141..bd0cf29 100644
+--- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
++++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
+@@ -19,7 +19,7 @@
+ 
+ 
+ #include "MapBrowserWidget.h"
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ #include <QPointF>
+ #include <KDebug>
+ 
+diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+index b699ca2..977eb5e 100644
+--- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
++++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
+@@ -21,7 +21,7 @@
+ #ifndef MAPBROWSERWIDGET_H
+ #define MAPBROWSERWIDGET_H
+ 
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ 
+ #include "widgetfactory.h"
+ #include "container.h"
+diff --git a/libs/main/rdf/KoRdfLocation.cpp b/libs/main/rdf/KoRdfLocation.cpp
+index b51d0a2..1511806 100644
+--- a/libs/main/rdf/KoRdfLocation.cpp
++++ b/libs/main/rdf/KoRdfLocation.cpp
+@@ -32,8 +32,8 @@
+ // marble for geolocation
+ // #ifdef CAN_USE_MARBLE
+ // #include <LatLonEdit.h>
+-// #include <MarbleWidget.h>
+-// #include <MarbleWidgetInputHandler.h>
++// #include <marble/MarbleWidget.h>
++// #include <marble/MarbleWidgetInputHandler.h>
+ // #endif
+ 
+ using namespace Soprano;
+diff --git a/libs/main/rdf/KoRdfLocationEditWidget.cpp b/libs/main/rdf/KoRdfLocationEditWidget.cpp
+index 0436570..13bb23d 100644
+--- a/libs/main/rdf/KoRdfLocationEditWidget.cpp
++++ b/libs/main/rdf/KoRdfLocationEditWidget.cpp
+@@ -26,8 +26,8 @@
+ // marble for geolocation
+ // #ifdef CAN_USE_MARBLE
+ // #include <LatLonEdit.h>
+-// #include <MarbleWidget.h>
+-// #include <MarbleWidgetInputHandler.h>
++// #include <marble/MarbleWidget.h>
++// #include <marble/MarbleWidgetInputHandler.h>
+ // #endif
+ 
+ class KoRdfLocationEditWidgetPrivate
+diff --git a/plugins/mapshape/MapShape.cpp b/plugins/mapshape/MapShape.cpp
+index 06e3b0a..e8ec0c6 100644
+--- a/plugins/mapshape/MapShape.cpp
++++ b/plugins/mapshape/MapShape.cpp
+@@ -21,7 +21,7 @@
+ 
+ 
+ #include "MapShape.h"
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ #include <MarbleModel.h>
+ #include <KoImageData.h>
+ #include <KoXmlNS.h>
+diff --git a/plugins/mapshape/MapShapeCommandChangeProjection.cpp b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
+index b41ed6b..9800725 100644
+--- a/plugins/mapshape/MapShapeCommandChangeProjection.cpp
++++ b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandChangeProjection.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ 
+ MapShapeCommandChangeProjection::MapShapeCommandChangeProjection(MapShape * shape, Marble::Projection projection, KUndo2Command *parent)
+ : KUndo2Command(parent)
+diff --git a/plugins/mapshape/MapShapeCommandContentChange.cpp b/plugins/mapshape/MapShapeCommandContentChange.cpp
+index 52fc500..2ed8802 100644
+--- a/plugins/mapshape/MapShapeCommandContentChange.cpp
++++ b/plugins/mapshape/MapShapeCommandContentChange.cpp
+@@ -20,7 +20,7 @@
+ #include "MapShapeCommandContentChange.h"
+ 
+ #include "MapShape.h"
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ #include <QPointF>
+ 
+ 
+diff --git a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
+index 78c245a..4ca53ef 100644
+--- a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
++++ b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandSetMapThemeId.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ 
+ MapShapeCommandSetMapThemeId::MapShapeCommandSetMapThemeId(MapShape * shape, const QString& mapThemeId, KUndo2Command *parent)
+ : KUndo2Command(parent)
+diff --git a/plugins/mapshape/MapShapeCommandZoom.cpp b/plugins/mapshape/MapShapeCommandZoom.cpp
+index edeb6d7..6d0f897 100644
+--- a/plugins/mapshape/MapShapeCommandZoom.cpp
++++ b/plugins/mapshape/MapShapeCommandZoom.cpp
+@@ -21,7 +21,7 @@
+ #include "MapShapeCommandZoom.h"
+ #include "MapShape.h"
+ 
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ 
+ 
+ MapShapeCommandZoom::MapShapeCommandZoom(MapShape * shape, signed int value, KUndo2Command *parent)
+diff --git a/plugins/mapshape/MapTool.cpp b/plugins/mapshape/MapTool.cpp
+index 3733271..0f4bfca 100644
+--- a/plugins/mapshape/MapTool.cpp
++++ b/plugins/mapshape/MapTool.cpp
+@@ -42,7 +42,7 @@
+ #include <KoPointerEvent.h>
+ 
+ #include <MarbleControlBox.h>
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ #include <GeoDataLatLonAltBox.h>
+ 
+ 
+diff --git a/plugins/reporting/maps/KoReportItemMaps.cpp b/plugins/reporting/maps/KoReportItemMaps.cpp
+index 01969c3..ba2fa73 100644
+--- a/plugins/reporting/maps/KoReportItemMaps.cpp
++++ b/plugins/reporting/maps/KoReportItemMaps.cpp
+@@ -25,8 +25,8 @@
+ #include <QBuffer>
+ #include <kcodecs.h>
+ #include <renderobjects.h>
+-#include <MarbleWidget.h>
+-#include <MarbleModel.h>
++#include <marble/MarbleWidget.h>
++#include <marble/MarbleModel.h>
+ #include <QImage>
+ #include <QPixmap>
+ #include <sys/socket.h>
+diff --git a/plugins/reporting/maps/KoReportItemMaps.h b/plugins/reporting/maps/KoReportItemMaps.h
+index d07f2d0..a838a70 100644
+--- a/plugins/reporting/maps/KoReportItemMaps.h
++++ b/plugins/reporting/maps/KoReportItemMaps.h
+@@ -29,7 +29,7 @@
+ #include <kdebug.h>
+ #include <klocalizedstring.h>
+ #include <kglobalsettings.h>
+-#include <MarbleWidget.h>
++#include <marble/MarbleWidget.h>
+ #include <RdfForward.h>
+ #include <QMap>
+ 
+-- 
+1.7.9.2
+
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 4f2f812324ca..ceadda0793b7 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="mso">Enable support for various MS Office TM file formats</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/karbon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/karbon/files/karbon-2.3.3-newlibwpd.patch b/app-office/karbon/files/karbon-2.3.3-newlibwpd.patch
deleted file mode 100644
index e9c074fac39c..000000000000
--- a/app-office/karbon/files/karbon-2.3.3-newlibwpd.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-Description: porting to pwg & conversion as SVG output
- Reduced version of Calligra's commit 9cda7aed2ea103750172e61f5c800a474913fa59:
-    make wpg import compile again, simplified code by using high level libwpg function to convert to svg,
-    this makes us less dependent on libwpg API changes, code works with old an new libwpg versions
-Author: Jan Hambrecht <jaham@gmx.net>
-Author: Pino Toscano <pino@kde.org>
-Last-Update: 2011-02-06
-Applied-Upstream: Calligra 2.4
-
---- a/filters/karbon/wpg/import/CMakeLists.txt
-+++ b/filters/karbon/wpg/import/CMakeLists.txt
-@@ -4,13 +4,11 @@
- 
- set(wpgimport_PART_SRCS 
- WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/filters/karbon/wpg/import/WPGImport.cpp
-+++ b/filters/karbon/wpg/import/WPGImport.cpp
-@@ -23,6 +23,7 @@
- #include <QBuffer>
- #include <QByteArray>
- #include <QString>
-+#include <QFile>
- 
- #include <kdebug.h>
- #include <KoFilterChain.h>
-@@ -37,11 +38,9 @@
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +55,12 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
--
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,6 +82,7 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
-@@ -113,51 +91,21 @@
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
--    }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
--
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
--
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
--
--    // we are done!
--    delete storeout;
- 
-+    delete input;
-+ 
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-+    }
-+    outputFile.write(output.cstr());
-+    outputFile.close();
-+ 
-     return KoFilter::OK;
- }
---- a/filters/karbon/wpg/import/karbon_wpg_import.desktop
-+++ b/filters/karbon/wpg/import/karbon_wpg_import.desktop
-@@ -42,7 +42,7 @@
- Name[x-test]=xxKarbon WPG Import Filterxx
- Name[zh_CN]=Karbon WPG 导入过滤器
- Name[zh_TW]=Karbon WPG 匯入過濾程式
--X-KDE-Export=application/vnd.oasis.opendocument.graphics
-+X-KDE-Export=image/svg+xml
- X-KDE-Import=application/x-wpg
- X-KDE-Weight=1
- X-KDE-Library=wpgimport
diff --git a/app-office/karbon/karbon-2.3.3-r1.ebuild b/app-office/karbon/karbon-2.3.3-r1.ebuild
deleted file mode 100644
index 07a47fea1e6e..000000000000
--- a/app-office/karbon/karbon-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-2.3.3-r1.ebuild,v 1.3 2012/03/09 09:08:47 phajdan.jr Exp $
-
-EAPI=4
-KMNAME="koffice"
-KMMODULE="${PN}"
-
-inherit kde4-meta
-
-DESCRIPTION="KOffice vector drawing application."
-
-KEYWORDS="amd64 x86"
-IUSE="+pstoedit wpg"
-
-DEPEND="
-	media-libs/libart_lgpl
-	pstoedit? ( media-gfx/pstoedit )
-	wpg? ( app-text/libwpg[tools(+)] )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="filters/${KMMODULE}"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/
-	filters/
-"
-KMLOADLIBS="koffice-libs"
-
-PATCHES=( "${FILESDIR}/${P}-newlibwpd.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpg)
-		$(cmake-utils_use_with pstoedit)
-	)
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/karbon/metadata.xml b/app-office/karbon/metadata.xml
deleted file mode 100644
index 7df9172c6747..000000000000
--- a/app-office/karbon/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="wpg">Build wordperfect image support.</flag>
-	<flag name="pstoedit">Build support for PDF and PS import.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/kexi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/kexi/files/kexi-2.3.0-link.patch b/app-office/kexi/files/kexi-2.3.0-link.patch
deleted file mode 100644
index f2da1448f676..000000000000
--- a/app-office/kexi/files/kexi-2.3.0-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN kexi-2.3.0.orig/kexi/migration/kspread/CMakeLists.txt kexi-2.3.0/kexi/migration/kspread/CMakeLists.txt
---- kexi-2.3.0.orig/kexi/migration/kspread/CMakeLists.txt	2010-12-29 11:36:25.000000000 +0100
-+++ kexi-2.3.0/kexi/migration/kspread/CMakeLists.txt	2011-01-09 01:26:42.838672101 +0100
-@@ -18,6 +18,7 @@
-     kexidb
-     kexiutils
-     kspreadcommon
-+    kspreadodf
- )
- 
- install(TARGETS keximigrate_kspread DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/app-office/kexi/kexi-2.3.3.ebuild b/app-office/kexi/kexi-2.3.3.ebuild
deleted file mode 100644
index 1601e5c4dc52..000000000000
--- a/app-office/kexi/kexi-2.3.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-2.3.3.ebuild,v 1.3 2011/05/09 23:12:16 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-inherit kde4-meta
-
-DESCRIPTION="KOffice integrated environment for database management"
-KEYWORDS="amd64 x86"
-IUSE="freetds mysql postgres reports xbase"
-
-DEPEND="
-	sys-libs/readline
-	app-arch/bzip2
-	~app-office/kspread-${PV}:${SLOT}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-libs/libpqxx-3 )
-	reports? ( ~app-office/koffice-libs-${PV}:${SLOT}[reports] )
-	xbase? ( dev-db/xbase )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.3.0-link.patch )
-
-KMLOADLIBS="koffice-libs"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	kspread/
-"
-
-src_configure() {
-	 mycmakeargs=(
-		-DWITH_WEBFORMS=Off
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with postgres Pqxx)
-		$(cmake-utils_use_with xbase XBase)
-		-DBUILD_kexi=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
deleted file mode 100644
index f2fe5870a428..000000000000
--- a/app-office/kexi/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="xbase">Build support for xbase db types.</flag>
-	<flag name="reports">Enable the reports koffice module in kchart, also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/koffice-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/koffice-data/koffice-data-2.3.3.ebuild b/app-office/koffice-data/koffice-data-2.3.3.ebuild
deleted file mode 100644
index cddccad85013..000000000000
--- a/app-office/koffice-data/koffice-data-2.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-2.3.3.ebuild,v 1.3 2011/05/09 23:12:27 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice data files"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/lcms:0"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="pics/
-	servicetypes/
-	templates/"
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/CMakeLists.txt
-	doc/koffice.desktop"
diff --git a/app-office/koffice-data/metadata.xml b/app-office/koffice-data/metadata.xml
deleted file mode 100644
index 5e26be069245..000000000000
--- a/app-office/koffice-data/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-office/koffice-l10n/Manifest b/app-office/koffice-l10n/Manifest
deleted file mode 100644
index c52066ecaffb..000000000000
--- a/app-office/koffice-l10n/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-DIST koffice-l10n-ca-2.3.2.tar.bz2 602048 RMD160 adae6cda90c797cbeaacfee1a51b81a309ce4d3e SHA1 cd2ce0d719b68a762ee4a4c3f312427de9229614 SHA256 63d732a7051f85fc83b790f356249198b731bd8c4c964494e62efb898ac27b08
-DIST koffice-l10n-ca@valencia-2.3.2.tar.bz2 333533 RMD160 468aa26dd2866711e00b450ee665afc7c2ba7e81 SHA1 87db015b8a8480955ae989cf4a17490aefabdae6 SHA256 f151b1dda67a1de6ff193e10f27dd6a7efc41c3b91128340d47c01a1cf26bea9
-DIST koffice-l10n-da-2.3.2.tar.bz2 574454 RMD160 57d60925d8064e061ecf0c0e65fa9f193d0364e1 SHA1 1a25131cd37e15e40fa6518146370f907abf2cfb SHA256 6342a80bf73d3f07f29af62a1775088590f057602dcf453887bab1f300d753e0
-DIST koffice-l10n-de-2.3.2.tar.bz2 1309655 RMD160 39b4ef117361d0d8bad4c174be56ef2254314558 SHA1 b7cc12c2081c01c5dd46dc7879dc55237d6ae8d2 SHA256 b5f4fce969baeebf90eccdc58767b5cb064bd8b12e4e17772274c5e26839d0f5
-DIST koffice-l10n-el-2.3.2.tar.bz2 344811 RMD160 71d68d73e89ace9301ac9c87850084a8b7b42a58 SHA1 cfc6f1c4dffec7e7094b56d70c494ef66a096fd0 SHA256 99d53f5c6f6199ce34b72c8c91f6c4d630fd9b39c9c38b4e0b691c7931120d01
-DIST koffice-l10n-en_GB-2.3.2.tar.bz2 335363 RMD160 a51fab0a9cfb4ee5ad8895ecf17ac0900778011b SHA1 a73dcbbd8263889da3cb58f496c74fc9a110b590 SHA256 7a0b4f2cedcc8354fddeba6f8397dfb22875fb0d17580f885dfa676c91835752
-DIST koffice-l10n-es-2.3.2.tar.bz2 6265591 RMD160 8fc6de2874831848edc5297af7be880e1d94abe8 SHA1 583bdc5ec58fbb70713030f6517ad85fa8423c62 SHA256 fbe126e61d7a9b8169636b631fde8647871b5aac79d53455cca3b060acc418ec
-DIST koffice-l10n-et-2.3.2.tar.bz2 732317 RMD160 60585cb33a75cd8fa3d49050b6a06108cd95283c SHA1 eb8e59252aa8bcd8b6d10b1055c10927a6c2d9e9 SHA256 e4220a8059dc8c7cc59d0a494b962e05191fee1e9801d2685b5084bc3faccd8d
-DIST koffice-l10n-fr-2.3.2.tar.bz2 6343416 RMD160 5ca4b7076dbc17cf57d01f3066958bd5d812817d SHA1 f59118355ecb963fb234a14cfb5ab518df22f1fe SHA256 64a6d568a2549e5ff8a26db7b2eb49c3664f43528fdd149bb2f76d8fd44fa640
-DIST koffice-l10n-gl-2.3.2.tar.bz2 366933 RMD160 4a5b7bc0b612c158594d73a43f4a770349014647 SHA1 7b07e05ce1ea7f5acbbb583ebae6e9203b8f79ed SHA256 85d28d5bcf432d38d0b075568522579b6e78067ee84a1fff10b88270645a133b
-DIST koffice-l10n-hu-2.3.2.tar.bz2 383914 RMD160 a52a5a1f1dfa6e045146d7fe9255a89d55322d6d SHA1 21b7959cc7a0db2354d789c782cb903ab692777c SHA256 ca55e7b8f5506b81d85528415785d3ad3dbd238c2b47973efa0965cc091792e1
-DIST koffice-l10n-it-2.3.2.tar.bz2 709685 RMD160 5f8e683d0bbe55dbdaf9db2b3e8070a3138c37c9 SHA1 e9ed5010461176656c34d19e4f2bc9bac2b3cfb1 SHA256 20ef49e34c514113396b2169912e83cbbff73279e830ad6181cd9a7e7d810a54
-DIST koffice-l10n-ja-2.3.2.tar.bz2 301144 RMD160 c6384cecc6bc40cb829cfe51681423af030cedf9 SHA1 0c4ae0395e2918f6c27330fe0bc544ce0d203e28 SHA256 beb0a98efde0b00249e240d70ebd5154fb86e8aab3585b4b8fda7d2d465cc270
-DIST koffice-l10n-kk-2.3.2.tar.bz2 333005 RMD160 f3d7b79447878a115c686147ba89c047866fded3 SHA1 4a3d01179e94d93e14704e80f9bc3dbd002e7d51 SHA256 545f1498ac85bc908da68c561f7b634cd915e1b850a5c618ba17663983f532ee
-DIST koffice-l10n-nb-2.3.2.tar.bz2 329542 RMD160 19d0b9a61f707e94bf16d38e43a3a47b25293503 SHA1 30f6bd5bbeb73fd72cd77c349bfcfb8296df4a7a SHA256 6a2cce45cbb63bb3915536c62199f18e0c3bde6cfac47bbc2ad147bcd40674c1
-DIST koffice-l10n-nds-2.3.2.tar.bz2 971904 RMD160 fa11c1cdbda67801742bc301637f1fe75527cb6e SHA1 0fa6515a49c59dcbd31ad38690757d5af9f19cdf SHA256 b247f3f10f0e058b60f87d4d8f459fe2a52e9a2517da48db3a0d80ff9f52c8a1
-DIST koffice-l10n-nl-2.3.2.tar.bz2 2787702 RMD160 3840535f89dbe11d62faf535c6119e51aa393dff SHA1 b05f583bb6143efeeec13ce722b91acb7a7167eb SHA256 ed5502c936dfbd751b6565d708e1cd80649f91b61ade630f05484f66e6266050
-DIST koffice-l10n-pl-2.3.2.tar.bz2 357991 RMD160 a1355cdce5d4a889820d38bc471f1faa1df89d24 SHA1 9ab2e029f4355a6324e48a1f1c26bf67c83400d2 SHA256 956241204bed7749efbc84d3574f1354d1860cf96ee92f4bb86ef0262c158dad
-DIST koffice-l10n-pt-2.3.2.tar.bz2 609615 RMD160 f4ea221a78d0320e13ea3ffbad91e27a0ae33320 SHA1 131782e538508b05e9d735e147792b271a100f91 SHA256 15144bd1d1d688e66d0ae5b3ee0ef133ad7e508f6bea7006b227e841ecca7ec7
-DIST koffice-l10n-pt_BR-2.3.2.tar.bz2 848370 RMD160 c75bc38ec08aab90018154e440a27304f249a103 SHA1 b7b258f2e2271ee5314f427dd42d1b3f572321ec SHA256 e1f340a87bc35cc1c73226ec2b8fed6264a2e69c3e18435f6c4460079dd02f81
-DIST koffice-l10n-ru-2.3.2.tar.bz2 558576 RMD160 932385267473db9f42d94b920cf5d9b6eab78238 SHA1 5cf50feb17049580b3916ea3102a3a23ef2e9138 SHA256 93e1eddb925dd5e739a4fa704069394c8519c242e5c1b7ba5bf412633d4d790c
-DIST koffice-l10n-sv-2.3.2.tar.bz2 2447736 RMD160 ce0255b1a286c188dacc07caa83e75f28a8bceb1 SHA1 700252dceff2ac35e20ee7fef3c9117c40964bff SHA256 c27afbef13d051ee46945e3aeb7c27e48d6ece22c347255e5586e3248158e2f6
-DIST koffice-l10n-tr-2.3.2.tar.bz2 322498 RMD160 88f5167f1daa48e2b4ee8a0ee6614d6fada5b53b SHA1 6301537a3caca81dd73ec797cedc679e8a159566 SHA256 a0107580d85989c5fa5369a230b7dce4cb77c494ee6590c78c9390de3f2f3a90
-DIST koffice-l10n-uk-2.3.2.tar.bz2 651651 RMD160 f75511e773a422cb101238a60c5a49c250e3caf9 SHA1 135976ae7b3ee13fe25e2ffd8282aa01cb0bfc56 SHA256 bef2a455478605b4f3bcc625586543135e19fe3cd25167b7896bb76af295aa10
-DIST koffice-l10n-wa-2.3.2.tar.bz2 331887 RMD160 b44a0a36ae992a53de217187c5cb554af4a34bf3 SHA1 275d54fc1b951f919a684eeeabefc4b779c120b5 SHA256 1071423fae2f97cb3b2ff988f9df9ed779221376a44872b55b058b9a84330131
-DIST koffice-l10n-zh_CN-2.3.2.tar.bz2 292546 RMD160 51058f5482d57152928bf091babb02d8ba6529fa SHA1 cce8483c29129343d783fe9f5f82108adb6a5207 SHA256 f138f8ae823ae437d4fdac4fe72558370c28a8741668f09f82de96cfafc30be2
-DIST koffice-l10n-zh_TW-2.3.2.tar.bz2 334294 RMD160 9c917ac639b548243f629a6f6dd102b8d32edf0d SHA1 8f73db090fca711143fce296eb66bc95c7b0f513 SHA256 b72276fd2fc9bebcce8f741bbe7da1c9bc70980ea3608a87898ad5aeb73d1be2
diff --git a/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild b/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild
deleted file mode 100644
index 42c4e5e3c4ea..000000000000
--- a/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-l10n/koffice-l10n-2.3.3.ebuild,v 1.3 2011/05/09 23:12:35 hwoarang Exp $
-
-EAPI=3
-
-inherit kde4-base
-
-DESCRIPTION="KOffice localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia da de el en_GB es et fr gl hu it ja kk nb nds nl pl pt pt_BR
-	ru sv tr uk wa zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/koffice-${PV}/${PN}/"
-SRC_URI=""
-SLOT="2"
-
-# special case for 2.3.3: l10n files are named 2.3.2, no change
-MY_PV="2.3.2"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${MY_PV}.tar.bz2 )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${MY_PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	mycmakeargs="${mycmakeargs} -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)"
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/koffice-libs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch b/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
deleted file mode 100644
index 9cd8c68acd29..000000000000
--- a/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From accabfeac22e869e5a248a764a64096d107e4c7c Mon Sep 17 00:00:00 2001
-From: Michael Jansen <kde@michael-jansen.biz>
-Date: Mon, 11 Jul 2011 00:27:38 +0200
-Subject: [PATCH] Fix build with QT 4.8.
-
-KDChartBackgroundAttributes.cpp:153:26: error: ambiguous overload for 'operator<<' in '((QDebug*)((QDebug*)operator<<(QDebug, const QBrush&)(((const QBrush&)((const QBrush*)(& KDChart::BackgroundAttributes::brush() const())))).QDebug::operator<<(((const char*)"pixmapmode=")))->QDebug::operator<<(((int)((const KDChart::BackgroundAttributes*)ba)->KDChart::BackgroundAttributes::pixmapMode())))->QDebug::operator<<(((const char*)"pixmap=")) << KDChart::BackgroundAttributes::pixmap() const()'
-
-It does not know if it should convert QPixmap to QVariant or QBrush before dumping it into
-qDebug(). It happens because with qt4.8 qvariant is included implictely with klocale.h over
-qlocale.h. Which was not the case before qt4.8.
-
-Related:     QTBUG-19764: Please add QDebug operator for QPixmap
----
- .../kdchart/src/KDChartBackgroundAttributes.cpp    |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-index 2dc4974..9f2990a 100644
---- a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,9 @@
- 
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#if !defined(QT_NO_DEBUG_STREAM)
-+#include <QVariant>
-+#endif
- 
- #include <KDABLibFakes>
- 
-@@ -150,7 +153,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba)
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
-+	<< "pixmap="<<QVariant(ba.pixmap())
- 	<< ")";
-     return dbg;
- }
--- 
-1.7.3.4
-
diff --git a/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild b/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
deleted file mode 100644
index 972f2ea2343a..000000000000
--- a/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r1.ebuild,v 1.4 2011/10/01 03:21:29 phajdan.jr Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries"
-KEYWORDS="amd64 x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-RESTRICT=test
-# bug 385025
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DWITH_Spnav=OFF
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-
-	# this is not useful and only leads to error messages, bug 381955
-	rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
-}
diff --git a/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild b/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
deleted file mode 100644
index 1c19ea361182..000000000000
--- a/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild,v 1.1 2012/02/07 21:10:50 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-RESTRICT=test
-# bug 385025
-
-PATCHES=( "${FILESDIR}/${P}-qt48.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DWITH_Spnav=OFF
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-
-	# this is not useful and only leads to error messages, bug 381955
-	rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
-}
diff --git a/app-office/koffice-libs/metadata.xml b/app-office/koffice-libs/metadata.xml
deleted file mode 100644
index ae2b8e7f33cc..000000000000
--- a/app-office/koffice-libs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-<flag name="reports">Enable the reports koffice module in kchart, also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/koffice-meta/koffice-meta-2.3.3.ebuild b/app-office/koffice-meta/koffice-meta-2.3.3.ebuild
deleted file mode 100644
index 7a1128581625..000000000000
--- a/app-office/koffice-meta/koffice-meta-2.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-2.3.3.ebuild,v 1.3 2011/05/09 23:12:55 hwoarang Exp $
-
-EAPI=3
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages"
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="nls reports"
-
-RDEPEND="
-	>=app-office/karbon-${PV}:${SLOT}
-	>=app-office/kexi-${PV}:${SLOT}
-	>=app-office/koffice-data-${PV}:${SLOT}
-	>=app-office/koffice-libs-${PV}:${SLOT}[reports?]
-	>=app-office/kpresenter-${PV}:${SLOT}
-	>=app-office/krita-${PV}:${SLOT}
-	>=app-office/kspread-${PV}:${SLOT}
-	>=app-office/kword-${PV}:${SLOT}
-	nls? ( >=app-office/koffice-l10n-${PV}:${SLOT} )
-	reports? ( >=app-office/kplato-${PV}:${SLOT} )
-	!app-office/kchart
-"
diff --git a/app-office/koffice-meta/metadata.xml b/app-office/koffice-meta/metadata.xml
deleted file mode 100644
index a7d5a82ed7b0..000000000000
--- a/app-office/koffice-meta/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="reports">Enable the reports koffice module in kchart,
-		also used by kplato and kexi</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/kplato/Manifest b/app-office/kplato/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/kplato/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/kplato/kplato-2.3.3.ebuild b/app-office/kplato/kplato-2.3.3.ebuild
deleted file mode 100644
index 76aac617c74b..000000000000
--- a/app-office/kplato/kplato-2.3.3.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/app-office/kplato/kplato-2.3.3.ebuild,v 1.5 2012/04/03 20:00:55 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION="KOffice project management application"
-
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-DEPEND="~app-office/koffice-libs-${PV}:${SLOT}[reports]"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-	plugins/chartshape/kdchart
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	kdgantt/
-"
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with python PythonLibs)
-		-DBUILD_kplato=ON
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kplato/metadata.xml b/app-office/kplato/metadata.xml
deleted file mode 100644
index 5e26be069245..000000000000
--- a/app-office/kplato/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/kpresenter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/kpresenter/kpresenter-2.3.3.ebuild b/app-office/kpresenter/kpresenter-2.3.3.ebuild
deleted file mode 100644
index 468fc78d0cf6..000000000000
--- a/app-office/kpresenter/kpresenter-2.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.3.3.ebuild,v 1.3 2011/05/09 23:13:13 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice presentation program"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.35.0"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/libmsooxml/
-	filters/kspread/xlsx/
-	libs/
-"
-KMEXTRA="
-	filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kpresenter/metadata.xml b/app-office/kpresenter/metadata.xml
deleted file mode 100644
index 5e26be069245..000000000000
--- a/app-office/kpresenter/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd> 
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/krita/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/krita/files/krita-2.3.1-linkx11.patch b/app-office/krita/files/krita-2.3.1-linkx11.patch
deleted file mode 100644
index 3ec09f54e16f..000000000000
--- a/app-office/krita/files/krita-2.3.1-linkx11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN krita-2.3.1.orig/krita/ui/CMakeLists.txt krita-2.3.1/krita/ui/CMakeLists.txt
---- krita-2.3.1.orig/krita/ui/CMakeLists.txt	2011-01-15 21:07:11.000000000 +0100
-+++ krita-2.3.1/krita/ui/CMakeLists.txt	2011-01-23 18:56:56.824000099 +0100
-@@ -216,6 +216,10 @@
- 
- target_link_libraries(kritaui ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
- 
-+IF(Q_WS_X11)
-+    TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
-+ENDIF(Q_WS_X11)
-+
- if(HAVE_OPENGL)
-     target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES})
-     set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};${QT_QTOPENGL_LIBRARY}")
diff --git a/app-office/krita/krita-2.3.3.ebuild b/app-office/krita/krita-2.3.3.ebuild
deleted file mode 100644
index da5b136de211..000000000000
--- a/app-office/krita/krita-2.3.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.3.ebuild,v 1.4 2011/08/08 21:04:33 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KOffice image manipulation program."
-
-KEYWORDS="amd64 x86"
-IUSE="gmm +kdcraw openexr +pdf +tiff"
-
-DEPEND="
-	>=app-office/koffice-libs-${PV}:${SLOT}[openexr=]
-	>=dev-cpp/eigen-2.0.3:2
-	>=media-libs/qimageblitz-0.0.4
-	>=media-gfx/exiv2-0.16
-	sci-libs/fftw:3.0
-	sys-devel/gcc[openmp]
-	gmm? ( sci-mathematics/gmm )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	opengl? ( media-libs/glew )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.1-linkx11.patch" )
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	libs/
-"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		-DWITH_Exiv2=ON
-		-DWITH_FFTW3=ON
-		-DWITH_JPEG=ON
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with gmm)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with kdcraw)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with opengl GLEW)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/krita/metadata.xml b/app-office/krita/metadata.xml
deleted file mode 100644
index 29d13c870ccb..000000000000
--- a/app-office/krita/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="gmm">Enable library for sparse, dense and skyline matrices.</flag>
-	<flag name="kdcraw">Enable KDE image manipulating interface.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
deleted file mode 100644
index 71c2eb1cca8f..000000000000
--- a/app-office/kspread/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
diff --git a/app-office/kspread/kspread-2.3.3.ebuild b/app-office/kspread/kspread-2.3.3.ebuild
deleted file mode 100644
index 1c4e151356b5..000000000000
--- a/app-office/kspread/kspread-2.3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-2.3.3.ebuild,v 1.3 2011/05/09 23:13:33 hwoarang Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice spreadsheet application"
-
-KEYWORDS="amd64 x86"
-IUSE="+solver"
-
-DEPEND="
-	dev-cpp/eigen:2
-	solver? ( sci-libs/gsl )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	kchart/
-	interfaces/
-	libs/
-	filters/
-	plugins/
-"
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso"
-
-KMLOADLIBS="koffice-libs"
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_Eigen2=ON
-		$(cmake-utils_use_with solver GSL)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kspread/metadata.xml b/app-office/kspread/metadata.xml
deleted file mode 100644
index d892583d2116..000000000000
--- a/app-office/kspread/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="solver">Use solver extension for solving lingebra and others.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
deleted file mode 100644
index 5942d0098f63..000000000000
--- a/app-office/kword/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
-DIST kword-2.3.3-libwpg02.patch.bz2 9107 RMD160 0e6aa2afe288d692ee4cf569dd58451d329eaabc SHA1 c6c94c15d6b84e79a1369bf9314141ec57ecff7c SHA256 edf3187dc5f93bba7eac834a296baaee11a65d603a82b8d5544a16c916a9980e
diff --git a/app-office/kword/kword-2.3.3-r1.ebuild b/app-office/kword/kword-2.3.3-r1.ebuild
deleted file mode 100644
index da0d8c4867c7..000000000000
--- a/app-office/kword/kword-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3-r1.ebuild,v 1.6 2011/12/26 14:34:56 maekke Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice word processor"
-
-KEYWORDS="amd64 x86"
-IUSE="wpd"
-
-SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2"
-
-DEPEND="
-	dev-libs/glib
-	gnome-extra/libgsf
-	wpd? ( app-text/libwpd )
-"
-RDEPEND="${DEPEND}
-	!app-text/wv2
-"
-
-PATCHES=( "${DISTDIR}/${PN}-2.3.3-libwpg02.patch.bz2" )
-
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/
-	kspread/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-RESTRICT="test"
-# bug 387791
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpd)
-		-DWITH_DCMTK=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kword/kword-2.3.3.ebuild b/app-office/kword/kword-2.3.3.ebuild
deleted file mode 100644
index 39722b0c4a57..000000000000
--- a/app-office/kword/kword-2.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3.ebuild,v 1.4 2011/10/20 20:17:17 dilfridge Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice word processor"
-
-KEYWORDS="amd64 x86"
-IUSE="wpd"
-
-DEPEND="
-	wpd? ( app-text/libwpd )
-"
-RDEPEND="${DEPEND}
-	!app-text/wv2
-"
-
-KMEXTRA="filters/${KMMODULE}/
-	filters/libmso/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	filters/
-	kspread/
-	libs/
-	plugins/
-"
-
-KMLOADLIBS="koffice-libs"
-
-RESTRICT="test"
-# bug 387791
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with wpd)
-		-DWITH_DCMTK=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
diff --git a/app-office/kword/metadata.xml b/app-office/kword/metadata.xml
deleted file mode 100644
index c4568b031f03..000000000000
--- a/app-office/kword/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="wpd">Build wordperfect document support.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-text/kiwix/Manifest b/app-text/kiwix/Manifest
deleted file mode 100644
index 6d0ba1a01734..000000000000
--- a/app-text/kiwix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kiwix-0.9-beta5-src.tar.bz2 3422705 RMD160 0997307c08fad60ca8d4e0ccc52dca8dc387d685 SHA1 7c9dd3d7c1f32544e837c80ce8057eff30caecff SHA256 5f9ff04e02114a95ca4849a8dc3cff91f54d01bc80ce9d2ca6dee1fcbba6a739
diff --git a/app-text/kiwix/kiwix-0.9_beta5.ebuild b/app-text/kiwix/kiwix-0.9_beta5.ebuild
deleted file mode 100644
index cfeb453cc956..000000000000
--- a/app-text/kiwix/kiwix-0.9_beta5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/kiwix-0.9_beta5.ebuild,v 1.2 2012/05/04 03:33:15 jdhore Exp $
-
-EAPI=3
-
-inherit multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)-src"
-
-DESCRIPTION="A ZIM reader, especially for offline web content retrieved from Wikipedia"
-HOMEPAGE="http://www.kiwix.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# No upgrade from 0.9_alpha possible, because a directory would be replaced
-# with a symlink, which PMS section 13.4 forbids. Bug #326685.
-RDEPEND="app-arch/xz-utils
-	=dev-cpp/clucene-0.9*
-	dev-lang/perl
-	dev-libs/icu
-	dev-libs/xapian
-	net-libs/libmicrohttpd
-	=net-libs/xulrunner-1.9*
-	>=net-misc/aria2-1.10
-	!!<app-text/kiwix-0.9_beta"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGELOG README || die
-}
diff --git a/app-text/pandoc/files/pandoc-1.9.4.1-file-enc.patch b/app-text/pandoc/files/pandoc-1.9.4.1-file-enc.patch
new file mode 100644
index 000000000000..4464f3a8d60d
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.9.4.1-file-enc.patch
@@ -0,0 +1,132 @@
+commit cc39c313c5eeedf8bc1693e0d80a510891a7fc4d
+Author: John MacFarlane <jgm@berkeley.edu>
+Date:   Fri Jun 22 21:24:02 2012 +0200
+
+    Don't encode/decode file paths if base >= 4.5.
+    
+    Prior to base 4.5 (and perhaps earlier - check), filepaths and command
+    line arguments were treated as unencoded lists of bytes, not unicode
+    strings, so we had to work around that by encoding and decoding
+    them.  This commit adds CPP checks for base 4.5 that disable the
+    encoding/decoding.
+    
+    Fixes a bug with multilingual filenames when pandoc was compiled
+    with ghc 7.4. Closes #540.
+
+Upstream-bug: https://github.com/jgm/pandoc/issues/540
+Reported-by: Nikolaj Sjujskij <sterkrig@myopera.com>
+diff --git a/src/Text/Pandoc/UTF8.hs b/src/Text/Pandoc/UTF8.hs
+index 4af1558..929bc3f 100644
+--- a/src/Text/Pandoc/UTF8.hs
++++ b/src/Text/Pandoc/UTF8.hs
+@@ -39,21 +39,25 @@ module Text.Pandoc.UTF8 ( readFile
+ 
+ where
+ 
++#if MIN_VERSION_base(4,5,0)
++#else
++import Codec.Binary.UTF8.String (encodeString)
++#endif
++
+ #if MIN_VERSION_base(4,2,0)
+ 
+ import System.IO hiding (readFile, writeFile, getContents,
+                           putStr, putStrLn, hPutStr, hPutStrLn, hGetContents)
+ import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn )
+-import Codec.Binary.UTF8.String (encodeString)
+ import qualified System.IO as IO
+ 
+ readFile :: FilePath -> IO String
+ readFile f = do
+-  h <- openFile (encodeString f) ReadMode
++  h <- openFile (encodePath f) ReadMode
+   hGetContents h
+ 
+ writeFile :: FilePath -> String -> IO ()
+-writeFile f s = withFile (encodeString f) WriteMode $ \h -> hPutStr h s
++writeFile f s = withFile (encodePath f) WriteMode $ \h -> hPutStr h s
+ 
+ getContents :: IO String
+ getContents = hGetContents stdin
+@@ -76,7 +80,6 @@ hGetContents h = hSetEncoding h utf8_bom >> IO.hGetContents h
+ #else
+ 
+ import qualified Data.ByteString as B
+-import Codec.Binary.UTF8.String (encodeString)
+ import Data.ByteString.UTF8 (toString, fromString)
+ import Prelude hiding (readFile, writeFile, getContents, putStr, putStrLn)
+ import System.IO (Handle)
+@@ -91,10 +94,10 @@ stripBOM s | bom `B.isPrefixOf` s = B.drop 3 s
+ stripBOM s = s
+ 
+ readFile :: FilePath -> IO String
+-readFile = liftM (toString . stripBOM) . B.readFile . encodeString
++readFile = liftM (toString . stripBOM) . B.readFile . encodePath
+ 
+ writeFile :: FilePath -> String -> IO ()
+-writeFile f = B.writeFile (encodeString f) . fromString
++writeFile f = B.writeFile (encodePath f) . fromString
+ 
+ getContents :: IO String
+ getContents = liftM (toString . stripBOM) B.getContents
+@@ -115,3 +118,10 @@ hPutStrLn :: Handle -> String -> IO ()
+ hPutStrLn h s = hPutStr h (s ++ "\n")
+ 
+ #endif
++
++encodePath :: FilePath -> FilePath
++#if MIN_VERSION_base(4,5,0)
++encodePath = id
++#else
++encodePath = encodeString
++#endif
+diff --git a/src/pandoc.hs b/src/pandoc.hs
+index 34d136a..7e9646c 100644
+--- a/src/pandoc.hs
++++ b/src/pandoc.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-
+ Copyright (C) 2006-2012 John MacFarlane <jgm@berkeley.edu>
+ 
+@@ -56,8 +57,21 @@ import Network.HTTP (simpleHTTP, mkRequest, getResponseBody, RequestMethod(..))
+ import Network.URI (parseURI, isURI, URI(..))
+ import qualified Data.ByteString.Lazy as B
+ import Data.ByteString.Lazy.UTF8 (toString )
+-import Codec.Binary.UTF8.String (decodeString, encodeString)
+ import Text.CSL.Reference (Reference(..))
++#if MIN_VERSION_base(4,5,0)
++#else
++import Codec.Binary.UTF8.String (decodeString, encodeString)
++#endif
++
++encodePath, decodeArg :: FilePath -> FilePath
++#if MIN_VERSION_base(4,5,0)
++encodePath = id
++decodeArg  = id
++#else
++encodePath = encodeString
++decodeArg  = decodeString
++#endif
++
+ 
+ copyrightMessage :: String
+ copyrightMessage = "\nCopyright (C) 2006-2012 John MacFarlane\n" ++
+@@ -745,7 +759,7 @@ defaultWriterName x =
+ main :: IO ()
+ main = do
+ 
+-  rawArgs <- liftM (map decodeString) getArgs
++  rawArgs <- liftM (map decodeArg) getArgs
+   prg <- getProgName
+   let compatMode = (prg == "hsmarkdown")
+ 
+@@ -1023,7 +1037,7 @@ main = do
+              else return doc1
+ 
+   let writeBinary :: B.ByteString -> IO ()
+-      writeBinary = B.writeFile (encodeString outputFile)
++      writeBinary = B.writeFile (encodePath outputFile)
+ 
+   let writerFn :: FilePath -> String -> IO ()
+       writerFn "-" = UTF8.putStr
diff --git a/app-text/pandoc/pandoc-1.9.4.1.ebuild b/app-text/pandoc/pandoc-1.9.4.1-r1.ebuild
similarity index 92%
rename from app-text/pandoc/pandoc-1.9.4.1.ebuild
rename to app-text/pandoc/pandoc-1.9.4.1-r1.ebuild
index d1f22aa5bdb0..0073b52ef3a6 100644
--- a/app-text/pandoc/pandoc-1.9.4.1.ebuild
+++ b/app-text/pandoc/pandoc-1.9.4.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/app-text/pandoc/pandoc-1.9.4.1.ebuild,v 1.1 2012/06/22 20:04:23 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.9.4.1-r1.ebuild,v 1.1 2012/06/24 11:38:18 slyfox Exp $
 
 EAPI=4
 
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test" # missing files in tarball
 
 RDEPEND="=dev-haskell/base64-bytestring-0.1*[profile?]
 		=dev-haskell/blaze-html-0.5*[profile?]
@@ -64,7 +65,9 @@ DEPEND="${RDEPEND}
 			dev-haskell/test-framework[profile?]
 		)"
 
-PATCHES=("${FILESDIR}/${PN}-1.9.4.1-ghc-7.5.patch")
+PATCHES=("${FILESDIR}/${PN}-1.9.4.1-ghc-7.5.patch"
+	"${FILESDIR}/${PN}-1.9.4.1-file-enc.patch"
+	)
 
 src_configure() {
 	cabal_src_configure \
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 326513e6e0aa..54a3c6dd970e 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,5 +1,5 @@
 DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
-DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
+DIST xournal-0.4.6-r1-gentoo.patch.xz 40772 RMD160 a67ef0dc0118ee96e7876bc35fa6c8d7c58906b9 SHA1 bd1b53601dc8a5da3cc34b76746daa06a0a41a64 SHA256 96eb1cab0c6f18aaec0d90acb91c3a50e9c6a97c50f33c455ef11d9582b16f17
 DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
deleted file mode 100644
index 3ce12bfd4528..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3082301&group_id=163434&atid=827735
-To make the image patch even more useful, I've written this patch to allow the aspect ratio 
-to be preserved when resizing selections. (It doesn't just apply to images.) Simply resize using the right 
-mouse button (button-3) rather than the left mouse button.
-This patch should be applied after the enhanced image patch. (Though it'd be easy enough to make the
-changes to the raw 0.4.5 source directly since it doesn't change any of the image patch related areas.)
-David Barton ( db9052 ) - 2010-10-06 09:30:56 PDT
-
-diff -ur xournal-0.4.5/src/xo-paint.c xournal-0.4.5-aspectratio/src/xo-paint.c
---- xournal-0.4.5/src/xo-paint.c	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xo-paint.c	2010-10-06 17:10:19.000000000 +0100
-@@ -609,6 +609,12 @@
-     ui.selection->new_x2 = ui.selection->bbox.right;
-     gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
-     update_cursor_for_resize(pt);
-+
-+    // Check whether we should preserve the aspect ratio
-+    if (event->button.button == 3)
-+    	ui.cur_brush->tool_options |= TOOLOPT_SELECT_PRESERVE;
-+    else
-+    	ui.cur_brush->tool_options &= ~TOOLOPT_SELECT_PRESERVE;
-     return TRUE;
-   }
-   return FALSE;
-@@ -740,6 +746,38 @@
-   if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0];
-   if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0];
- 
-+  if (ui.cur_brush->tool_options & TOOLOPT_SELECT_PRESERVE) {
-+	  double aspectratio = (ui.selection->bbox.top - ui.selection->bbox.bottom)/(ui.selection->bbox.right - ui.selection->bbox.left);
-+	  double newheight = ui.selection->new_y1 - ui.selection->new_y2;
-+	  double newwidth = ui.selection->new_x2 - ui.selection->new_x1;
-+	  gboolean boundheight;
-+
-+	  // Resizing from top or bottom only
-+	  if ((ui.selection->resizing_top || ui.selection->resizing_bottom) && !(ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 0;
-+	  // Resizing from right or left only
-+	  else if (!(ui.selection->resizing_top || ui.selection->resizing_bottom) && (ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 1;
-+	  // Resizing from a corner
-+	  else if (newheight/aspectratio > newwidth)
-+		  boundheight = 0;
-+	  else
-+		  boundheight = 1;
-+
-+	  if (boundheight) {
-+		  // Bound the height
-+		  newheight = newwidth*aspectratio;
-+		  if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 + newheight;
-+		  else ui.selection->new_y2 = ui.selection->new_y1 - newheight;
-+	  }
-+	  else {
-+		  // Bound the width
-+		  newwidth = newheight/aspectratio;
-+		  if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - newwidth;
-+		  else ui.selection->new_x2 = ui.selection->new_x1 + newwidth;
-+	  }
-+  }
-+
-   gnome_canvas_item_set(ui.selection->canvas_item, 
-     "x1", ui.selection->new_x1, "x2", ui.selection->new_x2,
-     "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL);
-diff -ur xournal-0.4.5/src/xournal.h xournal-0.4.5-aspectratio/src/xournal.h
---- xournal-0.4.5/src/xournal.h	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xournal.h	2010-10-06 16:31:07.000000000 +0100
-@@ -130,6 +130,7 @@
- #define TOOLOPT_ERASER_STANDARD     0
- #define TOOLOPT_ERASER_WHITEOUT     1
- #define TOOLOPT_ERASER_STROKES      2
-+#define TOOLOPT_SELECT_PRESERVE     1 // Preserve the aspect ratio of the selection when resizing
- 
- extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX];
- 
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
deleted file mode 100644
index 3bddbeeed81b..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3249971&group_id=163434&atid=827735
-When using GtkRecent for the management of recently used files, Xournal's recently used 
-files also appear in the shell. That's very convenient for the new document-centric shells 
-such as Gnome Shell and Unity.
-Timo Kluck ( tkluck ) - 2011-03-27 10:40:08 PDT
-
-=== modified file 'src/main.c'
---- src/main.c	2011-03-10 18:14:21 +0000
-+++ src/main.c	2011-03-27 16:32:52 +0000
-@@ -334,7 +334,6 @@
-   
-   if (bgpdf.status != STATUS_NOT_INIT) shutdown_bgpdf();
- 
--  save_mru_list();
-   if (ui.auto_save_prefs) save_config_to_file();
-   
-   return 0;
-
-=== modified file 'src/xo-callbacks.c'
---- src/xo-callbacks.c	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.c	2011-03-27 16:32:52 +0000
-@@ -3101,32 +3101,36 @@
- 
- 
- void
--on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data)
- {
--  int which;
-   gboolean success;
-+  gchar *uri, *name;
-   GtkWidget *dialog;
-   
-   end_text();
-   if (!ok_to_close()) return; // user aborted on save confirmation
-   
--  for (which = 0 ; which < MRU_SIZE; which++) {
--    if (ui.mrumenu[which] == GTK_WIDGET(menuitem)) break;
--  }
--  if (which == MRU_SIZE || ui.mru[which] == NULL) return; // not found...
--
-+  uri = gtk_recent_chooser_get_current_uri (recentChooser);
-+  name = g_filename_from_uri (uri, NULL, NULL);
-   set_cursor_busy(TRUE);
--  success = open_journal(ui.mru[which]);
-+  success = open_journal(name);
-   set_cursor_busy(FALSE);
--  if (success) return;
-+  if (success) {
-+    g_free(uri);
-+    g_free(name);
-+    return;
-+  }
- 
-   /* open failed */
-   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
--    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), ui.mru[which]);
-+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), name);
-   gtk_dialog_run(GTK_DIALOG(dialog));
-   gtk_widget_destroy(dialog);
--  delete_mru_entry(which);
-+
-+  delete_mru_entry(name);
-+  g_free(uri);
-+  g_free(name);
- }
- 
- 
-
-=== modified file 'src/xo-callbacks.h'
---- src/xo-callbacks.h	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.h	2011-03-27 16:32:52 +0000
-@@ -481,7 +481,7 @@
-                                         gpointer         user_data);
- 
- void
--on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data);
- 
- void
-
-=== modified file 'src/xo-file.c'
---- src/xo-file.c	2011-03-10 18:14:21 +0000
-+++ src/xo-file.c	2011-03-27 17:09:20 +0000
-@@ -1211,99 +1211,53 @@
-   }
- }
- 
--// initialize the recent files list
-+// initialize GtkRecentManager. Also backwards compatibility: import recent files into GtkRecentManager
- void init_mru(void)
- {
--  int i;
-+  GtkRecentFilter *recentFilter = gtk_recent_filter_new ();
-+  gtk_recent_filter_add_application ( recentFilter, "xournal");
-+  gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (GET_COMPONENT("fileRecentFiles_menu")), recentFilter);
-+
-   gsize lfptr;
--  char s[5];
-   GIOChannel *f;
--  gchar *str;
-+  gchar *str, *uri;
-   GIOStatus status;
-+  GtkRecentManager *recentManager = gtk_recent_manager_get_default ();
-   
--  g_strlcpy(s, "mru0", 5);
--  for (s[3]='0', i=0; i<MRU_SIZE; s[3]++, i++) {
--    ui.mrumenu[i] = GET_COMPONENT(s);
--    ui.mru[i] = NULL;
--  }
-   f = g_io_channel_new_file(ui.mrufile, "r", NULL);
-   if (f) status = G_IO_STATUS_NORMAL;
-   else status = G_IO_STATUS_ERROR;
--  i = 0;
--  while (status == G_IO_STATUS_NORMAL && i<MRU_SIZE) {
-+  while (status == G_IO_STATUS_NORMAL) {
-     lfptr = 0;
-     status = g_io_channel_read_line(f, &str, NULL, &lfptr, NULL);
-     if (status == G_IO_STATUS_NORMAL && lfptr>0) {
-       str[lfptr] = 0;
--      ui.mru[i] = str;
--      i++;
-+      uri = g_filename_to_uri (str, NULL, NULL);
-+      gtk_recent_manager_add_item (recentManager, uri);
-+      g_free(uri);
-+      g_free(str);
-     }
-   }
-   if (f) {
-     g_io_channel_shutdown(f, FALSE, NULL);
-     g_io_channel_unref(f);
-   }
--  update_mru_menu();
--}
--
--void update_mru_menu(void)
--{
--  int i;
--  gboolean anyone = FALSE;
--  gchar *tmp;
-   
--  for (i=0; i<MRU_SIZE; i++) {
--    if (ui.mru[i]!=NULL) {
--      tmp = g_strdup_printf("_%d %s", i+1,
--               g_strjoinv("__", g_strsplit_set(g_basename(ui.mru[i]),"_",-1)));
--      gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
--          tmp);
--      g_free(tmp);
--      gtk_widget_show(ui.mrumenu[i]);
--      anyone = TRUE;
--    }
--    else gtk_widget_hide(ui.mrumenu[i]);
--  }
--  gtk_widget_set_sensitive(GET_COMPONENT("fileRecentFiles"), anyone);
-+  g_unlink (ui.mrufile);
- }
- 
- void new_mru_entry(char *name)
- {
--  int i, j;
--  
--  for (i=0;i<MRU_SIZE;i++) 
--    if (ui.mru[i]!=NULL && !strcmp(ui.mru[i], name)) {
--      g_free(ui.mru[i]);
--      for (j=i+1; j<MRU_SIZE; j++) ui.mru[j-1] = ui.mru[j];
--      ui.mru[MRU_SIZE-1]=NULL;
--    }
--  if (ui.mru[MRU_SIZE-1]!=NULL) g_free(ui.mru[MRU_SIZE-1]);
--  for (j=MRU_SIZE-1; j>=1; j--) ui.mru[j] = ui.mru[j-1];
--  ui.mru[0] = g_strdup(name);
--  update_mru_menu();
--}
--
--void delete_mru_entry(int which)
--{
--  int i;
--  
--  if (ui.mru[which]!=NULL) g_free(ui.mru[which]);
--  for (i=which+1;i<MRU_SIZE;i++) 
--    ui.mru[i-1] = ui.mru[i];
--  ui.mru[MRU_SIZE-1] = NULL;
--  update_mru_menu();
--}
--
--void save_mru_list(void)
--{
--  FILE *f;
--  int i;
--  
--  f = fopen(ui.mrufile, "w");
--  if (f==NULL) return;
--  for (i=0; i<MRU_SIZE; i++)
--    if (ui.mru[i]!=NULL) fprintf(f, "%s\n", ui.mru[i]);
--  fclose(f);
-+  gchar *uri = g_filename_to_uri (name, NULL, NULL);
-+  gtk_recent_manager_add_item (gtk_recent_manager_get_default(), uri);
-+  g_free(uri);
-+}
-+
-+void delete_mru_entry(char *name)
-+{
-+  gchar *uri = g_filename_to_uri(name, NULL, NULL);
-+  gtk_recent_manager_remove_item(gtk_recent_manager_get_default(), uri, NULL);
-+  g_free(uri);
- }
- 
- void init_config_default(void)
-
-=== modified file 'src/xo-file.h'
---- src/xo-file.h	2011-03-10 18:14:21 +0000
-+++ src/xo-file.h	2011-03-27 16:32:52 +0000
-@@ -28,10 +28,8 @@
- void bgpdf_update_bg(int pageno, struct BgPdfPage *bgpg);
- 
- void init_mru(void);
--void update_mru_menu(void);
- void new_mru_entry(char *name);
--void delete_mru_entry(int which);
--void save_mru_list(void);
-+void delete_mru_entry(char *name);
- 
- void init_config_default(void);
- void load_config_from_file(void);
-
-=== modified file 'src/xo-interface.c'
---- src/xo-interface.c	2011-03-10 18:14:21 +0000
-+++ src/xo-interface.c	2011-03-27 17:09:20 +0000
-@@ -43,14 +43,6 @@
-   GtkWidget *separator1;
-   GtkWidget *fileRecentFiles;
-   GtkWidget *fileRecentFiles_menu;
--  GtkWidget *mru0;
--  GtkWidget *mru1;
--  GtkWidget *mru2;
--  GtkWidget *mru3;
--  GtkWidget *mru4;
--  GtkWidget *mru5;
--  GtkWidget *mru6;
--  GtkWidget *mru7;
-   GtkWidget *separator22;
-   GtkWidget *filePrintOptions;
-   GtkWidget *image624;
-@@ -397,41 +389,9 @@
-   gtk_widget_show (fileRecentFiles);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileRecentFiles);
- 
--  fileRecentFiles_menu = gtk_menu_new ();
-+  fileRecentFiles_menu = gtk_recent_chooser_menu_new_for_manager (gtk_recent_manager_get_default ());
-   gtk_menu_item_set_submenu (GTK_MENU_ITEM (fileRecentFiles), fileRecentFiles_menu);
--
--  mru0 = gtk_menu_item_new_with_mnemonic (_("0"));
--  gtk_widget_show (mru0);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru0);
--
--  mru1 = gtk_menu_item_new_with_mnemonic (_("1"));
--  gtk_widget_show (mru1);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru1);
--
--  mru2 = gtk_menu_item_new_with_mnemonic (_("2"));
--  gtk_widget_show (mru2);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru2);
--
--  mru3 = gtk_menu_item_new_with_mnemonic (_("3"));
--  gtk_widget_show (mru3);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru3);
--
--  mru4 = gtk_menu_item_new_with_mnemonic (_("4"));
--  gtk_widget_show (mru4);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru4);
--
--  mru5 = gtk_menu_item_new_with_mnemonic (_("5"));
--  gtk_widget_show (mru5);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru5);
--
--  mru6 = gtk_menu_item_new_with_mnemonic (_("6"));
--  gtk_widget_show (mru6);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru6);
--
--  mru7 = gtk_menu_item_new_with_mnemonic (_("7"));
--  gtk_widget_show (mru7);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru7);
--
-+    
-   separator22 = gtk_separator_menu_item_new ();
-   gtk_widget_show (separator22);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22);
-@@ -1967,28 +1927,7 @@
-   g_signal_connect ((gpointer) fileSaveAs, "activate",
-                     G_CALLBACK (on_fileSaveAs_activate),
-                     NULL);
--  g_signal_connect ((gpointer) mru0, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru1, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru2, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru3, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru4, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru5, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru6, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru7, "activate",
-+  g_signal_connect ((gpointer) fileRecentFiles_menu, "item-activated",
-                     G_CALLBACK (on_mru_activate),
-                     NULL);
-   g_signal_connect ((gpointer) filePrintOptions, "activate",
-@@ -2520,14 +2459,6 @@
-   GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles, "fileRecentFiles");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles_menu, "fileRecentFiles_menu");
--  GLADE_HOOKUP_OBJECT (winMain, mru0, "mru0");
--  GLADE_HOOKUP_OBJECT (winMain, mru1, "mru1");
--  GLADE_HOOKUP_OBJECT (winMain, mru2, "mru2");
--  GLADE_HOOKUP_OBJECT (winMain, mru3, "mru3");
--  GLADE_HOOKUP_OBJECT (winMain, mru4, "mru4");
--  GLADE_HOOKUP_OBJECT (winMain, mru5, "mru5");
--  GLADE_HOOKUP_OBJECT (winMain, mru6, "mru6");
--  GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7");
-   GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22");
-   GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
-   GLADE_HOOKUP_OBJECT (winMain, image624, "image624");
-
-=== modified file 'src/xournal.h'
---- src/xournal.h	2011-03-10 18:14:21 +0000
-+++ src/xournal.h	2011-03-27 16:32:52 +0000
-@@ -257,8 +257,6 @@
-   GdkCursor *cursor;
-   gboolean progressive_bg; // update PDF bg's one at a time
-   char *mrufile, *configfile; // file names for MRU & config
--  char *mru[MRU_SIZE]; // MRU data
--  GtkWidget *mrumenu[MRU_SIZE];
-   gboolean bg_apply_all_pages;
-   int window_default_width, window_default_height, scrollbar_step_increment;
-   gboolean print_ruling; // print the paper ruling ?
-
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
new file mode 100644
index 000000000000..5a51288a4b83
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
@@ -0,0 +1,10 @@
+diff -ruN xournal-0.4.5_p20111022.orig/src/Makefile.am xournal-0.4.5_p20111022/src/Makefile.am
+--- xournal-0.4.5_p20111022.orig/src/Makefile.am	2012-06-24 12:57:21.453958621 +0200
++++ xournal-0.4.5_p20111022/src/Makefile.am	2012-06-24 12:58:07.696957705 +0200
+@@ -30,5 +30,5 @@
+   xournal_LDFLAGS = -mwindows
+   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
+ else
+-  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
++  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
+ endif
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
deleted file mode 100644
index eae370ebf464..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 619691e135630c79f45e61a4126804c51ea52d42 Mon Sep 17 00:00:00 2001
-From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-Date: Mon, 28 Nov 2011 23:36:16 +0100
-Subject: [PATCH] Add xournal_0.4.5-3.debian patch 1 (add_ldflags), should fix Gentoo bug 372119
-
----
- src/Makefile.am |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ba52740..3dea178 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,6 +30,5 @@ if WIN32
-   xournal_LDFLAGS = -mwindows
-   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
- else
--  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
-+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
- endif
--
--- 
-1.7.3.4
-
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
index e81ac880433d..426887ce8019 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-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-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.4 2012/06/18 18:40:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild,v 1.5 2012/06/24 11:03:29 dilfridge Exp $
 
 EAPI=4
 
@@ -40,7 +40,9 @@ DEPEND="${COMMONDEPEND}
 
 src_prepare() {
 	epatch "${WORKDIR}"/0*.patch
+	epatch "${FILESDIR}/${P}-underlinking-2.patch"
 	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	rm -f "${S}/aclocal.m4"  # bug 423285
 	eautoreconf
 }
 
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild b/app-text/xournal/xournal-0.4.6-r1.ebuild
similarity index 72%
rename from app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
rename to app-text/xournal/xournal-0.4.6-r1.ebuild
index dc409588620a..a5371db6d072 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.6-r1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.6 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r1.ebuild,v 1.1 2012/06/24 11:08:44 dilfridge Exp $
 
 EAPI=4
 
 GCONF_DEBUG=no
 
-inherit base gnome2 autotools
+inherit gnome2 autotools
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
 HOMEPAGE="http://xournal.sourceforge.net/"
 
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+pdf"
 
 COMMONDEPEND="
@@ -38,15 +38,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${DISTDIR}"/${P}-sjg-image-rev7.patch.gz
-	"${FILESDIR}"/${P}-gtk-recent.patch
-	"${FILESDIR}"/${P}-aspectratio.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
 src_prepare() {
-	base_src_prepare
+	epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	eautoreconf
 }
 
diff --git a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
index 804692510847..97ca435d041a 100644
--- a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
+++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
@@ -12,15 +12,19 @@ diff --git a/Makefile.am b/Makefile.am
 index 82ef261..e17fa5f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -421,7 +421,7 @@ else
+@@ -421,8 +421,10 @@ else
  ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
  endif
  
 -if HAS_PAX
+-ICEDTEA_PATCHES += patches/no-test_gamma.patch
 +if WITH_PAX
- ICEDTEA_PATCHES += patches/no-test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/no-test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
  endif
  
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 @@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
  endif
  endif
@@ -141,3 +145,19 @@ index 0000000..bdff735
 +               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
 +       done
 +fi
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
new file mode 100644
index 000000000000..c66525332b00
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.1.1-pax_mark_rmic_java.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
new file mode 100644
index 000000000000..c66525332b00
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.2.1-pax_mark_rmic_java.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index 49d8bc4..85ac971 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
+ if WITH_PAX
+-ICEDTEA_PATCHES += patches/test_gamma.patch
++ICEDTEA_PATCHES += \
++	patches/test_gamma.patch \
++	patches/pax-mark-rmic-java.patch
+ endif
+ 
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
+new file mode 100644
+index 0000000..ad80f3a
+--- /dev/null
++++ b/patches/pax-mark-rmic-java.patch
+@@ -0,0 +1,10 @@
++--- openjdk/jdk/make/com/sun/jmx/Makefile
+++++ openjdk/jdk/make/com/sun/jmx/Makefile
++@@ -119,6 +119,7 @@
++ 
++ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
++ 	$(prep-target)
+++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
++ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
++                 -d $(CLASSDESTDIR)              \
++                 -v1.2                           \
diff --git a/dev-java/icedtea/icedtea-6.1.11.3.ebuild b/dev-java/icedtea/icedtea-6.1.11.3.ebuild
index 30526f5da59f..c8a5d84aea36 100644
--- a/dev-java/icedtea/icedtea-6.1.11.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.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/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.3.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -142,7 +142,7 @@ java_prepare() {
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
 
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751
+	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525
 	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
 	eautoreconf
 }
diff --git a/dev-java/icedtea/icedtea-7.2.1.1.ebuild b/dev-java/icedtea/icedtea-7.2.1.1.ebuild
index ee8c645b3f32..d795b20cd88c 100644
--- a/dev-java/icedtea/icedtea-7.2.1.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.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-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -162,7 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
-
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }
 
diff --git a/dev-java/icedtea/icedtea-7.2.2.1.ebuild b/dev-java/icedtea/icedtea-7.2.2.1.ebuild
index f9f0aa35bee5..dc4654136edc 100644
--- a/dev-java/icedtea/icedtea-7.2.2.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.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/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.1 2012/06/19 20:30:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.2.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -162,6 +162,7 @@ java_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
 	epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
+	epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
 	eautoreconf
 }
 
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
index 1b58f0ef871b..558a14bb8575 100644
--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.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/nailgun/nailgun-0.7.1-r1.ebuild,v 1.1 2012/04/18 19:31:12 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1-r1.ebuild,v 1.2 2012/06/24 10:37:18 ago Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 71a1f5b3b713..5123d05cf229 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,6 @@
 DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 RMD160 cfb89fa798724744ea7f1912b0015affdb1ea63c SHA1 d23e615b81cfd259e369cfcd1c5cd9965780f946 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4
 DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 RMD160 38152c3e6e10524fdc3c6911adda90ad384ad8c4 SHA1 e2f95ce3384ea8618ce86f65512b79154640f1cf SHA256 2fce2c95b6cb8b5819fb576de8ce184293a926c52f120027e3195d14f0552d78
-DIST mercury-11.07.1-gentoo-patchset-2.tar.gz 6947 RMD160 b5308e6aa7a979be7ad91e62c53196d445f8b4cc SHA1 db18ada6d98bcd37c060db620558dd24373394b5 SHA256 a90cdc91b7a7b5eca56410ac89b8bf9f45fa864ee61539778b01b00f721ed089
+DIST mercury-11.07.1-gentoo-patchset-3.tar.gz 7103 RMD160 7756df3214f1a6e1f2f8eaa0ae71aa3d9c8668e6 SHA1 4d9ca2fd42d9b3b753843beb570e6906adedba56 SHA256 c25a2014393b4c01de920e707e96b09bd5431aaa76007213a39d75ba1e1e4cbc
 DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
 DIST mercury-compiler-11.07.1.tar.gz 25308185 RMD160 10593ad6decefffdd8225d0c29fdb731d1470ca9 SHA1 717daf9bf74ae22e759b78f4e1f101dba951f89b SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11
 DIST mercury-compiler-11.07.tar.gz 25298643 RMD160 1573be5c26415c6fac96f85ff9558db736890b83 SHA1 d27541f5fcd5ec6b8ca2fc39f72ed74c833f243a SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2
diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
index 836496780919..e8745e86087f 100644
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ b/dev-lang/mercury/mercury-11.07.1.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-lang/mercury/mercury-11.07.1.ebuild,v 1.3 2012/06/22 18:02:29 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07.1.ebuild,v 1.4 2012/06/24 15:42:56 keri Exp $
 
 EAPI=2
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
diff --git a/dev-lang/php/php-5.3.14.ebuild b/dev-lang/php/php-5.3.14.ebuild
index de9baf5acd6c..118569228212 100644
--- a/dev-lang/php/php-5.3.14.ebuild
+++ b/dev-lang/php/php-5.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/dev-lang/php/php-5.3.14.ebuild,v 1.5 2012/06/21 04:46:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.14.ebuild,v 1.6 2012/06/23 17:13:38 armin76 Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 1bad8f0dbe97..339b39120ce3 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -4,3 +4,5 @@ DIST yap-6.3.0-gentoo-patchset-1.tar.gz 5405 RMD160 59becff941dfa34d2bd691bfe08f
 DIST yap-6.3.0.tar.gz 5626436 RMD160 88acf118abdbf65b0a4c1d9cc87ed9df03557af5 SHA1 43a4e784fa002dee2748fa7d690c8c8a75fd785f SHA256 db1d0c46617eab2c5c2e44788252e85a8c667dc9c73e218c9dcf8a20ecbaf94e
 DIST yap-6.3.1-gentoo-patchset-0.tar.gz 2229 RMD160 d5a8d7bb6df33787fb105f46968249345cc37ca2 SHA1 f02619afc6693496234945370c74fc04fd512db6 SHA256 e6bfb2869475bd62207038ce201583adb65aa9ef480c3cc469002053a6a0697d
 DIST yap-6.3.1.tar.gz 7868709 RMD160 cf6d7f5a04208380ab964d1e51a6e65d2bfa9134 SHA1 a1bd4a9728fcebd2164a9957ae922d4ab0c3ebef SHA256 70b779b40a3a9d4401c0ca21081c6b3034d77212d6a8892bd23bb63236ebc720
+DIST yap-6.3.2-gentoo-patchset-0.tar.gz 2103 RMD160 baa03f1abfa9fb9bc4e47b1b5c598fee9460bee6 SHA1 6880a3682b90efb583acc26d1280e2abcbe104a4 SHA256 0e2c3a6fce81c379cb3892529ef391841fcec39eb1e2188a595f97596187811f
+DIST yap-6.3.2.tar.gz 6447312 RMD160 0de4119dd4e036d17ae1226758a7bd4f0b34e1d5 SHA1 2ff85e44bef2af3d09c618afa8d9ccfffcd1577a SHA256 876a31a05a8e50a32bda8597d3381953e3ed99f37f06e7075209a501b8e2d1ed
diff --git a/dev-lang/yap/yap-6.3.2.ebuild b/dev-lang/yap/yap-6.3.2.ebuild
new file mode 100644
index 000000000000..a5235b90532f
--- /dev/null
+++ b/dev-lang/yap/yap-6.3.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.3.2.ebuild,v 1.1 2012/06/24 06:52:15 keri Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="YAP is a high-performance Prolog compiler."
+HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
+SRC_URI="http://www.dcc.fc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="R debug doc examples gmp java mpi mysql odbc readline static threads"
+
+RDEPEND="sys-libs/zlib
+	gmp? ( dev-libs/gmp )
+	java? ( >=virtual/jdk-1.4 )
+	mpi? ( virtual/mpi )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline sys-libs/ncurses )
+	R? ( dev-lang/R )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html )"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+	rm -rf "${S}"/yap || die "failed to remove yap xcode project"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local myddas_conf
+	if use mysql || use odbc; then
+		myddas_conf="--enable-myddas"
+	else
+		myddas_conf="--disable-myddas"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable !static dynamic-loading) \
+		$(use_enable threads) \
+		$(use_enable threads pthread-locking) \
+		$(use_enable debug debug-yap) \
+		$(use_enable debug low-level-tracer) \
+		$(use_with gmp) \
+		$(use_with readline) \
+		$(use_with mpi) \
+		$(use_with mpi mpe) \
+		$(use_with java) \
+		$(use_with R) \
+		${myddas_conf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc ; then
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed."
+
+	dodoc changes*.html README || die
+
+	if use doc ; then
+		dodoc yap.html || die
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/chr
+		doins packages/chr/Examples/* || die
+		insinto /usr/share/doc/${PF}/examples/clib
+		doins packages/clib/demo/* || die
+		insinto /usr/share/doc/${PF}/examples/http
+		doins -r packages/http/examples/* || die
+		insinto /usr/share/doc/${PF}/examples/plunit
+		doins packages/plunit/examples/* || die
+		if use java ; then
+			insinto /usr/share/doc/${PF}/examples/jpl/prolog
+			doins packages/jpl/examples/prolog/* || die
+			insinto /usr/share/doc/${PF}/examples/jpl/java
+			doins packages/jpl/examples/java/README || die
+			doins -r packages/jpl/examples/java/*/*.{java,pl} || die
+		fi
+		if use mpi ; then
+			insinto /usr/share/doc/${PF}/examples/mpi
+			doins library/mpi/examples/*.pl || die
+		fi
+	fi
+}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index f24f442ad1ec..f2c2ba1ca348 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -9,3 +9,6 @@ DIST elfutils-0.152.tar.bz2 1876711 RMD160 e8a89a56021b79c43c7bc69a467dcf02c10f6
 DIST elfutils-0.153-portability.patch 57102 RMD160 b4ad0f3d64c5fdcdf9adeeba67ca0a3d1341bfce SHA1 2cdb7ae408ae385ff8032cde5c1638ca2a2d718a SHA256 26847f1641d1c8013d39ffdbd2c7167b941eddf64a782f5be366a69eb277c25d
 DIST elfutils-0.153-robustify.patch 63255 RMD160 4844dafc1a2d4359f20bed1cdb9e95fe63f1cc74 SHA1 748de5bef6213379a31e3ff684bcf8770ff306b2 SHA256 f5ac4f4213466700bed7c669172ad4b1dbad38e0091d44838ad9ae836a09705b
 DIST elfutils-0.153.tar.bz2 2179242 RMD160 98b8c02d49d5cc23f11dab5e9fb4d71d7cd3933f SHA1 8f908a121590daa2a18cbddd88393c02725b9eac SHA256 b6cd7d1fe81d5f874061b7d753f5b5a0546ccc5fd83af843201330479332bef0
+DIST elfutils-0.154-portability.patch 57336 RMD160 8fac444c7814bdb0e799e869fa1bbe2c164c0088 SHA1 a2b9518bbbb623ff419c6915dad46e8c30dd6393 SHA256 156a30541c8d478354c9e42ee5282fe7d0af65be6b10c829f13ec9ce68e5298e
+DIST elfutils-0.154-robustify.patch 63063 RMD160 ddb74ef538a063e451e345692c57b93f8da4819c SHA1 e6a1e2fc9270eddd401074ab85b2c20652549901 SHA256 a0e0a81b8bdb7d0622715564d6863be2f2208848feb2e529741c3cb7c01cc6d2
+DIST elfutils-0.154.tar.bz2 2205145 RMD160 62c5ace9767b42937cc032bcf9721b8dc94eefd3 SHA1 3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b SHA256 3ef06dc0b599874bde09a529a05809dac656204ed1181eea9e89d531cea94af1
diff --git a/dev-libs/elfutils/elfutils-0.154.ebuild b/dev-libs/elfutils/elfutils-0.154.ebuild
new file mode 100644
index 000000000000..ec597674029c
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.154.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.154.ebuild,v 1.1 2012/06/23 22:41:22 vapier Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://fedorahosted.org/elfutils/"
+SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2
+	https://fedorahosted.org/releases/e/l/${PN}/${PV}/${PN}-portability.patch -> ${P}-portability.patch
+	https://fedorahosted.org/releases/e/l/${PN}/${PV}/${PN}-robustify.patch -> ${P}-robustify.patch"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls test zlib"
+
+# This pkg does not actually seem to compile currently in a uClibc
+# environment (xrealloc errs), but we need to ensure that glibc never
+# gets pulled in as a dep since this package does not respect virtual/libc
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.2.3 )
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	epatch "${DISTDIR}"/${P}-{portability,robustify}.patch
+	sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die
+	use test || sed -i -e 's: tests::' Makefile.in #226349
+	# some patches touch both configure and configure.ac
+	find -type f -exec touch -r configure {} +
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	econf \
+		$(use_enable nls) \
+		--program-prefix="eu-" \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+src_test() {
+	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
+		LC_ALL="C" \
+		emake -j1 check || die "test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
+}
diff --git a/dev-libs/embryo/Manifest b/dev-libs/embryo/Manifest
index 55d483d58027..62bc2e91914e 100644
--- a/dev-libs/embryo/Manifest
+++ b/dev-libs/embryo/Manifest
@@ -1,2 +1,3 @@
 DIST embryo-1.0.0.tar.bz2 425951 RMD160 a25089290f0cc3394b9e351710932f9a118d7cf4 SHA1 a03304f7e3f61978de98c734744478cdb361ad70 SHA256 d4363689fb39436386c35704f916adfc5e84dc8da1b832499010c1d5bf56ef5e
 DIST embryo-1.1.0.tar.bz2 443457 RMD160 ac8ec525b05e0875ea97f7dd655bd008e35f88b0 SHA1 02f5c2b882c973a539ed28094609264c4b6e9d9b SHA256 a95fa6ac4ec4c98c9a237214d2c4bde561dbe1daefaa2ed5e9c2944c2c8e9e5b
+DIST embryo-1.2.0.tar.bz2 440135 RMD160 a610875748f703c87f8c538597c4cd8969014580 SHA1 a6dd8fed2d76da9407de10b475e47da098dd8cd9 SHA256 cf530e703e812ab4444c516977b21dfc24212938d36ad587ec9b40056a52d583
diff --git a/dev-libs/embryo/embryo-1.2.0.ebuild b/dev-libs/embryo/embryo-1.2.0.ebuild
new file mode 100644
index 000000000000..3e1224ddabb0
--- /dev/null
+++ b/dev-libs/embryo/embryo-1.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/embryo/embryo-1.2.0.ebuild,v 1.1 2012/06/23 17:56:19 tommy Exp $
+
+inherit enlightenment
+
+DESCRIPTION="load and control programs compiled in embryo language (small/pawn variant)"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/eina-1.2.0"
+RDEPEND=${DEPEND}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 3593ebbb4d43..1cf10641561c 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,2 +1,2 @@
-DIST isl-0.07.tar.bz2 963502 RMD160 bded741256ad5510d43542775673e3b383c1e30e SHA1 be2a49504dcb3d610b277759e98e315e4e151a55 SHA256 ddcf3fa454c98d0c657a4474c194ba07eb197b72f263a7307ebe719ee1aefd4e
 DIST isl-0.09.tar.bz2 1046002 RMD160 250a0d49911d4eee86b698608092d833de1563a9 SHA1 3a09208d2ef606b43608810cc01ce416ae7e9255 SHA256 4f3290a3adcc2ca4bf94432194635140ebf9c9c2bb73acfa79ec259f91092934
+DIST isl-0.10.tar.bz2 1076325 RMD160 19b9d1d9ce7597436d323098824815bb71b02bc9 SHA1 91db73f10075a67039c38abfcd5b1bd64581a6e3 SHA256 73980d8ea801f8aeff4ee57ee0be142f109f5a9f9e797d07fde02efe23b8151f
diff --git a/dev-libs/isl/isl-0.07-r1.ebuild b/dev-libs/isl/isl-0.10.ebuild
similarity index 81%
rename from dev-libs/isl/isl-0.07-r1.ebuild
rename to dev-libs/isl/isl-0.10.ebuild
index fd442bd97739..6c26c923d99f 100644
--- a/dev-libs/isl/isl-0.07-r1.ebuild
+++ b/dev-libs/isl/isl-0.10.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-libs/isl/isl-0.07-r1.ebuild,v 1.2 2011/11/20 05:36:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/isl/isl-0.10.ebuild,v 1.1 2012/06/24 04:30:22 dirtyepic Exp $
 
 EAPI=4
 inherit eutils
@@ -33,5 +33,5 @@ src_configure() {
 
 src_install() {
 	default
-	rm -f "${ED}"usr/lib*/libisl.la
+	prune_libtool_files
 }
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
index 1af383cc101b..179b8af6e705 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.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/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.3 2012/05/21 18:52:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.5 2012/06/24 10:40:46 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch
deleted file mode 100644
index dd7a8be747ec..000000000000
--- a/dev-libs/nspr/files/nspr-4.9.1-x32.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
---- a/mozilla/nsprpub/pr/include/md/_linux.cfg	2012-05-18 16:55:29.000000000 -0500
-+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg	2012-06-21 15:10:35.397358851 -0500
-@@ -211,7 +211,7 @@
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
- #elif defined(__x86_64__)
--
-+#ifdef __LP64__
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
- #define IS_64
-@@ -256,6 +256,54 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#else
-+
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   4
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  4
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD    4
-+
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#endif
-+
- #elif defined(__mc68000__)
- 
- #undef  IS_LITTLE_ENDIAN
-
diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
new file mode 100644
index 000000000000..3de2a0f95dcf
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.1.patch
@@ -0,0 +1,156 @@
+diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- a/mozilla/nsprpub/pr/include/md/_linux.cfg
++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg
+@@ -206,17 +206,17 @@
+ #define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD    8
+ 
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+ #elif defined(__x86_64__)
+-
++#ifdef __LP64__
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+ #define IS_64
+ 
+ #define PR_BYTES_PER_BYTE   1
+ #define PR_BYTES_PER_SHORT  2
+ #define PR_BYTES_PER_INT    4
+ #define PR_BYTES_PER_INT64  8
+@@ -251,16 +251,64 @@
+ #define PR_ALIGN_OF_FLOAT   4
+ #define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD    8
+ 
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#else
++
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#endif
++
+ #elif defined(__mc68000__)
+ 
+ #undef  IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN 1
+ 
+ #define PR_BYTES_PER_BYTE   1
+ #define PR_BYTES_PER_SHORT  2
+ #define PR_BYTES_PER_INT    4
+diff --git a/mozilla/nsprpub/pr/include/md/_linux.h b/mozilla/nsprpub/pr/include/md/_linux.h
+--- a/mozilla/nsprpub/pr/include/md/_linux.h
++++ b/mozilla/nsprpub/pr/include/md/_linux.h
+@@ -22,25 +22,25 @@
+ #ifdef __powerpc64__
+ #define _PR_SI_ARCHITECTURE "ppc64"
+ #elif defined(__powerpc__)
+ #define _PR_SI_ARCHITECTURE "ppc"
+ #elif defined(__alpha)
+ #define _PR_SI_ARCHITECTURE "alpha"
+ #elif defined(__ia64__)
+ #define _PR_SI_ARCHITECTURE "ia64"
+-#elif defined(__x86_64__)
++#elif defined(__x86_64__) && defined(__LP64__)
+ #define _PR_SI_ARCHITECTURE "x86-64"
+ #elif defined(__mc68000__)
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__sparc__) && defined(__arch64__)
+ #define _PR_SI_ARCHITECTURE "sparc64"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
+-#elif defined(__i386__)
++#elif defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__mips__)
+ #define _PR_SI_ARCHITECTURE "mips"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
+ #elif defined(__hppa__)
+ #define _PR_SI_ARCHITECTURE "hppa"
+ #elif defined(__s390x__)
+@@ -73,17 +73,17 @@
+ #if defined(ANDROID)
+ #define NO_DLOPEN_NULL
+ #endif
+ 
+ #ifdef __FreeBSD_kernel__
+ #define _PR_HAVE_SOCKADDR_LEN
+ #endif
+ 
+-#if defined(__i386__)
++#if defined(__i386__) || (defined(__x86_64__) && !defined(__LP64__))
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_AtomicIncrement
+ extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_AtomicDecrement
+ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_AtomicAdd
+@@ -99,17 +99,17 @@ extern PRInt32 _PR_ia64_AtomicIncrement(
+ extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_ia64_AtomicDecrement
+ extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_ia64_AtomicAdd
+ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET                _PR_ia64_AtomicSet
+ #endif
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && defined(__LP64__)
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT          _PR_x86_64_AtomicIncrement
+ extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT          _PR_x86_64_AtomicDecrement
+ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD                _PR_x86_64_AtomicAdd
diff --git a/dev-libs/nspr/nspr-4.9.1-r1.ebuild b/dev-libs/nspr/nspr-4.9.1-r2.ebuild
similarity index 95%
rename from dev-libs/nspr/nspr-4.9.1-r1.ebuild
rename to dev-libs/nspr/nspr-4.9.1-r2.ebuild
index 3ba665987b1c..5f856676d7fc 100644
--- a/dev-libs/nspr/nspr-4.9.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.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/dev-libs/nspr/nspr-4.9.1-r1.ebuild,v 1.1 2012/06/22 02:57:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r2.ebuild,v 1.1 2012/06/24 03:56:49 anarchy Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -31,7 +31,7 @@ src_prepare() {
 	#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
 	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
 	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	epatch "${FILESDIR}"/${PN}-4.9.1-x32.patch
+	epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.1.patch
 
 	# We must run eautoconf to regenerate configure
 	cd "${S}"/mozilla/nsprpub
diff --git a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
index 823fa08c56db..3ef24ec3d254 100644
--- a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
+++ b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
@@ -1,4 +1,4 @@
-From 9e62ac20a1dc39e001875e57067ab7fa2389ae73 Mon Sep 17 00:00:00 2001
+From 4ede74dd803ddbc4d0686bec0749459f54854495 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
 Date: Sun, 13 May 2012 14:55:35 -0700
 Subject: [PATCH] build: fix parallel install by creating directory in the
@@ -10,6 +10,9 @@ Content-Transfer-Encoding: 8bit
 Relying on the rule that creates the directory is a bad idea to be
 parallel safe.
 
+(Patch modified to use autoconf's MKDIR_P instead of automake's
+deprecated mkdir_p, allowing use of automake 1.12).
+
 Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
 ---
  etc/Makefile.am        |    4 ++--
@@ -17,7 +20,7 @@ Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 0ef546f..478a7bb 100644
+index 0ef546f..3b75995 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
 @@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
@@ -27,21 +30,21 @@ index 0ef546f..478a7bb 100644
 -sysconf_DATA=#required in order to create dir
 -install-exec-hook:	install-sysconfDATA opensc.conf
 +install-exec-hook: opensc.conf
-+	$(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
  	if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
  		$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
  	else \
 diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
-index ba5e70d..742c5fb 100644
+index 8ff9abc..211055b 100644
 --- a/src/pkcs11/Makefile.am
 +++ b/src/pkcs11/Makefile.am
-@@ -52,19 +52,20 @@ pkcs11-jar: jar-dir
+@@ -53,19 +53,20 @@ pkcs11-jar: jar-dir
  		 -k"testcert" jar-dir
  
  if WIN32
 -install-exec-hook:	install-pkcs11DATA
 +install-exec-hook:
-+	$(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(MKDIR_P) "$(DESTDIR)$(libdir)"
  	for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \
  		mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
  	done
@@ -55,7 +58,7 @@ index ba5e70d..742c5fb 100644
  endif
 -install-exec-hook:	install-pkcs11DATA
 +install-exec-hook:
-+	$(mkdir_p) "$(DESTDIR)$(pkcs11dir)"
++	$(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
  	for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
  		rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
  		$(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
diff --git a/dev-libs/opensc/opensc-0.12.2-r1.ebuild b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
index 1c4e23a0577a..065b5292e5c6 100644
--- a/dev-libs/opensc/opensc-0.12.2-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.2 2012/06/22 23:27:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.3 2012/06/24 08:18:12 flameeyes Exp $
 
 EAPI="4"
 
-WANT_AUTOMAKE=1.11
-
 inherit eutils autotools
 
 DESCRIPTION="Libraries and applications to access smartcards"
diff --git a/dev-perl/Ace/metadata.xml b/dev-perl/Ace/metadata.xml
index b610849b6c34..092213e559ba 100644
--- a/dev-perl/Ace/metadata.xml
+++ b/dev-perl/Ace/metadata.xml
@@ -9,5 +9,48 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">AcePerl</remote-id>
+    <remote-id type="cpan-module">Ace</remote-id>
+    <remote-id type="cpan-module">Ace::Browser::AceSubs</remote-id>
+    <remote-id type="cpan-module">Ace::Browser::GeneSubs</remote-id>
+    <remote-id type="cpan-module">Ace::Browser::SearchSubs</remote-id>
+    <remote-id type="cpan-module">Ace::Browser::SiteDefs</remote-id>
+    <remote-id type="cpan-module">Ace::Browser::TreeSubs</remote-id>
+    <remote-id type="cpan-module">Ace::Freesubs</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Fk</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::anchored_arrow</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::arrow</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::box</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::crossbox</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::dot</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::ex</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::graded_segments</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::group</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::line</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::primers</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::segments</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::span</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::toomany</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::transcript</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Glyph::triangle</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::GlyphFactory</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Panel</remote-id>
+    <remote-id type="cpan-module">Ace::Graphics::Track</remote-id>
+    <remote-id type="cpan-module">Ace::Iterator</remote-id>
+    <remote-id type="cpan-module">Ace::Local</remote-id>
+    <remote-id type="cpan-module">Ace::Model</remote-id>
+    <remote-id type="cpan-module">Ace::Object</remote-id>
+    <remote-id type="cpan-module">Ace::Object::Wormbase</remote-id>
+    <remote-id type="cpan-module">Ace::RPC</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::Feature</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::FeatureList</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::GappedAlignment</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::Gene</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::Homol</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::Multi</remote-id>
+    <remote-id type="cpan-module">Ace::Sequence::Transcript</remote-id>
+    <remote-id type="cpan-module">Ace::SocketServer</remote-id>
+    <remote-id type="cpan-module">GFF::Filehandle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Algorithm-Annotate/metadata.xml b/dev-perl/Algorithm-Annotate/metadata.xml
index fb2a108eff95..f6ffd6c9f868 100644
--- a/dev-perl/Algorithm-Annotate/metadata.xml
+++ b/dev-perl/Algorithm-Annotate/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Algorithm-Annotate</remote-id>
+    <remote-id type="cpan-module">Algorithm::Annotate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Algorithm-C3/metadata.xml b/dev-perl/Algorithm-C3/metadata.xml
index 965001d7e4bc..7dc4bf78d0ed 100644
--- a/dev-perl/Algorithm-C3/metadata.xml
+++ b/dev-perl/Algorithm-C3/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Algorithm-C3</remote-id>
+    <remote-id type="cpan-module">Algorithm::C3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Algorithm-Dependency/metadata.xml b/dev-perl/Algorithm-Dependency/metadata.xml
index ca03e479bf53..cfd125bba57b 100644
--- a/dev-perl/Algorithm-Dependency/metadata.xml
+++ b/dev-perl/Algorithm-Dependency/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Algorithm-Dependency</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Item</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Ordered</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Source</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Source::File</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Source::HoA</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Source::Invert</remote-id>
+    <remote-id type="cpan-module">Algorithm::Dependency::Weight</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Algorithm-Diff/metadata.xml b/dev-perl/Algorithm-Diff/metadata.xml
index 9eff725fd6e9..992be0c6e8c5 100644
--- a/dev-perl/Algorithm-Diff/metadata.xml
+++ b/dev-perl/Algorithm-Diff/metadata.xml
@@ -5,5 +5,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Algorithm-Diff</remote-id>
+    <remote-id type="cpan-module">Algorithm::Diff</remote-id>
+    <remote-id type="cpan-module">Algorithm::Diff::_impl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Algorithm-Munkres/metadata.xml b/dev-perl/Algorithm-Munkres/metadata.xml
index e06b906219d3..6515466faf54 100644
--- a/dev-perl/Algorithm-Munkres/metadata.xml
+++ b/dev-perl/Algorithm-Munkres/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Algorithm-Munkres</remote-id>
+    <remote-id type="cpan-module">Algorithm::Munkres</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Alien-SDL/metadata.xml b/dev-perl/Alien-SDL/metadata.xml
index d6a0ace1759c..243b6609687d 100644
--- a/dev-perl/Alien-SDL/metadata.xml
+++ b/dev-perl/Alien-SDL/metadata.xml
@@ -5,5 +5,6 @@
   <herd>games</herd>
   <upstream>
     <remote-id type="cpan">Alien-SDL</remote-id>
+    <remote-id type="cpan-module">Alien::SDL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Alien-wxWidgets/metadata.xml b/dev-perl/Alien-wxWidgets/metadata.xml
index 0113bab664f6..4705c23fae57 100644
--- a/dev-perl/Alien-wxWidgets/metadata.xml
+++ b/dev-perl/Alien-wxWidgets/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Alien-wxWidgets</remote-id>
+    <remote-id type="cpan-module">Alien::wxWidgets</remote-id>
+    <remote-id type="cpan-module">Alien::wxWidgets::Utility</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Any-Moose/metadata.xml b/dev-perl/Any-Moose/metadata.xml
index 50134a181bc4..6ebe7c947e58 100644
--- a/dev-perl/Any-Moose/metadata.xml
+++ b/dev-perl/Any-Moose/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Any-Moose</remote-id>
+    <remote-id type="cpan-module">Any::Moose</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent-HTTP/metadata.xml b/dev-perl/AnyEvent-HTTP/metadata.xml
index 86c406c1323a..93ad2cce6a92 100644
--- a/dev-perl/AnyEvent-HTTP/metadata.xml
+++ b/dev-perl/AnyEvent-HTTP/metadata.xml
@@ -4,5 +4,6 @@
 <herd>perl</herd>
 <upstream>
   <remote-id type="cpan">AnyEvent-HTTP</remote-id>
+  <remote-id type="cpan-module">AnyEvent::HTTP</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent-I3/metadata.xml b/dev-perl/AnyEvent-I3/metadata.xml
index 831aa3a9d7a3..f09c715965e1 100644
--- a/dev-perl/AnyEvent-I3/metadata.xml
+++ b/dev-perl/AnyEvent-I3/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">AnyEvent-I3</remote-id>
+		<remote-id type="cpan-module">AnyEvent::I3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent/metadata.xml b/dev-perl/AnyEvent/metadata.xml
index 335bae37f990..31679d90c199 100644
--- a/dev-perl/AnyEvent/metadata.xml
+++ b/dev-perl/AnyEvent/metadata.xml
@@ -4,5 +4,48 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">AnyEvent</remote-id>
+    <remote-id type="cpan-module">AE</remote-id>
+    <remote-id type="cpan-module">AE::Log::COLLECT</remote-id>
+    <remote-id type="cpan-module">AE::Log::FILTER</remote-id>
+    <remote-id type="cpan-module">AE::Log::LOG</remote-id>
+    <remote-id type="cpan-module">AnyEvent</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Base</remote-id>
+    <remote-id type="cpan-module">AnyEvent::CondVar</remote-id>
+    <remote-id type="cpan-module">AnyEvent::CondVar::Base</remote-id>
+    <remote-id type="cpan-module">AnyEvent::DNS</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Debug</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Debug::Backtrace</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Debug::Wrap</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Debug::Wrapped</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Debug::shell</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Handle</remote-id>
+    <remote-id type="cpan-module">AnyEvent::IO</remote-id>
+    <remote-id type="cpan-module">AnyEvent::IO::IOAIO</remote-id>
+    <remote-id type="cpan-module">AnyEvent::IO::Perl</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Cocoa</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::EV</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Event</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::EventLib</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::FLTK</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Glib</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::IOAsync</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Irssi</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::POE</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Perl</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Qt</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Qt::Io</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Qt::Timer</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Tk</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Log</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Log::COLLECT</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Log::Ctx</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Log::FILTER</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Log::LOG</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Loop</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Socket</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Strict</remote-id>
+    <remote-id type="cpan-module">AnyEvent::TLS</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Util</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-AuthCookie/metadata.xml b/dev-perl/Apache-AuthCookie/metadata.xml
index 48b883827b48..60418ccf707a 100644
--- a/dev-perl/Apache-AuthCookie/metadata.xml
+++ b/dev-perl/Apache-AuthCookie/metadata.xml
@@ -11,5 +11,8 @@
 	</longdescription>
   <upstream>
     <remote-id type="cpan">Apache-AuthCookie</remote-id>
+    <remote-id type="cpan-module">Apache2::AuthCookie</remote-id>
+    <remote-id type="cpan-module">Apache::AuthCookie</remote-id>
+    <remote-id type="cpan-module">Apache::AuthCookie::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-AuthTicket/metadata.xml b/dev-perl/Apache-AuthTicket/metadata.xml
index b85578ba40ff..13ebb184b23a 100644
--- a/dev-perl/Apache-AuthTicket/metadata.xml
+++ b/dev-perl/Apache-AuthTicket/metadata.xml
@@ -10,5 +10,8 @@
 	</longdescription>
   <upstream>
     <remote-id type="cpan">Apache-AuthTicket</remote-id>
+    <remote-id type="cpan-module">Apache2::AuthTicket</remote-id>
+    <remote-id type="cpan-module">Apache::AuthTicket</remote-id>
+    <remote-id type="cpan-module">Apache::AuthTicket::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-CGI-Builder/metadata.xml b/dev-perl/Apache-CGI-Builder/metadata.xml
index bf43837e50ba..a91150333e34 100644
--- a/dev-perl/Apache-CGI-Builder/metadata.xml
+++ b/dev-perl/Apache-CGI-Builder/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Apache-CGI-Builder</remote-id>
+    <remote-id type="cpan-module">Apache2::CGI::Builder</remote-id>
+    <remote-id type="cpan-module">Apache::CGI::Builder</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-DBI/metadata.xml b/dev-perl/Apache-DBI/metadata.xml
index 55b9e9492887..54b93c0e626b 100644
--- a/dev-perl/Apache-DBI/metadata.xml
+++ b/dev-perl/Apache-DBI/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Apache-DBI</remote-id>
+    <remote-id type="cpan-module">Apache::AuthDBI</remote-id>
+    <remote-id type="cpan-module">Apache::DBI</remote-id>
+    <remote-id type="cpan-module">Apache::DBI::db</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-Reload/metadata.xml b/dev-perl/Apache-Reload/metadata.xml
index c322d89e6696..97e33e8fa886 100644
--- a/dev-perl/Apache-Reload/metadata.xml
+++ b/dev-perl/Apache-Reload/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Apache-Reload</remote-id>
+    <remote-id type="cpan-module">Apache2::Reload</remote-id>
+    <remote-id type="cpan-module">Apache::Reload</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-Session/metadata.xml b/dev-perl/Apache-Session/metadata.xml
index 1d8196a3d2a6..a09926dabfc8 100644
--- a/dev-perl/Apache-Session/metadata.xml
+++ b/dev-perl/Apache-Session/metadata.xml
@@ -4,5 +4,34 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Apache-Session</remote-id>
+    <remote-id type="cpan-module">Apache::Session</remote-id>
+    <remote-id type="cpan-module">Apache::Session::DB_File</remote-id>
+    <remote-id type="cpan-module">Apache::Session::File</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Flex</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Generate::MD5</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Generate::ModUniqueId</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Generate::ModUsertrack</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Informix</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Lock::File</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Lock::MySQL</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Lock::Null</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Lock::Semaphore</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Lock::Sybase</remote-id>
+    <remote-id type="cpan-module">Apache::Session::MySQL</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Oracle</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Postgres</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Serialize::Base64</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Serialize::Storable</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Serialize::Sybase</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Serialize::UUEncode</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::DBI</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::DB_File</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::File</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::Informix</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::MySQL</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::Oracle</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::Postgres</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Store::Sybase</remote-id>
+    <remote-id type="cpan-module">Apache::Session::Sybase</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-SessionX/metadata.xml b/dev-perl/Apache-SessionX/metadata.xml
index 1ccfd3eb4e67..6a23aa256637 100644
--- a/dev-perl/Apache-SessionX/metadata.xml
+++ b/dev-perl/Apache-SessionX/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Apache-SessionX</remote-id>
+    <remote-id type="cpan-module">Apache::SessionX</remote-id>
+    <remote-id type="cpan-module">Apache::SessionX::Generate::MD5</remote-id>
+    <remote-id type="cpan-module">Apache::SessionX::Manager</remote-id>
+    <remote-id type="cpan-module">Apache::SessionX::Store::File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-SizeLimit/metadata.xml b/dev-perl/Apache-SizeLimit/metadata.xml
index c5b3a2a17084..81df8fdf5c36 100644
--- a/dev-perl/Apache-SizeLimit/metadata.xml
+++ b/dev-perl/Apache-SizeLimit/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Apache-SizeLimit</remote-id>
+		<remote-id type="cpan-module">Apache2::SizeLimit</remote-id>
+		<remote-id type="cpan-module">Apache::SizeLimit</remote-id>
+		<remote-id type="cpan-module">Apache::SizeLimit::Core</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-Test/metadata.xml b/dev-perl/Apache-Test/metadata.xml
index 2b561fd39450..045d71022b15 100644
--- a/dev-perl/Apache-Test/metadata.xml
+++ b/dev-perl/Apache-Test/metadata.xml
@@ -9,5 +9,39 @@
 		module.</longdescription>
   <upstream>
     <remote-id type="cpan">Apache-Test</remote-id>
+    <remote-id type="cpan-module">Apache::Test</remote-id>
+    <remote-id type="cpan-module">Apache::Test5005compat</remote-id>
+    <remote-id type="cpan-module">Apache::TestBuild</remote-id>
+    <remote-id type="cpan-module">Apache::TestClient</remote-id>
+    <remote-id type="cpan-module">Apache::TestClientResponse</remote-id>
+    <remote-id type="cpan-module">Apache::TestCommon</remote-id>
+    <remote-id type="cpan-module">Apache::TestCommonPost</remote-id>
+    <remote-id type="cpan-module">Apache::TestConfig</remote-id>
+    <remote-id type="cpan-module">Apache::TestConfigC</remote-id>
+    <remote-id type="cpan-module">Apache::TestConfigPHP</remote-id>
+    <remote-id type="cpan-module">Apache::TestConfigParrot</remote-id>
+    <remote-id type="cpan-module">Apache::TestHandler</remote-id>
+    <remote-id type="cpan-module">Apache::TestHarness</remote-id>
+    <remote-id type="cpan-module">Apache::TestHarnessPHP</remote-id>
+    <remote-id type="cpan-module">Apache::TestMB</remote-id>
+    <remote-id type="cpan-module">Apache::TestMM</remote-id>
+    <remote-id type="cpan-module">Apache::TestReport</remote-id>
+    <remote-id type="cpan-module">Apache::TestReportPerl</remote-id>
+    <remote-id type="cpan-module">Apache::TestRequest</remote-id>
+    <remote-id type="cpan-module">Apache::TestRun</remote-id>
+    <remote-id type="cpan-module">Apache::TestRunPHP</remote-id>
+    <remote-id type="cpan-module">Apache::TestRunParrot</remote-id>
+    <remote-id type="cpan-module">Apache::TestRunPerl</remote-id>
+    <remote-id type="cpan-module">Apache::TestSSLCA</remote-id>
+    <remote-id type="cpan-module">Apache::TestServer</remote-id>
+    <remote-id type="cpan-module">Apache::TestSmoke</remote-id>
+    <remote-id type="cpan-module">Apache::TestSmokePerl</remote-id>
+    <remote-id type="cpan-module">Apache::TestSort</remote-id>
+    <remote-id type="cpan-module">Apache::TestToString</remote-id>
+    <remote-id type="cpan-module">Apache::TestTrace</remote-id>
+    <remote-id type="cpan-module">Apache::TestUtil</remote-id>
+    <remote-id type="cpan-module">Bundle::ApacheTest</remote-id>
+    <remote-id type="cpan-module">HTTP::Request::Common</remote-id>
+    <remote-id type="cpan-module">warnings</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache2-AuthenNTLM/metadata.xml b/dev-perl/Apache2-AuthenNTLM/metadata.xml
index e53dd05991f9..c66054939068 100644
--- a/dev-perl/Apache2-AuthenNTLM/metadata.xml
+++ b/dev-perl/Apache2-AuthenNTLM/metadata.xml
@@ -12,5 +12,7 @@ password again.
 </longdescription>
   <upstream>
     <remote-id type="cpan">Apache2-AuthenNTLM</remote-id>
+    <remote-id type="cpan-module">Apache2::AuthenNTLM</remote-id>
+    <remote-id type="cpan-module">Apache2::AuthenNTLM::Lock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/App-CLI/metadata.xml b/dev-perl/App-CLI/metadata.xml
index b250290d288c..6a32d6981837 100644
--- a/dev-perl/App-CLI/metadata.xml
+++ b/dev-perl/App-CLI/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">App-CLI</remote-id>
+    <remote-id type="cpan-module">App::CLI</remote-id>
+    <remote-id type="cpan-module">App::CLI::Command</remote-id>
+    <remote-id type="cpan-module">App::CLI::Command::Help</remote-id>
+    <remote-id type="cpan-module">App::CLI::Helper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/App-Nopaste/metadata.xml b/dev-perl/App-Nopaste/metadata.xml
index fdbfccf2f0e8..b6843787bcac 100644
--- a/dev-perl/App-Nopaste/metadata.xml
+++ b/dev-perl/App-Nopaste/metadata.xml
@@ -12,5 +12,17 @@
   </use>
   <upstream>
     <remote-id type="cpan">App-Nopaste</remote-id>
+    <remote-id type="cpan-module">App::Nopaste</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Command</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Codepeek</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Debian</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Gist</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::PastebinCom</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Pastie</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Shadowcat</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Snitch</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::Ubuntu</remote-id>
+    <remote-id type="cpan-module">App::Nopaste::Service::ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AppConfig/metadata.xml b/dev-perl/AppConfig/metadata.xml
index 6b8311b92e46..a41506a11a14 100644
--- a/dev-perl/AppConfig/metadata.xml
+++ b/dev-perl/AppConfig/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">AppConfig</remote-id>
+    <remote-id type="cpan-module">AppConfig</remote-id>
+    <remote-id type="cpan-module">AppConfig::Args</remote-id>
+    <remote-id type="cpan-module">AppConfig::CGI</remote-id>
+    <remote-id type="cpan-module">AppConfig::File</remote-id>
+    <remote-id type="cpan-module">AppConfig::Getopt</remote-id>
+    <remote-id type="cpan-module">AppConfig::State</remote-id>
+    <remote-id type="cpan-module">AppConfig::Sys</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Archive-Rar/metadata.xml b/dev-perl/Archive-Rar/metadata.xml
index f45060ffc093..5e6e6d1dacc9 100644
--- a/dev-perl/Archive-Rar/metadata.xml
+++ b/dev-perl/Archive-Rar/metadata.xml
@@ -7,5 +7,6 @@
 	moment is the x86/amd64 family.</longdescription>
   <upstream>
     <remote-id type="cpan">Archive-Rar</remote-id>
+    <remote-id type="cpan-module">Archive::Rar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Archive-Zip/metadata.xml b/dev-perl/Archive-Zip/metadata.xml
index c402cf1f95d5..f014cbedd738 100644
--- a/dev-perl/Archive-Zip/metadata.xml
+++ b/dev-perl/Archive-Zip/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Archive-Zip</remote-id>
+    <remote-id type="cpan-module">Archive::Zip</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::Archive</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::BufferedFileHandle</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::DirectoryMember</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::FileMember</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::Member</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::MemberRead</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::MockFileHandle</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::NewFileMember</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::StringMember</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::Tree</remote-id>
+    <remote-id type="cpan-module">Archive::Zip::ZipFileMember</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Array-Compare/metadata.xml b/dev-perl/Array-Compare/metadata.xml
index 518ccb42bac5..720a3b9f2156 100644
--- a/dev-perl/Array-Compare/metadata.xml
+++ b/dev-perl/Array-Compare/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Array-Compare</remote-id>
+    <remote-id type="cpan-module">Array::Compare</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Array-RefElem/metadata.xml b/dev-perl/Array-RefElem/metadata.xml
index 2bd0198a9a82..0237e6537aa5 100644
--- a/dev-perl/Array-RefElem/metadata.xml
+++ b/dev-perl/Array-RefElem/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Array-RefElem</remote-id>
+    <remote-id type="cpan-module">Array::RefElem</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Array-Window/metadata.xml b/dev-perl/Array-Window/metadata.xml
index 0307b2d98627..538ec810b55e 100644
--- a/dev-perl/Array-Window/metadata.xml
+++ b/dev-perl/Array-Window/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Array-Window</remote-id>
+    <remote-id type="cpan-module">Array::Window</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Astro-FITS-Header/metadata.xml b/dev-perl/Astro-FITS-Header/metadata.xml
index 7e0223965c80..d7df40ad1242 100644
--- a/dev-perl/Astro-FITS-Header/metadata.xml
+++ b/dev-perl/Astro-FITS-Header/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Astro-FITS-Header</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header::AST</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header::CFITSIO</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header::GSD</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header::Item</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::Header::NDF</remote-id>
+    <remote-id type="cpan-module">Astro::FITS::HeaderCollection</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AtExit/metadata.xml b/dev-perl/AtExit/metadata.xml
index 5561e36429c8..60a8f1f97791 100644
--- a/dev-perl/AtExit/metadata.xml
+++ b/dev-perl/AtExit/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">AtExit</remote-id>
+    <remote-id type="cpan-module">AtExit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-DSP/metadata.xml b/dev-perl/Audio-DSP/metadata.xml
index dc43091efd55..6a5259b601ef 100644
--- a/dev-perl/Audio-DSP/metadata.xml
+++ b/dev-perl/Audio-DSP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Audio-DSP</remote-id>
+    <remote-id type="cpan-module">Audio::DSP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-FLAC-Header/metadata.xml b/dev-perl/Audio-FLAC-Header/metadata.xml
index 7aff16f94db9..17dba7dbb6d8 100644
--- a/dev-perl/Audio-FLAC-Header/metadata.xml
+++ b/dev-perl/Audio-FLAC-Header/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Audio-FLAC-Header</remote-id>
+    <remote-id type="cpan-module">Audio::FLAC::Header</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-Mixer/metadata.xml b/dev-perl/Audio-Mixer/metadata.xml
index 590a7f41f61c..ec0790f3d525 100644
--- a/dev-perl/Audio-Mixer/metadata.xml
+++ b/dev-perl/Audio-Mixer/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Audio-Mixer</remote-id>
+    <remote-id type="cpan-module">Audio::Mixer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-Scan/metadata.xml b/dev-perl/Audio-Scan/metadata.xml
index d4bcf8c289fe..07e6d5255e1e 100644
--- a/dev-perl/Audio-Scan/metadata.xml
+++ b/dev-perl/Audio-Scan/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Audio-Scan</remote-id>
+    <remote-id type="cpan-module">Audio::Scan</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-Wav/metadata.xml b/dev-perl/Audio-Wav/metadata.xml
index 959f57153a32..b3c51d9055f3 100644
--- a/dev-perl/Audio-Wav/metadata.xml
+++ b/dev-perl/Audio-Wav/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Audio-Wav</remote-id>
+    <remote-id type="cpan-module">Audio::Wav</remote-id>
+    <remote-id type="cpan-module">Audio::Wav::Read</remote-id>
+    <remote-id type="cpan-module">Audio::Wav::Tools</remote-id>
+    <remote-id type="cpan-module">Audio::Wav::Write</remote-id>
+    <remote-id type="cpan-module">Audio::Wav::Write::Header</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-DigestMD5/metadata.xml b/dev-perl/Authen-DigestMD5/metadata.xml
index 801bbf2f3e08..8dd3a735f29f 100644
--- a/dev-perl/Authen-DigestMD5/metadata.xml
+++ b/dev-perl/Authen-DigestMD5/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Authen-DigestMD5</remote-id>
+    <remote-id type="cpan-module">Authen::DigestMD5</remote-id>
+    <remote-id type="cpan-module">Authen::DigestMD5::Packet</remote-id>
+    <remote-id type="cpan-module">Authen::DigestMD5::Request</remote-id>
+    <remote-id type="cpan-module">Authen::DigestMD5::Response</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-Htpasswd/metadata.xml b/dev-perl/Authen-Htpasswd/metadata.xml
index eddefbff8227..f94b915c567f 100644
--- a/dev-perl/Authen-Htpasswd/metadata.xml
+++ b/dev-perl/Authen-Htpasswd/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Authen-Htpasswd</remote-id>
+    <remote-id type="cpan-module">Authen::Htpasswd</remote-id>
+    <remote-id type="cpan-module">Authen::Htpasswd::User</remote-id>
+    <remote-id type="cpan-module">Authen::Htpasswd::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-Libwrap/metadata.xml b/dev-perl/Authen-Libwrap/metadata.xml
index 91f2cb3aa9e2..578639653d80 100644
--- a/dev-perl/Authen-Libwrap/metadata.xml
+++ b/dev-perl/Authen-Libwrap/metadata.xml
@@ -3,10 +3,11 @@
 <pkgmetadata>
   <herd>perl</herd>
   <maintainer>
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
   </maintainer>
   <upstream>
     <remote-id type="cpan">Authen-Libwrap</remote-id>
+    <remote-id type="cpan-module">Authen::Libwrap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-NTLM/metadata.xml b/dev-perl/Authen-NTLM/metadata.xml
index 39452785fea2..340908440c3c 100644
--- a/dev-perl/Authen-NTLM/metadata.xml
+++ b/dev-perl/Authen-NTLM/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">NTLM</remote-id>
+    <remote-id type="cpan-module">Authen::NTLM</remote-id>
+    <remote-id type="cpan-module">Authen::NTLM::DES</remote-id>
+    <remote-id type="cpan-module">Authen::NTLM::MD4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-PAM/metadata.xml b/dev-perl/Authen-PAM/metadata.xml
index 1521b66af129..dabdbc96a106 100644
--- a/dev-perl/Authen-PAM/metadata.xml
+++ b/dev-perl/Authen-PAM/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Authen-PAM</remote-id>
+    <remote-id type="cpan-module">Authen::PAM</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Authen-SASL/metadata.xml b/dev-perl/Authen-SASL/metadata.xml
index 526d4d21af67..b7e86e33c918 100644
--- a/dev-perl/Authen-SASL/metadata.xml
+++ b/dev-perl/Authen-SASL/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Authen-SASL</remote-id>
+    <remote-id type="cpan-module">Authen::SASL</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::CRAM_MD5</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::EXTERNAL</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::ANONYMOUS</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::CRAM_MD5</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::DIGEST_MD5</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::EXTERNAL</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::GSSAPI</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::LOGIN</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::Layer</remote-id>
+    <remote-id type="cpan-module">Authen::SASL::Perl::PLAIN</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AutoXS-Header/metadata.xml b/dev-perl/AutoXS-Header/metadata.xml
index c4fb01743d9f..7ac8fa082727 100644
--- a/dev-perl/AutoXS-Header/metadata.xml
+++ b/dev-perl/AutoXS-Header/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">AutoXS-Header</remote-id>
+    <remote-id type="cpan-module">AutoXS::Header</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-Hooks-EndOfScope/metadata.xml b/dev-perl/B-Hooks-EndOfScope/metadata.xml
index 39ba9a6d8eca..bc38f54ee1a6 100644
--- a/dev-perl/B-Hooks-EndOfScope/metadata.xml
+++ b/dev-perl/B-Hooks-EndOfScope/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">B-Hooks-EndOfScope</remote-id>
+    <remote-id type="cpan-module">B::Hooks::EndOfScope</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-Hooks-OP-Check/metadata.xml b/dev-perl/B-Hooks-OP-Check/metadata.xml
index c1dcc7cc6e9e..dd429bfc5781 100644
--- a/dev-perl/B-Hooks-OP-Check/metadata.xml
+++ b/dev-perl/B-Hooks-OP-Check/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">B-Hooks-OP-Check</remote-id>
+    <remote-id type="cpan-module">B::Hooks::OP::Check</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.110.0.ebuild b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.110.0.ebuild
new file mode 100644
index 000000000000..d25c2e0746ea
--- /dev/null
+++ b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.110.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.110.0.ebuild,v 1.1 2012/06/24 15:48:57 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=ZEFRAM
+MODULE_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Interface to perls parser variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/B-Hooks-OP-Check"
+DEPEND="${RDEPEND}
+	>=dev-perl/extutils-depends-0.302
+	test? ( dev-perl/Test-Exception
+		dev-perl/B-Hooks-EndOfScope )"
+SRC_TEST=do
diff --git a/dev-perl/B-Hooks-Parser/Manifest b/dev-perl/B-Hooks-Parser/Manifest
index 239ea92580d5..ef12d082db46 100644
--- a/dev-perl/B-Hooks-Parser/Manifest
+++ b/dev-perl/B-Hooks-Parser/Manifest
@@ -1 +1,2 @@
 DIST B-Hooks-Parser-0.10.tar.gz 71735 RMD160 9008024eb0a2145123edce88a35bf92f7139de13 SHA1 9072be01fd6452cd3cd6d43677bd16ef20d9ed56 SHA256 4593eac5cb5f488c90a19eea553ac5571e194086c448c4f0d39f13aa80b55329
+DIST B-Hooks-Parser-0.11.tar.gz 71116 RMD160 907dc2e768180ebb19bcbc0ce9ee52f5ef926270 SHA1 08b57e89db829954005d21a0bd853677c36e1f29 SHA256 48320553c9f1615c08a5e093c7bfcab85a6fde2e77b65ee288e194b4e5ba7e71
diff --git a/dev-perl/B-Hooks-Parser/metadata.xml b/dev-perl/B-Hooks-Parser/metadata.xml
index 1cde5582721e..cf838d24c790 100644
--- a/dev-perl/B-Hooks-Parser/metadata.xml
+++ b/dev-perl/B-Hooks-Parser/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">B-Hooks-Parser</remote-id>
+    <remote-id type="cpan-module">B::Hooks::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-Keywords/metadata.xml b/dev-perl/B-Keywords/metadata.xml
index 4e3ed16429ce..a102693cd43e 100644
--- a/dev-perl/B-Keywords/metadata.xml
+++ b/dev-perl/B-Keywords/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">B-Keywords</remote-id>
+    <remote-id type="cpan-module">B::Keywords</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-OPCheck/metadata.xml b/dev-perl/B-OPCheck/metadata.xml
index 49933cb999e5..f396eb4f3fe0 100644
--- a/dev-perl/B-OPCheck/metadata.xml
+++ b/dev-perl/B-OPCheck/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">B-OPCheck</remote-id>
+    <remote-id type="cpan-module">B::OPCheck</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/B-Utils/metadata.xml b/dev-perl/B-Utils/metadata.xml
index d6bbf1c1cefc..69dc7e21c36e 100644
--- a/dev-perl/B-Utils/metadata.xml
+++ b/dev-perl/B-Utils/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">B-Utils</remote-id>
+    <remote-id type="cpan-module">B::Utils</remote-id>
+    <remote-id type="cpan-module">B::Utils::Install::Files</remote-id>
+    <remote-id type="cpan-module">B::Utils::OP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/BSD-Resource/metadata.xml b/dev-perl/BSD-Resource/metadata.xml
index 59f0795c980e..024fb90bfa04 100644
--- a/dev-perl/BSD-Resource/metadata.xml
+++ b/dev-perl/BSD-Resource/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">BSD-Resource</remote-id>
+    <remote-id type="cpan-module">BSD::Resource</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/BerkeleyDB/metadata.xml b/dev-perl/BerkeleyDB/metadata.xml
index 73bf8e107da1..8ea9bf1a2007 100644
--- a/dev-perl/BerkeleyDB/metadata.xml
+++ b/dev-perl/BerkeleyDB/metadata.xml
@@ -4,5 +4,21 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">BerkeleyDB</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Btree</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::CDS::Lock</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Common</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Cursor</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Env</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Hash</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Heap</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Queue</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Recno</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Term</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Txn</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::TxnMgr</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::Unknown</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::_tiedArray</remote-id>
+    <remote-id type="cpan-module">BerkeleyDB::_tiedHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bio-ASN1-EntrezGene/metadata.xml b/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
index 23af5dd15b88..aba5f687e27b 100644
--- a/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
+++ b/dev-perl/Bio-ASN1-EntrezGene/metadata.xml
@@ -9,5 +9,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-ASN1-EntrezGene</remote-id>
+    <remote-id type="cpan-module">Bio::ASN1::EntrezGene</remote-id>
+    <remote-id type="cpan-module">Bio::ASN1::EntrezGene::Indexer</remote-id>
+    <remote-id type="cpan-module">Bio::ASN1::Sequence</remote-id>
+    <remote-id type="cpan-module">Bio::ASN1::Sequence::Indexer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bio-Das/metadata.xml b/dev-perl/Bio-Das/metadata.xml
index c4605d3ab482..b5a15bb35507 100644
--- a/dev-perl/Bio-Das/metadata.xml
+++ b/dev-perl/Bio-Das/metadata.xml
@@ -5,5 +5,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Bio-Das</remote-id>
+    <remote-id type="cpan-module">Bio::Das</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::Config</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::Daemon</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::Parser</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::SQLStorage</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::SQLStorage::CSV::DB</remote-id>
+    <remote-id type="cpan-module">Bio::Das::AGPServer::SQLStorage::MySQL::DB</remote-id>
+    <remote-id type="cpan-module">Bio::Das::DSN</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Feature</remote-id>
+    <remote-id type="cpan-module">Bio::Das::FeatureIterator</remote-id>
+    <remote-id type="cpan-module">Bio::Das::HTTP::Fetch</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Map</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Dnas</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Dsn</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Entry_points</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Feature2Segments</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Features</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Sequences</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Stylesheet</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Request::Types</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Segment</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Stylesheet</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Type</remote-id>
+    <remote-id type="cpan-module">Bio::Das::TypeHandler</remote-id>
+    <remote-id type="cpan-module">Bio::Das::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bio-Graphics/metadata.xml b/dev-perl/Bio-Graphics/metadata.xml
index 7b2c7476d0d9..aaf372f0fd75 100644
--- a/dev-perl/Bio-Graphics/metadata.xml
+++ b/dev-perl/Bio-Graphics/metadata.xml
@@ -9,5 +9,112 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-Graphics</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::ConfiguratorI</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::DrawTransmembrane</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Feature</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::FeatureBase</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::FeatureDir</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::FeatureFile</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::FeatureFile::Iterator</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::FileSplitter</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::Factory</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::alignment</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::allele_tower</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::anchored_arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::box</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::broken_line</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::cds</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::christmas_arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::cross</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::crossbox</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::dashed_line</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::diamond</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::dna</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::dot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::dumbbell</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ellipse</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ex</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::extending_arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::fixedwidth</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::flag</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::gene</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::generic</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::graded_segments</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::group</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::hat</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::heat_map</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::heat_map_ideogram</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::heterogeneous_segments</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::hidden</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::hybrid_plot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ideogram</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::image</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::lightning</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::line</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::merge_parts</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::merged_alignment</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::minmax</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::operon</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::oval</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::pairplot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::pentagram</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::phylo_align</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::pinsertion</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::point_glyph</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::primers</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::processed_transcript</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::protein</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ragged_ends</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::rainbow_gene</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::read_pair</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::redgreen_box</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::redgreen_segment</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::repeating_shape</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::rndrect</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ruler_arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::saw_teeth</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::scale</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::segmented_keyglyph</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::segments</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::smoothing</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::so_transcript</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::span</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::spectrogram</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::splice_site</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::stackedplot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::ternary_plot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::text_in_box</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::three_letters</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::tic_tac_toe</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::toomany</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::trace</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::track</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::transcript</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::transcript2</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::translation</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::triangle</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::two_bolts</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::vista_plot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wave</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::weighted_arrow</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::whiskerplot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wiggle_box</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wiggle_data</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wiggle_density</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wiggle_whiskers</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::wiggle_xyplot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::xyplot</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Layout</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Layout::Contour</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Math</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Panel</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Pictogram</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::RendererI</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Util</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Wiggle</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Wiggle::Loader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bio-SamTools/metadata.xml b/dev-perl/Bio-SamTools/metadata.xml
index b0bab53dd025..4715c861cc63 100644
--- a/dev-perl/Bio-SamTools/metadata.xml
+++ b/dev-perl/Bio-SamTools/metadata.xml
@@ -9,5 +9,22 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Bio-SamTools</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::AlignWrapper</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::Alignment</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::FetchIterator</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::Pileup</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::PileupWrapper</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::Query</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::ReadIterator</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::SplitAlignmentPart</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Bam::Target</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam::Constants</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam::Fai</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam::SamToGBrowse</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam::Segment</remote-id>
+    <remote-id type="cpan-module">Bio::DB::Sam::Segment::Iterator</remote-id>
+    <remote-id type="cpan-module">Bio::SeqFeature::Coverage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bit-Vector-Minimal/metadata.xml b/dev-perl/Bit-Vector-Minimal/metadata.xml
index bfa6d2131005..e178dbbbf4ce 100644
--- a/dev-perl/Bit-Vector-Minimal/metadata.xml
+++ b/dev-perl/Bit-Vector-Minimal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Bit-Vector-Minimal</remote-id>
+    <remote-id type="cpan-module">Bit::Vector::Minimal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bit-Vector/metadata.xml b/dev-perl/Bit-Vector/metadata.xml
index b05a55bfe67c..05325eca43cc 100644
--- a/dev-perl/Bit-Vector/metadata.xml
+++ b/dev-perl/Bit-Vector/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Bit-Vector</remote-id>
+    <remote-id type="cpan-module">Bit::Vector</remote-id>
+    <remote-id type="cpan-module">Bit::Vector::Overload</remote-id>
+    <remote-id type="cpan-module">Bit::Vector::String</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Boulder/metadata.xml b/dev-perl/Boulder/metadata.xml
index dc8885dfd07b..171da44efcae 100644
--- a/dev-perl/Boulder/metadata.xml
+++ b/dev-perl/Boulder/metadata.xml
@@ -5,5 +5,31 @@
   <longdescription>Parse and read BLASTs, Boulders, Stones</longdescription>
   <upstream>
     <remote-id type="cpan">Boulder</remote-id>
+    <remote-id type="cpan-module">Boulder::Blast</remote-id>
+    <remote-id type="cpan-module">Boulder::Blast::NCBI</remote-id>
+    <remote-id type="cpan-module">Boulder::Blast::WU</remote-id>
+    <remote-id type="cpan-module">Boulder::Genbank</remote-id>
+    <remote-id type="cpan-module">Boulder::Labbase</remote-id>
+    <remote-id type="cpan-module">Boulder::LocusLink</remote-id>
+    <remote-id type="cpan-module">Boulder::Medline</remote-id>
+    <remote-id type="cpan-module">Boulder::Omim</remote-id>
+    <remote-id type="cpan-module">Boulder::Store</remote-id>
+    <remote-id type="cpan-module">Boulder::Stream</remote-id>
+    <remote-id type="cpan-module">Boulder::String</remote-id>
+    <remote-id type="cpan-module">Boulder::Swissprot</remote-id>
+    <remote-id type="cpan-module">Boulder::Unigene</remote-id>
+    <remote-id type="cpan-module">Boulder::XML</remote-id>
+    <remote-id type="cpan-module">Entrez</remote-id>
+    <remote-id type="cpan-module">File</remote-id>
+    <remote-id type="cpan-module">GenbankAccessor</remote-id>
+    <remote-id type="cpan-module">LocusLinkAccessor</remote-id>
+    <remote-id type="cpan-module">MedlineAccessor</remote-id>
+    <remote-id type="cpan-module">OmimAccessor</remote-id>
+    <remote-id type="cpan-module">Stone</remote-id>
+    <remote-id type="cpan-module">Stone::Cursor</remote-id>
+    <remote-id type="cpan-module">Stone::GB_Sequence</remote-id>
+    <remote-id type="cpan-module">SwissprotAccessor</remote-id>
+    <remote-id type="cpan-module">UnigeneAccessor</remote-id>
+    <remote-id type="cpan-module">Yank</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Business-FedEx-DirectConnect/metadata.xml b/dev-perl/Business-FedEx-DirectConnect/metadata.xml
index 3631a450fb0e..d4983eb5fa60 100644
--- a/dev-perl/Business-FedEx-DirectConnect/metadata.xml
+++ b/dev-perl/Business-FedEx-DirectConnect/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Business-FedEx-DirectConnect</remote-id>
+    <remote-id type="cpan-module">Business::FedEx::Constants</remote-id>
+    <remote-id type="cpan-module">Business::FedEx::DirectConnect</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Business-UPS/metadata.xml b/dev-perl/Business-UPS/metadata.xml
index 9058417c6b22..dd5c133c570a 100644
--- a/dev-perl/Business-UPS/metadata.xml
+++ b/dev-perl/Business-UPS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Business-UPS</remote-id>
+    <remote-id type="cpan-module">Business::UPS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CDB_File/metadata.xml b/dev-perl/CDB_File/metadata.xml
index db1890a2d34d..3abd6ac88e7a 100644
--- a/dev-perl/CDB_File/metadata.xml
+++ b/dev-perl/CDB_File/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">CDB_File</remote-id>
+    <remote-id type="cpan-module">CDB_File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CDDB-File/metadata.xml b/dev-perl/CDDB-File/metadata.xml
index 25bbdfd13c7c..017ee1d479a0 100644
--- a/dev-perl/CDDB-File/metadata.xml
+++ b/dev-perl/CDDB-File/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CDDB-File</remote-id>
+    <remote-id type="cpan-module">CDDB::File</remote-id>
+    <remote-id type="cpan-module">CDDB::File::Track</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CDDB/metadata.xml b/dev-perl/CDDB/metadata.xml
index b8612cb83cad..4de4d75c9777 100644
--- a/dev-perl/CDDB/metadata.xml
+++ b/dev-perl/CDDB/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CDDB</remote-id>
+    <remote-id type="cpan-module">CDDB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CDDB_get/metadata.xml b/dev-perl/CDDB_get/metadata.xml
index 466093c2cf95..0664831231ae 100644
--- a/dev-perl/CDDB_get/metadata.xml
+++ b/dev-perl/CDDB_get/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CDDB_get</remote-id>
+    <remote-id type="cpan-module">CDDB_cache</remote-id>
+    <remote-id type="cpan-module">CDDB_get</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-Builder/metadata.xml b/dev-perl/CGI-Builder/metadata.xml
index f282a1f7523c..037610eab0ad 100644
--- a/dev-perl/CGI-Builder/metadata.xml
+++ b/dev-perl/CGI-Builder/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-Builder</remote-id>
+    <remote-id type="cpan-module">CGI::Builder</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-Emulate-PSGI/metadata.xml b/dev-perl/CGI-Emulate-PSGI/metadata.xml
index d179e2622546..2b4f34faf080 100644
--- a/dev-perl/CGI-Emulate-PSGI/metadata.xml
+++ b/dev-perl/CGI-Emulate-PSGI/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-Emulate-PSGI</remote-id>
+    <remote-id type="cpan-module">CGI::Emulate::PSGI</remote-id>
+    <remote-id type="cpan-module">CGI::Parse::PSGI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-FastTemplate/metadata.xml b/dev-perl/CGI-FastTemplate/metadata.xml
index 8fd43703dbe8..7bde304d8f9f 100644
--- a/dev-perl/CGI-FastTemplate/metadata.xml
+++ b/dev-perl/CGI-FastTemplate/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-FastTemplate</remote-id>
+    <remote-id type="cpan-module">CGI::FastTemplate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-FormBuilder/metadata.xml b/dev-perl/CGI-FormBuilder/metadata.xml
index a64b0a2d31e2..32a527bc7dc7 100644
--- a/dev-perl/CGI-FormBuilder/metadata.xml
+++ b/dev-perl/CGI-FormBuilder/metadata.xml
@@ -4,5 +4,43 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-FormBuilder</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::button</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::checkbox</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::date</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::datetime</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::datetime_local</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::email</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::file</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::hidden</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::image</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::number</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::password</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::radio</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::select</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::static</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::submit</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::text</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::textarea</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::time</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Field::url</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Messages</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Messages::base</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Messages::default</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Messages::locale</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Multi</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Source</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Source::File</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::Builtin</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::CGI_SSI</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::Div</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::Fast</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::HTML</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::TT2</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Template::Text</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Test</remote-id>
+    <remote-id type="cpan-module">CGI::FormBuilder::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-PSGI/metadata.xml b/dev-perl/CGI-PSGI/metadata.xml
index 26af35dedb12..69b7974bd312 100644
--- a/dev-perl/CGI-PSGI/metadata.xml
+++ b/dev-perl/CGI-PSGI/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-PSGI</remote-id>
+    <remote-id type="cpan-module">CGI::PSGI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CGI-Session/metadata.xml b/dev-perl/CGI-Session/metadata.xml
index d978fca3664b..0be8c5262a35 100644
--- a/dev-perl/CGI-Session/metadata.xml
+++ b/dev-perl/CGI-Session/metadata.xml
@@ -4,5 +4,24 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-Session</remote-id>
+    <remote-id type="cpan-module">CGI::Session</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::DBI</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::db_file</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::file</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::mysql</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::postgresql</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Driver::sqlite</remote-id>
+    <remote-id type="cpan-module">CGI::Session::ErrorHandler</remote-id>
+    <remote-id type="cpan-module">CGI::Session::ID::incr</remote-id>
+    <remote-id type="cpan-module">CGI::Session::ID::md5</remote-id>
+    <remote-id type="cpan-module">CGI::Session::ID::static</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Serialize::default</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Serialize::freezethaw</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Serialize::storable</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Test::Default</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Test::SimpleObjectClass</remote-id>
+    <remote-id type="cpan-module">CGI::Session::Tutorial</remote-id>
+    <remote-id type="cpan-module">OverloadedClass</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CPAN-Checksums/metadata.xml b/dev-perl/CPAN-Checksums/metadata.xml
index 132f0bf99428..a3b70dfa4610 100644
--- a/dev-perl/CPAN-Checksums/metadata.xml
+++ b/dev-perl/CPAN-Checksums/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CPAN-Checksums</remote-id>
+    <remote-id type="cpan-module">CPAN::Checksums</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CPAN-Mini-Inject/metadata.xml b/dev-perl/CPAN-Mini-Inject/metadata.xml
index b3d942077a10..5a30be3cf669 100644
--- a/dev-perl/CPAN-Mini-Inject/metadata.xml
+++ b/dev-perl/CPAN-Mini-Inject/metadata.xml
@@ -5,5 +5,7 @@
   <longdescription>Provides the binary mcpani for adding a module to the repository for later inclusion in the CPAN Mini mirror.</longdescription>
   <upstream>
     <remote-id type="cpan">CPAN-Mini-Inject</remote-id>
+    <remote-id type="cpan-module">CPAN::Mini::Inject</remote-id>
+    <remote-id type="cpan-module">CPAN::Mini::Inject::Config</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CPAN-Mini/metadata.xml b/dev-perl/CPAN-Mini/metadata.xml
index 4409a7fa08d7..b97738b4af46 100644
--- a/dev-perl/CPAN-Mini/metadata.xml
+++ b/dev-perl/CPAN-Mini/metadata.xml
@@ -5,5 +5,7 @@
   <longdescription>Provides minicpan, a means of creating a portable CPAN distribution to remote sites.</longdescription>
   <upstream>
     <remote-id type="cpan">CPAN-Mini</remote-id>
+    <remote-id type="cpan-module">CPAN::Mini</remote-id>
+    <remote-id type="cpan-module">CPAN::Mini::App</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CQL-Parser/metadata.xml b/dev-perl/CQL-Parser/metadata.xml
index c8ba38b6c7d1..d75a42786d77 100644
--- a/dev-perl/CQL-Parser/metadata.xml
+++ b/dev-perl/CQL-Parser/metadata.xml
@@ -8,5 +8,22 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">CQL-Parser</remote-id>
+    <remote-id type="cpan-module">CQL::AndNode</remote-id>
+    <remote-id type="cpan-module">CQL::BooleanNode</remote-id>
+    <remote-id type="cpan-module">CQL::Lexer</remote-id>
+    <remote-id type="cpan-module">CQL::ModifierSet</remote-id>
+    <remote-id type="cpan-module">CQL::Node</remote-id>
+    <remote-id type="cpan-module">CQL::NotNode</remote-id>
+    <remote-id type="cpan-module">CQL::OrNode</remote-id>
+    <remote-id type="cpan-module">CQL::Parser</remote-id>
+    <remote-id type="cpan-module">CQL::Prefix</remote-id>
+    <remote-id type="cpan-module">CQL::PrefixNode</remote-id>
+    <remote-id type="cpan-module">CQL::ProxModifierSet</remote-id>
+    <remote-id type="cpan-module">CQL::ProxNode</remote-id>
+    <remote-id type="cpan-module">CQL::Relation</remote-id>
+    <remote-id type="cpan-module">CQL::TermNode</remote-id>
+    <remote-id type="cpan-module">CQL::Token</remote-id>
+    <remote-id type="cpan-module">CQL::Utils</remote-id>
+    <remote-id type="cpan-module">CQL::Visitor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CSS-Minifier/metadata.xml b/dev-perl/CSS-Minifier/metadata.xml
index ff3235d236c2..d83b098af8e3 100644
--- a/dev-perl/CSS-Minifier/metadata.xml
+++ b/dev-perl/CSS-Minifier/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CSS-Minifier</remote-id>
+    <remote-id type="cpan-module">CSS::Minifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CSS-Squish/metadata.xml b/dev-perl/CSS-Squish/metadata.xml
index 7c1baf1a23b5..8674eedaeb04 100644
--- a/dev-perl/CSS-Squish/metadata.xml
+++ b/dev-perl/CSS-Squish/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CSS-Squish</remote-id>
+    <remote-id type="cpan-module">CSS::Squish</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cache-Cache/metadata.xml b/dev-perl/Cache-Cache/metadata.xml
index a3b2fb5a229e..e49d246def39 100644
--- a/dev-perl/Cache-Cache/metadata.xml
+++ b/dev-perl/Cache-Cache/metadata.xml
@@ -4,5 +4,25 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cache-Cache</remote-id>
+    <remote-id type="cpan-module">Cache::BaseCache</remote-id>
+    <remote-id type="cpan-module">Cache::BaseCacheTester</remote-id>
+    <remote-id type="cpan-module">Cache::Cache</remote-id>
+    <remote-id type="cpan-module">Cache::CacheMetaData</remote-id>
+    <remote-id type="cpan-module">Cache::CacheSizer</remote-id>
+    <remote-id type="cpan-module">Cache::CacheTester</remote-id>
+    <remote-id type="cpan-module">Cache::CacheUtils</remote-id>
+    <remote-id type="cpan-module">Cache::FileBackend</remote-id>
+    <remote-id type="cpan-module">Cache::FileCache</remote-id>
+    <remote-id type="cpan-module">Cache::MemoryBackend</remote-id>
+    <remote-id type="cpan-module">Cache::MemoryCache</remote-id>
+    <remote-id type="cpan-module">Cache::NullCache</remote-id>
+    <remote-id type="cpan-module">Cache::Object</remote-id>
+    <remote-id type="cpan-module">Cache::SharedMemoryBackend</remote-id>
+    <remote-id type="cpan-module">Cache::SharedMemoryCache</remote-id>
+    <remote-id type="cpan-module">Cache::SizeAwareCache</remote-id>
+    <remote-id type="cpan-module">Cache::SizeAwareCacheTester</remote-id>
+    <remote-id type="cpan-module">Cache::SizeAwareFileCache</remote-id>
+    <remote-id type="cpan-module">Cache::SizeAwareMemoryCache</remote-id>
+    <remote-id type="cpan-module">Cache::SizeAwareSharedMemoryCache</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cache-Memcached-Fast/metadata.xml b/dev-perl/Cache-Memcached-Fast/metadata.xml
index 46e2b9d7ddb3..d8ec9b759d5b 100644
--- a/dev-perl/Cache-Memcached-Fast/metadata.xml
+++ b/dev-perl/Cache-Memcached-Fast/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Cache-Memcached-Fast</remote-id>
+    <remote-id type="cpan-module">Cache::Memcached::Fast</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cache-Memcached/metadata.xml b/dev-perl/Cache-Memcached/metadata.xml
index 7d9080e2b712..0cb60d3dae41 100644
--- a/dev-perl/Cache-Memcached/metadata.xml
+++ b/dev-perl/Cache-Memcached/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cache-Memcached</remote-id>
+    <remote-id type="cpan-module">Cache::Memcached</remote-id>
+    <remote-id type="cpan-module">Cache::Memcached::GetParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cache-Simple-TimedExpiry/metadata.xml b/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
index 64a040a3639b..03a9637eac11 100644
--- a/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
+++ b/dev-perl/Cache-Simple-TimedExpiry/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cache-Simple-TimedExpiry</remote-id>
+    <remote-id type="cpan-module">Cache::Simple::TimedExpiry</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cache/metadata.xml b/dev-perl/Cache/metadata.xml
index c10d35e0d189..a18ce47ba041 100644
--- a/dev-perl/Cache/metadata.xml
+++ b/dev-perl/Cache/metadata.xml
@@ -2,9 +2,23 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>perl</herd>
-	<longdescription lang="en">
-	</longdescription>
 	<upstream>
 		<remote-id type="cpan">Cache</remote-id>
+		<remote-id type="cpan-module">Cache</remote-id>
+		<remote-id type="cpan-module">Cache::Entry</remote-id>
+		<remote-id type="cpan-module">Cache::File</remote-id>
+		<remote-id type="cpan-module">Cache::File::Entry</remote-id>
+		<remote-id type="cpan-module">Cache::File::Handle</remote-id>
+		<remote-id type="cpan-module">Cache::File::Heap</remote-id>
+		<remote-id type="cpan-module">Cache::IOString</remote-id>
+		<remote-id type="cpan-module">Cache::Memory</remote-id>
+		<remote-id type="cpan-module">Cache::Memory::Entry</remote-id>
+		<remote-id type="cpan-module">Cache::Memory::HeapElem</remote-id>
+		<remote-id type="cpan-module">Cache::Null</remote-id>
+		<remote-id type="cpan-module">Cache::Null::Entry</remote-id>
+		<remote-id type="cpan-module">Cache::RemovalStrategy</remote-id>
+		<remote-id type="cpan-module">Cache::RemovalStrategy::FIFO</remote-id>
+		<remote-id type="cpan-module">Cache::RemovalStrategy::LRU</remote-id>
+		<remote-id type="cpan-module">Cache::Tester</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cairo/metadata.xml b/dev-perl/Cairo/metadata.xml
index b00f28179cd0..e1a11e9e2fa5 100644
--- a/dev-perl/Cairo/metadata.xml
+++ b/dev-perl/Cairo/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cairo</remote-id>
+    <remote-id type="cpan-module">Cairo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Calendar-Simple/metadata.xml b/dev-perl/Calendar-Simple/metadata.xml
index e327052fccba..31e5dbde6076 100644
--- a/dev-perl/Calendar-Simple/metadata.xml
+++ b/dev-perl/Calendar-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Calendar-Simple</remote-id>
+    <remote-id type="cpan-module">Calendar::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Capture-Tiny/metadata.xml b/dev-perl/Capture-Tiny/metadata.xml
index b1f8261c47e6..f6442cfae76b 100644
--- a/dev-perl/Capture-Tiny/metadata.xml
+++ b/dev-perl/Capture-Tiny/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Capture-Tiny</remote-id>
+    <remote-id type="cpan-module">Capture::Tiny</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Carp-Assert-More/metadata.xml b/dev-perl/Carp-Assert-More/metadata.xml
index e1ac7b3f25ce..522d9156f94e 100644
--- a/dev-perl/Carp-Assert-More/metadata.xml
+++ b/dev-perl/Carp-Assert-More/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Carp-Assert-More</remote-id>
+    <remote-id type="cpan-module">Carp::Assert::More</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Carp-Assert/metadata.xml b/dev-perl/Carp-Assert/metadata.xml
index 0b984e22dd95..95381f0ff4e4 100644
--- a/dev-perl/Carp-Assert/metadata.xml
+++ b/dev-perl/Carp-Assert/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Carp-Assert</remote-id>
+    <remote-id type="cpan-module">Carp::Assert</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Carp-Clan/metadata.xml b/dev-perl/Carp-Clan/metadata.xml
index 96f0683ed450..443775ee2f5d 100644
--- a/dev-perl/Carp-Clan/metadata.xml
+++ b/dev-perl/Carp-Clan/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Carp-Clan</remote-id>
+    <remote-id type="cpan-module">Carp::Clan</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cgi-Simple/metadata.xml b/dev-perl/Cgi-Simple/metadata.xml
index 66bf49dfa03d..babe24f21678 100644
--- a/dev-perl/Cgi-Simple/metadata.xml
+++ b/dev-perl/Cgi-Simple/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI-Simple</remote-id>
+    <remote-id type="cpan-module">CGI::Simple</remote-id>
+    <remote-id type="cpan-module">CGI::Simple::Cookie</remote-id>
+    <remote-id type="cpan-module">CGI::Simple::Standard</remote-id>
+    <remote-id type="cpan-module">CGI::Simple::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Chart-Math-Axis/metadata.xml b/dev-perl/Chart-Math-Axis/metadata.xml
index 0e9e2a50752b..fc28b2e72d68 100644
--- a/dev-perl/Chart-Math-Axis/metadata.xml
+++ b/dev-perl/Chart-Math-Axis/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Chart-Math-Axis</remote-id>
+    <remote-id type="cpan-module">Chart::Math::Axis</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Chart/metadata.xml b/dev-perl/Chart/metadata.xml
index 70a1efd10710..19163b58c8d3 100644
--- a/dev-perl/Chart/metadata.xml
+++ b/dev-perl/Chart/metadata.xml
@@ -4,5 +4,21 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Chart</remote-id>
+    <remote-id type="cpan-module">Chart::Bars</remote-id>
+    <remote-id type="cpan-module">Chart::Base</remote-id>
+    <remote-id type="cpan-module">Chart::BrushStyles</remote-id>
+    <remote-id type="cpan-module">Chart::Composite</remote-id>
+    <remote-id type="cpan-module">Chart::Constants</remote-id>
+    <remote-id type="cpan-module">Chart::Direction</remote-id>
+    <remote-id type="cpan-module">Chart::ErrorBars</remote-id>
+    <remote-id type="cpan-module">Chart::HorizontalBars</remote-id>
+    <remote-id type="cpan-module">Chart::Lines</remote-id>
+    <remote-id type="cpan-module">Chart::LinesPoints</remote-id>
+    <remote-id type="cpan-module">Chart::Mountain</remote-id>
+    <remote-id type="cpan-module">Chart::Pareto</remote-id>
+    <remote-id type="cpan-module">Chart::Pie</remote-id>
+    <remote-id type="cpan-module">Chart::Points</remote-id>
+    <remote-id type="cpan-module">Chart::Split</remote-id>
+    <remote-id type="cpan-module">Chart::StackedBars</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cisco-IPPhone/metadata.xml b/dev-perl/Cisco-IPPhone/metadata.xml
index 50cbac1b338a..97787ef023ac 100644
--- a/dev-perl/Cisco-IPPhone/metadata.xml
+++ b/dev-perl/Cisco-IPPhone/metadata.xml
@@ -8,5 +8,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cisco-IPPhone</remote-id>
+    <remote-id type="cpan-module">Cisco::IPPhone</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Cisco-Reconfig/metadata.xml b/dev-perl/Cisco-Reconfig/metadata.xml
index f782b466b364..ff8aa834d16d 100644
--- a/dev-perl/Cisco-Reconfig/metadata.xml
+++ b/dev-perl/Cisco-Reconfig/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cisco-Reconfig</remote-id>
+    <remote-id type="cpan-module">Cisco::Reconfig</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Accessor-Chained/metadata.xml b/dev-perl/Class-Accessor-Chained/metadata.xml
index 324767938b6a..c86050b181d7 100644
--- a/dev-perl/Class-Accessor-Chained/metadata.xml
+++ b/dev-perl/Class-Accessor-Chained/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Chained</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Chained</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Chained::Fast</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Accessor-Grouped/metadata.xml b/dev-perl/Class-Accessor-Grouped/metadata.xml
index c803ae139716..809da092a52f 100644
--- a/dev-perl/Class-Accessor-Grouped/metadata.xml
+++ b/dev-perl/Class-Accessor-Grouped/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Grouped</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Grouped</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Accessor-Lite/metadata.xml b/dev-perl/Class-Accessor-Lite/metadata.xml
index 2727e96be87b..d8459b76bb23 100644
--- a/dev-perl/Class-Accessor-Lite/metadata.xml
+++ b/dev-perl/Class-Accessor-Lite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Accessor-Lite</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Lite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Accessor/metadata.xml b/dev-perl/Class-Accessor/metadata.xml
index 3baaef802a98..c1f160f0844d 100644
--- a/dev-perl/Class-Accessor/metadata.xml
+++ b/dev-perl/Class-Accessor/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Accessor</remote-id>
+    <remote-id type="cpan-module">Class::Accessor</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Fast</remote-id>
+    <remote-id type="cpan-module">Class::Accessor::Faster</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Adapter/metadata.xml b/dev-perl/Class-Adapter/metadata.xml
index 678755ae307d..2d4ef0ceaf39 100644
--- a/dev-perl/Class-Adapter/metadata.xml
+++ b/dev-perl/Class-Adapter/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Adapter</remote-id>
+    <remote-id type="cpan-module">Class::Adapter</remote-id>
+    <remote-id type="cpan-module">Class::Adapter::Builder</remote-id>
+    <remote-id type="cpan-module">Class::Adapter::Clear</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Autouse/metadata.xml b/dev-perl/Class-Autouse/metadata.xml
index 9ae08c3672bf..b584642fd1c9 100644
--- a/dev-perl/Class-Autouse/metadata.xml
+++ b/dev-perl/Class-Autouse/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Autouse</remote-id>
+    <remote-id type="cpan-module">Class::Autouse</remote-id>
+    <remote-id type="cpan-module">Class::Autouse::Parent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Base/metadata.xml b/dev-perl/Class-Base/metadata.xml
index 71f0aa6433a1..715d0d78cfd5 100644
--- a/dev-perl/Class-Base/metadata.xml
+++ b/dev-perl/Class-Base/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Class-Base</remote-id>
+    <remote-id type="cpan-module">Class::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-C3-Componentised/metadata.xml b/dev-perl/Class-C3-Componentised/metadata.xml
index 341295096346..7ef21f64808c 100644
--- a/dev-perl/Class-C3-Componentised/metadata.xml
+++ b/dev-perl/Class-C3-Componentised/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Class-C3-Componentised</remote-id>
+    <remote-id type="cpan-module">Class::C3::Componentised</remote-id>
+    <remote-id type="cpan-module">Class::C3::Componentised::ApplyHooks</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-C3-XS/metadata.xml b/dev-perl/Class-C3-XS/metadata.xml
index 73dd6ae51e2a..1118bf0469bc 100644
--- a/dev-perl/Class-C3-XS/metadata.xml
+++ b/dev-perl/Class-C3-XS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-C3-XS</remote-id>
+    <remote-id type="cpan-module">Class::C3::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-C3/metadata.xml b/dev-perl/Class-C3/metadata.xml
index 0a947c290302..fcc1d688cec1 100644
--- a/dev-perl/Class-C3/metadata.xml
+++ b/dev-perl/Class-C3/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-C3</remote-id>
+    <remote-id type="cpan-module">Class::C3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Container/metadata.xml b/dev-perl/Class-Container/metadata.xml
index 42abec58918c..209fe9f30098 100644
--- a/dev-perl/Class-Container/metadata.xml
+++ b/dev-perl/Class-Container/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Container</remote-id>
+    <remote-id type="cpan-module">Class::Container</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-DBI-AbstractSearch/metadata.xml b/dev-perl/Class-DBI-AbstractSearch/metadata.xml
index d77f04b99703..9dbc5b7f48bb 100644
--- a/dev-perl/Class-DBI-AbstractSearch/metadata.xml
+++ b/dev-perl/Class-DBI-AbstractSearch/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Class-DBI-AbstractSearch</remote-id>
+    <remote-id type="cpan-module">Class::DBI::AbstractSearch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml b/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
index 2dee1eff403d..5a0df477c0d9 100644
--- a/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
+++ b/dev-perl/Class-DBI-Plugin-DeepAbstractSearch/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-DBI-Plugin-DeepAbstractSearch</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Plugin::DeepAbstractSearch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-DBI-Plugin/metadata.xml b/dev-perl/Class-DBI-Plugin/metadata.xml
index f5d445e6d95e..8ee3434e07c5 100644
--- a/dev-perl/Class-DBI-Plugin/metadata.xml
+++ b/dev-perl/Class-DBI-Plugin/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-DBI-Plugin</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Plugin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-DBI-mysql/metadata.xml b/dev-perl/Class-DBI-mysql/metadata.xml
index 9bd451943cbe..ca695e0845a3 100644
--- a/dev-perl/Class-DBI-mysql/metadata.xml
+++ b/dev-perl/Class-DBI-mysql/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-DBI-mysql</remote-id>
+    <remote-id type="cpan-module">Class::DBI::mysql</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-DBI/metadata.xml b/dev-perl/Class-DBI/metadata.xml
index d692cd663d41..240d2456d575 100644
--- a/dev-perl/Class-DBI/metadata.xml
+++ b/dev-perl/Class-DBI/metadata.xml
@@ -4,5 +4,23 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-DBI</remote-id>
+    <remote-id type="cpan-module">Class::DBI</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Attribute</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Cascade::Delete</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Cascade::Fail</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Cascade::None</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Column</remote-id>
+    <remote-id type="cpan-module">Class::DBI::ColumnGrouper</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Iterator</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Query</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Query::Base</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Relationship</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Relationship::HasA</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Relationship::HasMany</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Relationship::MightHave</remote-id>
+    <remote-id type="cpan-module">Class::DBI::SQL::Transformer</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Search::Basic</remote-id>
+    <remote-id type="cpan-module">Class::DBI::Test::SQLite</remote-id>
+    <remote-id type="cpan-module">Class::DBI::__::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Data-Accessor/metadata.xml b/dev-perl/Class-Data-Accessor/metadata.xml
index f9dd46b696c4..610c0456c1c6 100644
--- a/dev-perl/Class-Data-Accessor/metadata.xml
+++ b/dev-perl/Class-Data-Accessor/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Data-Accessor</remote-id>
+    <remote-id type="cpan-module">Class::Data::Accessor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Data-Inheritable/metadata.xml b/dev-perl/Class-Data-Inheritable/metadata.xml
index 517edd63232a..80e1f29df61c 100644
--- a/dev-perl/Class-Data-Inheritable/metadata.xml
+++ b/dev-perl/Class-Data-Inheritable/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Data-Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::Data::Inheritable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Default/metadata.xml b/dev-perl/Class-Default/metadata.xml
index 08dc0ec26b76..680e823b711e 100644
--- a/dev-perl/Class-Default/metadata.xml
+++ b/dev-perl/Class-Default/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Default</remote-id>
+    <remote-id type="cpan-module">Class::Default</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-ErrorHandler/metadata.xml b/dev-perl/Class-ErrorHandler/metadata.xml
index 96457a1ea81f..16ea67344395 100644
--- a/dev-perl/Class-ErrorHandler/metadata.xml
+++ b/dev-perl/Class-ErrorHandler/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-ErrorHandler</remote-id>
+    <remote-id type="cpan-module">Class::ErrorHandler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Factory-Util/metadata.xml b/dev-perl/Class-Factory-Util/metadata.xml
index a53d6abf0e68..e37e47deee93 100644
--- a/dev-perl/Class-Factory-Util/metadata.xml
+++ b/dev-perl/Class-Factory-Util/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Factory-Util</remote-id>
+    <remote-id type="cpan-module">Class::Factory::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Inspector/metadata.xml b/dev-perl/Class-Inspector/metadata.xml
index 3f4058ee6199..93ea8acd4fdb 100644
--- a/dev-perl/Class-Inspector/metadata.xml
+++ b/dev-perl/Class-Inspector/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Inspector</remote-id>
+    <remote-id type="cpan-module">Class::Inspector</remote-id>
+    <remote-id type="cpan-module">Class::Inspector::Functions</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Load-XS/metadata.xml b/dev-perl/Class-Load-XS/metadata.xml
index 11c118f37180..40c31901dd12 100644
--- a/dev-perl/Class-Load-XS/metadata.xml
+++ b/dev-perl/Class-Load-XS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Load-XS</remote-id>
+    <remote-id type="cpan-module">Class::Load::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Load/metadata.xml b/dev-perl/Class-Load/metadata.xml
index 4e2e14ec4246..6dccc0a617b2 100644
--- a/dev-perl/Class-Load/metadata.xml
+++ b/dev-perl/Class-Load/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Load</remote-id>
+    <remote-id type="cpan-module">Class::Load</remote-id>
+    <remote-id type="cpan-module">Class::Load::PP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-MOP/metadata.xml b/dev-perl/Class-MOP/metadata.xml
index 0615018db9bd..99686732b740 100644
--- a/dev-perl/Class-MOP/metadata.xml
+++ b/dev-perl/Class-MOP/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-MOP</remote-id>
+    <remote-id type="cpan-module">Class::MOP</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Attribute</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Class</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Class::Immutable</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Instance</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Accessor</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Constructor</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Wrapped</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Module</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Object</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Package</remote-id>
+    <remote-id type="cpan-module">metaclass</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-MakeMethods/metadata.xml b/dev-perl/Class-MakeMethods/metadata.xml
index ce879a08eb30..ba2ca82fc7a6 100644
--- a/dev-perl/Class-MakeMethods/metadata.xml
+++ b/dev-perl/Class-MakeMethods/metadata.xml
@@ -4,5 +4,61 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-MakeMethods</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Attribute</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Autoload</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Basic</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Basic::Array</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Basic::Global</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Basic::Hash</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite::Array</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite::Global</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite::Hash</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite::Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Composite::Universal</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::AccessorFast</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::MethodMaker</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::Singleton</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::Struct</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::accessors</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::accessors::chained</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::accessors::classic</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Emulator::mcoder</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Evaled</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Evaled::Hash</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard::Array</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard::Global</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard::Hash</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard::Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Standard::Universal</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Array</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Class</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::ClassInherit</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::ClassName</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::ClassVar</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Flyweight</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Generic</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Global</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Hash</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::InsideOut</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::PackageVar</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Ref</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Scalar</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Static</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Struct</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::StructBuiltin</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Template::Universal</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Utility::ArraySplicer</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Utility::DiskCache</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Utility::Inheritable</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Utility::Ref</remote-id>
+    <remote-id type="cpan-module">Class::MakeMethods::Utility::TextBuilder</remote-id>
+    <remote-id type="cpan-module">TieScalarTest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Member/metadata.xml b/dev-perl/Class-Member/metadata.xml
index 557dc6a4ff5e..ca62afbacec1 100644
--- a/dev-perl/Class-Member/metadata.xml
+++ b/dev-perl/Class-Member/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Member</remote-id>
+    <remote-id type="cpan-module">Class::Member</remote-id>
+    <remote-id type="cpan-module">Class::Member::Dynamic</remote-id>
+    <remote-id type="cpan-module">Class::Member::GLOB</remote-id>
+    <remote-id type="cpan-module">Class::Member::HASH</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Method-Modifiers/metadata.xml b/dev-perl/Class-Method-Modifiers/metadata.xml
index e5f8d183c343..bfe073ee5091 100644
--- a/dev-perl/Class-Method-Modifiers/metadata.xml
+++ b/dev-perl/Class-Method-Modifiers/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Class-Method-Modifiers</remote-id>
+		<remote-id type="cpan-module">Class::Method::Modifiers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-MethodMaker/metadata.xml b/dev-perl/Class-MethodMaker/metadata.xml
index 7f8b387516f5..5af0dc133ec5 100644
--- a/dev-perl/Class-MethodMaker/metadata.xml
+++ b/dev-perl/Class-MethodMaker/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-MethodMaker</remote-id>
+    <remote-id type="cpan-module">Class::MethodMaker</remote-id>
+    <remote-id type="cpan-module">Class::MethodMaker::Constants</remote-id>
+    <remote-id type="cpan-module">Class::MethodMaker::Engine</remote-id>
+    <remote-id type="cpan-module">Class::MethodMaker::OptExt</remote-id>
+    <remote-id type="cpan-module">Class::MethodMaker::V1Compat</remote-id>
+    <remote-id type="cpan-module">Generate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Singleton/metadata.xml b/dev-perl/Class-Singleton/metadata.xml
index 602844623003..141705752d4d 100644
--- a/dev-perl/Class-Singleton/metadata.xml
+++ b/dev-perl/Class-Singleton/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Singleton</remote-id>
+    <remote-id type="cpan-module">Class::Singleton</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Spiffy/metadata.xml b/dev-perl/Class-Spiffy/metadata.xml
index 85316e590484..8e2a1d29ff10 100644
--- a/dev-perl/Class-Spiffy/metadata.xml
+++ b/dev-perl/Class-Spiffy/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Spiffy</remote-id>
+    <remote-id type="cpan-module">Class::Spiffy</remote-id>
+    <remote-id type="cpan-module">Class::Spiffy::mixin</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Std-Fast/metadata.xml b/dev-perl/Class-Std-Fast/metadata.xml
index 443b3d35af4c..44948940d30e 100644
--- a/dev-perl/Class-Std-Fast/metadata.xml
+++ b/dev-perl/Class-Std-Fast/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Std-Fast</remote-id>
+    <remote-id type="cpan-module">Class::Std::Fast</remote-id>
+    <remote-id type="cpan-module">Class::Std::Fast::Storable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Std/metadata.xml b/dev-perl/Class-Std/metadata.xml
index ee23dd8f13c2..cbe20b9a6c63 100644
--- a/dev-perl/Class-Std/metadata.xml
+++ b/dev-perl/Class-Std/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Std</remote-id>
+    <remote-id type="cpan-module">Class::Std</remote-id>
+    <remote-id type="cpan-module">Class::Std::SCR</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Trigger/metadata.xml b/dev-perl/Class-Trigger/metadata.xml
index 5c48ddd285d1..e89bc4ac687c 100644
--- a/dev-perl/Class-Trigger/metadata.xml
+++ b/dev-perl/Class-Trigger/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Trigger</remote-id>
+    <remote-id type="cpan-module">Class::Trigger</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Unload/metadata.xml b/dev-perl/Class-Unload/metadata.xml
index e62252de223d..816a728c876b 100644
--- a/dev-perl/Class-Unload/metadata.xml
+++ b/dev-perl/Class-Unload/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Unload</remote-id>
+    <remote-id type="cpan-module">Class::Unload</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-Virtual/metadata.xml b/dev-perl/Class-Virtual/metadata.xml
index afc0ec80da3b..c6f201c75d40 100644
--- a/dev-perl/Class-Virtual/metadata.xml
+++ b/dev-perl/Class-Virtual/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Virtual</remote-id>
+    <remote-id type="cpan-module">Class::Virtual</remote-id>
+    <remote-id type="cpan-module">Class::Virtually::Abstract</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-WhiteHole/metadata.xml b/dev-perl/Class-WhiteHole/metadata.xml
index e6174b48910c..bebecdbd6a86 100644
--- a/dev-perl/Class-WhiteHole/metadata.xml
+++ b/dev-perl/Class-WhiteHole/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-WhiteHole</remote-id>
+    <remote-id type="cpan-module">Class::WhiteHole</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-XPath/metadata.xml b/dev-perl/Class-XPath/metadata.xml
index f971b1d7dbf7..c45490143445 100644
--- a/dev-perl/Class-XPath/metadata.xml
+++ b/dev-perl/Class-XPath/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-XPath</remote-id>
+    <remote-id type="cpan-module">Class::XPath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Class-XSAccessor/metadata.xml b/dev-perl/Class-XSAccessor/metadata.xml
index 2e51e627373c..245a3f503a87 100644
--- a/dev-perl/Class-XSAccessor/metadata.xml
+++ b/dev-perl/Class-XSAccessor/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-XSAccessor</remote-id>
+    <remote-id type="cpan-module">Class::XSAccessor</remote-id>
+    <remote-id type="cpan-module">Class::XSAccessor::Array</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Clipboard/metadata.xml b/dev-perl/Clipboard/metadata.xml
index 5a80cf140845..db1d8436e03c 100644
--- a/dev-perl/Clipboard/metadata.xml
+++ b/dev-perl/Clipboard/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Clipboard</remote-id>
+    <remote-id type="cpan-module">Clipboard</remote-id>
+    <remote-id type="cpan-module">Clipboard::MacPasteboard</remote-id>
+    <remote-id type="cpan-module">Clipboard::Win32</remote-id>
+    <remote-id type="cpan-module">Clipboard::Xclip</remote-id>
+    <remote-id type="cpan-module">PhonyClipboard</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Clone/metadata.xml b/dev-perl/Clone/metadata.xml
index 8a809c1eb5c0..291e6c5ea740 100644
--- a/dev-perl/Clone/metadata.xml
+++ b/dev-perl/Clone/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Clone</remote-id>
+    <remote-id type="cpan-module">Clone</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Color-Library/metadata.xml b/dev-perl/Color-Library/metadata.xml
index 3a46d0120d93..e8dd57c4067a 100644
--- a/dev-perl/Color-Library/metadata.xml
+++ b/dev-perl/Color-Library/metadata.xml
@@ -8,5 +8,30 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Color-Library</remote-id>
+    <remote-id type="cpan-module">Color::Library</remote-id>
+    <remote-id type="cpan-module">Color::Library::Color</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::HTML</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::IE</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::Mozilla</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::A</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::B</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::F</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::H</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::M</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::P</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::R</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::RC</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::S</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::SC</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::NBS_ISCC::TC</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::Netscape</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::SVG</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::Tango</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::VACCC</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::WWW</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::Windows</remote-id>
+    <remote-id type="cpan-module">Color::Library::Dictionary::X11</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Compress-Bzip2/metadata.xml b/dev-perl/Compress-Bzip2/metadata.xml
index 5630a3d68f16..9620e284c839 100644
--- a/dev-perl/Compress-Bzip2/metadata.xml
+++ b/dev-perl/Compress-Bzip2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Compress-Bzip2</remote-id>
+    <remote-id type="cpan-module">Compress::Bzip2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Any/metadata.xml b/dev-perl/Config-Any/metadata.xml
index 91298f83516b..6c9515c8a8c2 100644
--- a/dev-perl/Config-Any/metadata.xml
+++ b/dev-perl/Config-Any/metadata.xml
@@ -7,5 +7,13 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Config-Any</remote-id>
+    <remote-id type="cpan-module">Config::Any</remote-id>
+    <remote-id type="cpan-module">Config::Any::Base</remote-id>
+    <remote-id type="cpan-module">Config::Any::General</remote-id>
+    <remote-id type="cpan-module">Config::Any::INI</remote-id>
+    <remote-id type="cpan-module">Config::Any::JSON</remote-id>
+    <remote-id type="cpan-module">Config::Any::Perl</remote-id>
+    <remote-id type="cpan-module">Config::Any::XML</remote-id>
+    <remote-id type="cpan-module">Config::Any::YAML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-ApacheFormat/metadata.xml b/dev-perl/Config-ApacheFormat/metadata.xml
index ba152817eac1..76286198f88b 100644
--- a/dev-perl/Config-ApacheFormat/metadata.xml
+++ b/dev-perl/Config-ApacheFormat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-ApacheFormat</remote-id>
+    <remote-id type="cpan-module">Config::ApacheFormat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Auto/Config-Auto-0.420.0.ebuild b/dev-perl/Config-Auto/Config-Auto-0.420.0.ebuild
new file mode 100644
index 000000000000..115cedd36df9
--- /dev/null
+++ b/dev-perl/Config-Auto/Config-Auto-0.420.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Auto/Config-Auto-0.420.0.ebuild,v 1.1 2012/06/24 07:06:16 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR="BINGOS"
+MODULE_VERSION=0.42
+inherit perl-module
+
+DESCRIPTION="Magical config file parser"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Config-IniFiles
+	dev-perl/IO-String
+	virtual/perl-Text-ParseWords
+	virtual/perl-File-Spec
+	dev-perl/yaml
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Config-Auto/Manifest b/dev-perl/Config-Auto/Manifest
new file mode 100644
index 000000000000..29ecc3a5cc55
--- /dev/null
+++ b/dev-perl/Config-Auto/Manifest
@@ -0,0 +1 @@
+DIST Config-Auto-0.42.tar.gz 16006 RMD160 6518c483c68909af77cb2cc62a2fdc7f972aa136 SHA1 6a0bcbfaa2f56f176ef144eb949f3bdc26a705bc SHA256 d038da0eb8835c8d38a7c1bbe8b200545e5a91915407a10a17eef460a7fbac10
diff --git a/dev-perl/Config-Auto/metadata.xml b/dev-perl/Config-Auto/metadata.xml
new file mode 100644
index 000000000000..99b9ec4dc903
--- /dev/null
+++ b/dev-perl/Config-Auto/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+	<upstream>
+		<remote-id type="cpan">Config-Auto</remote-id>
+		<remote-id type="cpan-module">Config::Auto</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-perl/Config-Crontab/metadata.xml b/dev-perl/Config-Crontab/metadata.xml
index ec2f8a16479e..13a4c33e62db 100644
--- a/dev-perl/Config-Crontab/metadata.xml
+++ b/dev-perl/Config-Crontab/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-Crontab</remote-id>
+    <remote-id type="cpan-module">Config::Crontab</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Base</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Block</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Comment</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Container</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Env</remote-id>
+    <remote-id type="cpan-module">Config::Crontab::Event</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Grammar/metadata.xml b/dev-perl/Config-Grammar/metadata.xml
index 2f38722771aa..071a1db04d9f 100644
--- a/dev-perl/Config-Grammar/metadata.xml
+++ b/dev-perl/Config-Grammar/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Config-Grammar</remote-id>
+		<remote-id type="cpan-module">Config::Grammar</remote-id>
+		<remote-id type="cpan-module">Config::Grammar::Document</remote-id>
+		<remote-id type="cpan-module">Config::Grammar::Dynamic</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-IniFiles/metadata.xml b/dev-perl/Config-IniFiles/metadata.xml
index ffc0ad8e9cf2..cdce4fd2d8ec 100644
--- a/dev-perl/Config-IniFiles/metadata.xml
+++ b/dev-perl/Config-IniFiles/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-IniFiles</remote-id>
+    <remote-id type="cpan-module">Config::IniFiles</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Properties/metadata.xml b/dev-perl/Config-Properties/metadata.xml
index 2c27eb6c0ca1..a34dadf2454a 100644
--- a/dev-perl/Config-Properties/metadata.xml
+++ b/dev-perl/Config-Properties/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-Properties</remote-id>
+    <remote-id type="cpan-module">Config::Properties</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Simple/metadata.xml b/dev-perl/Config-Simple/metadata.xml
index b654d54cc32a..9622c27f4c08 100644
--- a/dev-perl/Config-Simple/metadata.xml
+++ b/dev-perl/Config-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-Simple</remote-id>
+    <remote-id type="cpan-module">Config::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-Tiny/metadata.xml b/dev-perl/Config-Tiny/metadata.xml
index e178f103ae8f..004a791cf70f 100644
--- a/dev-perl/Config-Tiny/metadata.xml
+++ b/dev-perl/Config-Tiny/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-Tiny</remote-id>
+    <remote-id type="cpan-module">Config::Tiny</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ConfigReader/metadata.xml b/dev-perl/ConfigReader/metadata.xml
index e442c1187bca..923fddbf1673 100644
--- a/dev-perl/ConfigReader/metadata.xml
+++ b/dev-perl/ConfigReader/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ConfigReader</remote-id>
+    <remote-id type="cpan-module">ConfigReader::DirectiveStyle</remote-id>
+    <remote-id type="cpan-module">ConfigReader::Spec</remote-id>
+    <remote-id type="cpan-module">ConfigReader::Values</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Const-Fast/metadata.xml b/dev-perl/Const-Fast/metadata.xml
index 3f21dd817399..975d7b851f76 100644
--- a/dev-perl/Const-Fast/metadata.xml
+++ b/dev-perl/Const-Fast/metadata.xml
@@ -13,5 +13,6 @@
 </longdescription>
 <upstream>
   <remote-id type="cpan">Const-Fast</remote-id>
+  <remote-id type="cpan-module">Const::Fast</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Context-Preserve/metadata.xml b/dev-perl/Context-Preserve/metadata.xml
index 8a38303d63df..a834b9037ebd 100644
--- a/dev-perl/Context-Preserve/metadata.xml
+++ b/dev-perl/Context-Preserve/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Context-Preserve</remote-id>
+    <remote-id type="cpan-module">Context::Preserve</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Contextual-Return/metadata.xml b/dev-perl/Contextual-Return/metadata.xml
index 31b19242eb86..331dcb8af595 100644
--- a/dev-perl/Contextual-Return/metadata.xml
+++ b/dev-perl/Contextual-Return/metadata.xml
@@ -7,5 +7,10 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Contextual-Return</remote-id>
+    <remote-id type="cpan-module">Contextual::Return</remote-id>
+    <remote-id type="cpan-module">Contextual::Return::Failure</remote-id>
+    <remote-id type="cpan-module">Contextual::Return::Lvalue</remote-id>
+    <remote-id type="cpan-module">Contextual::Return::Value</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-ASN1/metadata.xml b/dev-perl/Convert-ASN1/metadata.xml
index 97cb554ab7e2..4265b05f10b6 100644
--- a/dev-perl/Convert-ASN1/metadata.xml
+++ b/dev-perl/Convert-ASN1/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-ASN1</remote-id>
+    <remote-id type="cpan-module">Convert::ASN1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-BER/metadata.xml b/dev-perl/Convert-BER/metadata.xml
index 79598755c042..8304184adb63 100644
--- a/dev-perl/Convert-BER/metadata.xml
+++ b/dev-perl/Convert-BER/metadata.xml
@@ -4,5 +4,22 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-BER</remote-id>
+    <remote-id type="cpan-module">Convert::BER</remote-id>
+    <remote-id type="cpan-module">Convert::BER::ANY</remote-id>
+    <remote-id type="cpan-module">Convert::BER::BER</remote-id>
+    <remote-id type="cpan-module">Convert::BER::BIT_STRING</remote-id>
+    <remote-id type="cpan-module">Convert::BER::BIT_STRING8</remote-id>
+    <remote-id type="cpan-module">Convert::BER::BOOLEAN</remote-id>
+    <remote-id type="cpan-module">Convert::BER::CHOICE</remote-id>
+    <remote-id type="cpan-module">Convert::BER::CONSTRUCTED</remote-id>
+    <remote-id type="cpan-module">Convert::BER::INTEGER</remote-id>
+    <remote-id type="cpan-module">Convert::BER::NULL</remote-id>
+    <remote-id type="cpan-module">Convert::BER::OBJECT_ID</remote-id>
+    <remote-id type="cpan-module">Convert::BER::OPTIONAL</remote-id>
+    <remote-id type="cpan-module">Convert::BER::REAL</remote-id>
+    <remote-id type="cpan-module">Convert::BER::SEQUENCE</remote-id>
+    <remote-id type="cpan-module">Convert::BER::SEQUENCE_OF</remote-id>
+    <remote-id type="cpan-module">Convert::BER::STRING</remote-id>
+    <remote-id type="cpan-module">Convert::BER::_Time_generic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-BinHex/metadata.xml b/dev-perl/Convert-BinHex/metadata.xml
index e69f2f2c6aff..a6f210e6db3a 100644
--- a/dev-perl/Convert-BinHex/metadata.xml
+++ b/dev-perl/Convert-BinHex/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-BinHex</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex::Bin2Hex</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex::Fork</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex::Hex2Bin</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex::IO_Handle</remote-id>
+    <remote-id type="cpan-module">Convert::BinHex::IO_Scalar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-Binary-C/metadata.xml b/dev-perl/Convert-Binary-C/metadata.xml
index a6c1ae113eb7..a23e537f33ac 100644
--- a/dev-perl/Convert-Binary-C/metadata.xml
+++ b/dev-perl/Convert-Binary-C/metadata.xml
@@ -8,5 +8,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Convert-Binary-C</remote-id>
+    <remote-id type="cpan-module">Convert::Binary::C</remote-id>
+    <remote-id type="cpan-module">Convert::Binary::C::Cached</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-Color/metadata.xml b/dev-perl/Convert-Color/metadata.xml
index e2e13bda2dce..f164fd03274f 100644
--- a/dev-perl/Convert-Color/metadata.xml
+++ b/dev-perl/Convert-Color/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-Color</remote-id>
+    <remote-id type="cpan-module">Convert::Color</remote-id>
+    <remote-id type="cpan-module">Convert::Color::CMY</remote-id>
+    <remote-id type="cpan-module">Convert::Color::CMYK</remote-id>
+    <remote-id type="cpan-module">Convert::Color::HSL</remote-id>
+    <remote-id type="cpan-module">Convert::Color::HSV</remote-id>
+    <remote-id type="cpan-module">Convert::Color::RGB</remote-id>
+    <remote-id type="cpan-module">Convert::Color::RGB16</remote-id>
+    <remote-id type="cpan-module">Convert::Color::RGB8</remote-id>
+    <remote-id type="cpan-module">Convert::Color::VGA</remote-id>
+    <remote-id type="cpan-module">Convert::Color::X11</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-TNEF/metadata.xml b/dev-perl/Convert-TNEF/metadata.xml
index 7ce29bf3c426..72652968544c 100644
--- a/dev-perl/Convert-TNEF/metadata.xml
+++ b/dev-perl/Convert-TNEF/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-TNEF</remote-id>
+    <remote-id type="cpan-module">Convert::TNEF</remote-id>
+    <remote-id type="cpan-module">Convert::TNEF::Data</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Convert-UUlib/metadata.xml b/dev-perl/Convert-UUlib/metadata.xml
index 19f99541e442..2794a6958501 100644
--- a/dev-perl/Convert-UUlib/metadata.xml
+++ b/dev-perl/Convert-UUlib/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-UUlib</remote-id>
+    <remote-id type="cpan-module">Convert::UUlib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Coro/metadata.xml b/dev-perl/Coro/metadata.xml
index 242507c6c228..60718ce96e48 100644
--- a/dev-perl/Coro/metadata.xml
+++ b/dev-perl/Coro/metadata.xml
@@ -4,5 +4,30 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Coro</remote-id>
+    <remote-id type="cpan-module">Coro</remote-id>
+    <remote-id type="cpan-module">Coro::AIO</remote-id>
+    <remote-id type="cpan-module">Coro::AnyEvent</remote-id>
+    <remote-id type="cpan-module">Coro::BDB</remote-id>
+    <remote-id type="cpan-module">Coro::Channel</remote-id>
+    <remote-id type="cpan-module">Coro::Debug</remote-id>
+    <remote-id type="cpan-module">Coro::EV</remote-id>
+    <remote-id type="cpan-module">Coro::Event</remote-id>
+    <remote-id type="cpan-module">Coro::Handle</remote-id>
+    <remote-id type="cpan-module">Coro::Handle::FH</remote-id>
+    <remote-id type="cpan-module">Coro::LWP</remote-id>
+    <remote-id type="cpan-module">Coro::LWP::Socket</remote-id>
+    <remote-id type="cpan-module">Coro::MakeMaker</remote-id>
+    <remote-id type="cpan-module">Coro::RWLock</remote-id>
+    <remote-id type="cpan-module">Coro::Select</remote-id>
+    <remote-id type="cpan-module">Coro::Semaphore</remote-id>
+    <remote-id type="cpan-module">Coro::SemaphoreSet</remote-id>
+    <remote-id type="cpan-module">Coro::Signal</remote-id>
+    <remote-id type="cpan-module">Coro::Socket</remote-id>
+    <remote-id type="cpan-module">Coro::Specific</remote-id>
+    <remote-id type="cpan-module">Coro::State</remote-id>
+    <remote-id type="cpan-module">Coro::Storable</remote-id>
+    <remote-id type="cpan-module">Coro::Timer</remote-id>
+    <remote-id type="cpan-module">Coro::Timer::Timeout</remote-id>
+    <remote-id type="cpan-module">Coro::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Blowfish/metadata.xml b/dev-perl/Crypt-Blowfish/metadata.xml
index 849f156d1574..b62af61fc6e1 100644
--- a/dev-perl/Crypt-Blowfish/metadata.xml
+++ b/dev-perl/Crypt-Blowfish/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Blowfish</remote-id>
+    <remote-id type="cpan-module">Crypt::Blowfish</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-CAST5_PP/metadata.xml b/dev-perl/Crypt-CAST5_PP/metadata.xml
index bd55f2944700..eb391e64b2a5 100644
--- a/dev-perl/Crypt-CAST5_PP/metadata.xml
+++ b/dev-perl/Crypt-CAST5_PP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-CAST5_PP</remote-id>
+    <remote-id type="cpan-module">Crypt::CAST5_PP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Cracklib/metadata.xml b/dev-perl/Crypt-Cracklib/metadata.xml
index 1847f71d5402..2975ccd6c5c3 100644
--- a/dev-perl/Crypt-Cracklib/metadata.xml
+++ b/dev-perl/Crypt-Cracklib/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Cracklib</remote-id>
+    <remote-id type="cpan-module">Crypt::Cracklib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-DES/metadata.xml b/dev-perl/Crypt-DES/metadata.xml
index bfcb28ad55e5..ecaa7e25b12e 100644
--- a/dev-perl/Crypt-DES/metadata.xml
+++ b/dev-perl/Crypt-DES/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-DES</remote-id>
+    <remote-id type="cpan-module">Crypt::DES</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-OpenPGP/metadata.xml b/dev-perl/Crypt-OpenPGP/metadata.xml
index 6376fc653e41..c020ea2e25a7 100644
--- a/dev-perl/Crypt-OpenPGP/metadata.xml
+++ b/dev-perl/Crypt-OpenPGP/metadata.xml
@@ -4,5 +4,63 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-OpenPGP</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Armour</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Buffer</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::CFB</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Certificate</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::Blowfish</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::CAST5</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::DES3</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::IDEA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::Rijndael</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::Rijndael192</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::Rijndael256</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Cipher::Twofish</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Ciphertext</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Compressed</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Config</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Config::GnuPG</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Config::PGP2</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Config::PGP5</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Constants</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Digest</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Digest::MD5</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Digest::RIPEMD160</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Digest::SHA1</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::ElGamal::Private</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::ElGamal::Public</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::ErrorHandler</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Public</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Public::DSA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Public::ElGamal</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Public::RSA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Secret</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Secret::DSA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Secret::ElGamal</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Key::Secret::RSA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::KeyBlock</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::KeyRing</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::KeyServer</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::MDC</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Marker</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Message</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::OnePassSig</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::PacketFactory</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Plaintext</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::S2k</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::S2k::Salt_Iter</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::S2k::Salted</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::S2k::Simple</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::SKSessionKey</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::SessionKey</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Signature</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Signature::SubPacket</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Trust</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::UserID</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Util</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenPGP::Words</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml b/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
index d1bd7358ca3e..5c099db0eada 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-Bignum/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-Bignum</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenSSL::Bignum</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenSSL::Bignum::CTX</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-OpenSSL-RSA/metadata.xml b/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
index e67c01dff2e1..02fe570eb8bc 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-RSA/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-RSA</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenSSL::RSA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-OpenSSL-Random/metadata.xml b/dev-perl/Crypt-OpenSSL-Random/metadata.xml
index 97476fd21d22..51b6f934fd71 100644
--- a/dev-perl/Crypt-OpenSSL-Random/metadata.xml
+++ b/dev-perl/Crypt-OpenSSL-Random/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-OpenSSL-Random</remote-id>
+    <remote-id type="cpan-module">Crypt::OpenSSL::Random</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-PasswdMD5/metadata.xml b/dev-perl/Crypt-PasswdMD5/metadata.xml
index 6f9fa3372df4..a87332763189 100644
--- a/dev-perl/Crypt-PasswdMD5/metadata.xml
+++ b/dev-perl/Crypt-PasswdMD5/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-PasswdMD5</remote-id>
+    <remote-id type="cpan-module">Crypt::PasswdMD5</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-RC4/metadata.xml b/dev-perl/Crypt-RC4/metadata.xml
index 3d6f71ab2bde..42f20392b5da 100644
--- a/dev-perl/Crypt-RC4/metadata.xml
+++ b/dev-perl/Crypt-RC4/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-RC4</remote-id>
+    <remote-id type="cpan-module">Crypt::RC4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-RIPEMD160/metadata.xml b/dev-perl/Crypt-RIPEMD160/metadata.xml
index 43d5f8cb828d..503b67846bce 100644
--- a/dev-perl/Crypt-RIPEMD160/metadata.xml
+++ b/dev-perl/Crypt-RIPEMD160/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-RIPEMD160</remote-id>
+    <remote-id type="cpan-module">Crypt::RIPEMD160</remote-id>
+    <remote-id type="cpan-module">Crypt::RIPEMD160::MAC</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Random-Source/metadata.xml b/dev-perl/Crypt-Random-Source/metadata.xml
index 1a84e99ac1b8..476ad6932bbc 100644
--- a/dev-perl/Crypt-Random-Source/metadata.xml
+++ b/dev-perl/Crypt-Random-Source/metadata.xml
@@ -4,5 +4,17 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Crypt-Random-Source</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Base</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Base::File</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Base::Handle</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Base::Proc</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Base::RandomDevice</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Factory</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Strong</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Strong::devrandom</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Weak</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Weak::devurandom</remote-id>
+		<remote-id type="cpan-module">Crypt::Random::Source::Weak::rand</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Rijndael/metadata.xml b/dev-perl/Crypt-Rijndael/metadata.xml
index c009ce2afc81..e66f8c41ac38 100644
--- a/dev-perl/Crypt-Rijndael/metadata.xml
+++ b/dev-perl/Crypt-Rijndael/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Rijndael</remote-id>
+    <remote-id type="cpan-module">Crypt::Rijndael</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-SMIME/metadata.xml b/dev-perl/Crypt-SMIME/metadata.xml
index 37751d30be8b..e22bc4695680 100644
--- a/dev-perl/Crypt-SMIME/metadata.xml
+++ b/dev-perl/Crypt-SMIME/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Crypt-SMIME</remote-id>
+		<remote-id type="cpan-module">Crypt::SMIME</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-SSLeay/metadata.xml b/dev-perl/Crypt-SSLeay/metadata.xml
index d8300759ffe5..5e3201a4b12a 100644
--- a/dev-perl/Crypt-SSLeay/metadata.xml
+++ b/dev-perl/Crypt-SSLeay/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-SSLeay</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay::CTX</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay::Conn</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay::Err</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay::MainContext</remote-id>
+    <remote-id type="cpan-module">Crypt::SSLeay::X509</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">Net::SSL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Simple/metadata.xml b/dev-perl/Crypt-Simple/metadata.xml
index 35773e1b7b87..6b095a28034f 100644
--- a/dev-perl/Crypt-Simple/metadata.xml
+++ b/dev-perl/Crypt-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Simple</remote-id>
+    <remote-id type="cpan-module">Crypt::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-SmbHash/metadata.xml b/dev-perl/Crypt-SmbHash/metadata.xml
index 51730c97941d..581746c82d5d 100644
--- a/dev-perl/Crypt-SmbHash/metadata.xml
+++ b/dev-perl/Crypt-SmbHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-SmbHash</remote-id>
+    <remote-id type="cpan-module">Crypt::SmbHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Crypt-Twofish/metadata.xml b/dev-perl/Crypt-Twofish/metadata.xml
index a5ae0adb8108..de587d43ad1c 100644
--- a/dev-perl/Crypt-Twofish/metadata.xml
+++ b/dev-perl/Crypt-Twofish/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Twofish</remote-id>
+    <remote-id type="cpan-module">Crypt::Twofish</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Curses/metadata.xml b/dev-perl/Curses/metadata.xml
index 5006b39528ec..c095bb01a13a 100644
--- a/dev-perl/Curses/metadata.xml
+++ b/dev-perl/Curses/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Curses</remote-id>
+    <remote-id type="cpan-module">Curses</remote-id>
+    <remote-id type="cpan-module">Curses::Field</remote-id>
+    <remote-id type="cpan-module">Curses::Form</remote-id>
+    <remote-id type="cpan-module">Curses::Item</remote-id>
+    <remote-id type="cpan-module">Curses::Menu</remote-id>
+    <remote-id type="cpan-module">Curses::Panel</remote-id>
+    <remote-id type="cpan-module">Curses::Screen</remote-id>
+    <remote-id type="cpan-module">Curses::Window</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/CursesWidgets/metadata.xml b/dev-perl/CursesWidgets/metadata.xml
index 69adbc1fc87f..baed30aeceb8 100644
--- a/dev-perl/CursesWidgets/metadata.xml
+++ b/dev-perl/CursesWidgets/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CursesWidgets</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::ButtonSet</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::Calendar</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::ComboBox</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::Label</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::ListBox</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::ListBox::MultiColumn</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::Menu</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::ProgressBar</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::TextField</remote-id>
+    <remote-id type="cpan-module">Curses::Widgets::TextMemo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBD-Pg/metadata.xml b/dev-perl/DBD-Pg/metadata.xml
index b227d935f965..dfb7e1a2dc36 100644
--- a/dev-perl/DBD-Pg/metadata.xml
+++ b/dev-perl/DBD-Pg/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBD-Pg</remote-id>
+    <remote-id type="cpan-module">Bundle::DBD::Pg</remote-id>
+    <remote-id type="cpan-module">DBD::Pg</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBD-SQLite/metadata.xml b/dev-perl/DBD-SQLite/metadata.xml
index afb73937ec03..321c7897fbf6 100644
--- a/dev-perl/DBD-SQLite/metadata.xml
+++ b/dev-perl/DBD-SQLite/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBD-SQLite</remote-id>
+    <remote-id type="cpan-module">DBD::SQLite</remote-id>
+    <remote-id type="cpan-module">DBD::SQLite::_WriteOnceHash</remote-id>
+    <remote-id type="cpan-module">DBD::SQLite::db</remote-id>
+    <remote-id type="cpan-module">DBD::SQLite::dr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBD-mysql/metadata.xml b/dev-perl/DBD-mysql/metadata.xml
index e1fb84985bdc..d76ec8fef57a 100644
--- a/dev-perl/DBD-mysql/metadata.xml
+++ b/dev-perl/DBD-mysql/metadata.xml
@@ -4,8 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBD-mysql</remote-id>
+    <remote-id type="cpan-module">Bundle::DBD::mysql</remote-id>
+    <remote-id type="cpan-module">DBD::mysql</remote-id>
+    <remote-id type="cpan-module">DBD::mysql::GetInfo</remote-id>
+    <remote-id type="cpan-module">DBD::mysql::db</remote-id>
+    <remote-id type="cpan-module">DBD::mysql::dr</remote-id>
+    <remote-id type="cpan-module">DBD::mysql::st</remote-id>
   </upstream>
-<use>
-  <flag name='embedded'>Support embedded server (libmysqld)</flag>
-</use>
+  <use>
+    <flag name="embedded">Support embedded server (libmysqld)</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-perl/DBI-Shell/metadata.xml b/dev-perl/DBI-Shell/metadata.xml
index 45b45d3c00d6..5934e602a818 100644
--- a/dev-perl/DBI-Shell/metadata.xml
+++ b/dev-perl/DBI-Shell/metadata.xml
@@ -6,5 +6,21 @@
 	any installed DBD module directly.</longdescription>
   <upstream>
     <remote-id type="cpan">DBI-Shell</remote-id>
+    <remote-id type="cpan-module">DBI::Format</remote-id>
+    <remote-id type="cpan-module">DBI::Format::Base</remote-id>
+    <remote-id type="cpan-module">DBI::Format::Box</remote-id>
+    <remote-id type="cpan-module">DBI::Format::CSV</remote-id>
+    <remote-id type="cpan-module">DBI::Format::HTML</remote-id>
+    <remote-id type="cpan-module">DBI::Format::Neat</remote-id>
+    <remote-id type="cpan-module">DBI::Format::PartBox</remote-id>
+    <remote-id type="cpan-module">DBI::Format::Raw</remote-id>
+    <remote-id type="cpan-module">DBI::Format::SQLMinus</remote-id>
+    <remote-id type="cpan-module">DBI::Format::String</remote-id>
+    <remote-id type="cpan-module">DBI::Shell</remote-id>
+    <remote-id type="cpan-module">DBI::Shell::Completion</remote-id>
+    <remote-id type="cpan-module">DBI::Shell::FindSqlFile</remote-id>
+    <remote-id type="cpan-module">DBI::Shell::SQLMinus</remote-id>
+    <remote-id type="cpan-module">DBI::Shell::Spool</remote-id>
+    <remote-id type="cpan-module">DBI::Shell::Timing</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBI/metadata.xml b/dev-perl/DBI/metadata.xml
index f5ea2451cb5c..171fb2d062a4 100644
--- a/dev-perl/DBI/metadata.xml
+++ b/dev-perl/DBI/metadata.xml
@@ -4,5 +4,90 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBI</remote-id>
+    <remote-id type="cpan-module">Bundle::DBI</remote-id>
+    <remote-id type="cpan-module">DBD::DBM</remote-id>
+    <remote-id type="cpan-module">DBD::DBM::Statement</remote-id>
+    <remote-id type="cpan-module">DBD::DBM::Table</remote-id>
+    <remote-id type="cpan-module">DBD::DBM::db</remote-id>
+    <remote-id type="cpan-module">DBD::DBM::dr</remote-id>
+    <remote-id type="cpan-module">DBD::DBM::st</remote-id>
+    <remote-id type="cpan-module">DBD::ExampleP</remote-id>
+    <remote-id type="cpan-module">DBD::ExampleP::db</remote-id>
+    <remote-id type="cpan-module">DBD::ExampleP::dr</remote-id>
+    <remote-id type="cpan-module">DBD::ExampleP::st</remote-id>
+    <remote-id type="cpan-module">DBD::File</remote-id>
+    <remote-id type="cpan-module">DBD::File::Statement</remote-id>
+    <remote-id type="cpan-module">DBD::File::Table</remote-id>
+    <remote-id type="cpan-module">DBD::File::TieMeta</remote-id>
+    <remote-id type="cpan-module">DBD::File::TieTables</remote-id>
+    <remote-id type="cpan-module">DBD::File::db</remote-id>
+    <remote-id type="cpan-module">DBD::File::dr</remote-id>
+    <remote-id type="cpan-module">DBD::File::st</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Policy::Base</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Policy::classic</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Policy::pedantic</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Policy::rush</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Transport::Base</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Transport::corostream</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Transport::null</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Transport::pipeone</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::Transport::stream</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::db</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::dr</remote-id>
+    <remote-id type="cpan-module">DBD::Gofer::st</remote-id>
+    <remote-id type="cpan-module">DBD::NullP</remote-id>
+    <remote-id type="cpan-module">DBD::NullP::db</remote-id>
+    <remote-id type="cpan-module">DBD::NullP::dr</remote-id>
+    <remote-id type="cpan-module">DBD::NullP::st</remote-id>
+    <remote-id type="cpan-module">DBD::Proxy</remote-id>
+    <remote-id type="cpan-module">DBD::Proxy::RPC::PlClient</remote-id>
+    <remote-id type="cpan-module">DBD::Proxy::db</remote-id>
+    <remote-id type="cpan-module">DBD::Proxy::dr</remote-id>
+    <remote-id type="cpan-module">DBD::Proxy::st</remote-id>
+    <remote-id type="cpan-module">DBD::Sponge</remote-id>
+    <remote-id type="cpan-module">DBD::Sponge::db</remote-id>
+    <remote-id type="cpan-module">DBD::Sponge::dr</remote-id>
+    <remote-id type="cpan-module">DBD::Sponge::st</remote-id>
+    <remote-id type="cpan-module">DBDI</remote-id>
+    <remote-id type="cpan-module">DBI</remote-id>
+    <remote-id type="cpan-module">DBI::Const::GetInfo::ANSI</remote-id>
+    <remote-id type="cpan-module">DBI::Const::GetInfo::ODBC</remote-id>
+    <remote-id type="cpan-module">DBI::Const::GetInfoReturn</remote-id>
+    <remote-id type="cpan-module">DBI::Const::GetInfoType</remote-id>
+    <remote-id type="cpan-module">DBI::DBD</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::Metadata</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine::Statement</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine::Table</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine::db</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine::dr</remote-id>
+    <remote-id type="cpan-module">DBI::DBD::SqlEngine::st</remote-id>
+    <remote-id type="cpan-module">DBI::FAQ</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Execute</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Request</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Response</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Serializer::Base</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Serializer::DataDumper</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Serializer::Storable</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Transport::Base</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Transport::pipeone</remote-id>
+    <remote-id type="cpan-module">DBI::Gofer::Transport::stream</remote-id>
+    <remote-id type="cpan-module">DBI::Profile</remote-id>
+    <remote-id type="cpan-module">DBI::ProfileData</remote-id>
+    <remote-id type="cpan-module">DBI::ProfileDumper</remote-id>
+    <remote-id type="cpan-module">DBI::ProfileDumper::Apache</remote-id>
+    <remote-id type="cpan-module">DBI::ProfileSubs</remote-id>
+    <remote-id type="cpan-module">DBI::ProxyServer</remote-id>
+    <remote-id type="cpan-module">DBI::ProxyServer::db</remote-id>
+    <remote-id type="cpan-module">DBI::ProxyServer::dr</remote-id>
+    <remote-id type="cpan-module">DBI::ProxyServer::st</remote-id>
+    <remote-id type="cpan-module">DBI::PurePerl</remote-id>
+    <remote-id type="cpan-module">DBI::SQL::Nano</remote-id>
+    <remote-id type="cpan-module">DBI::SQL::Nano::Statement_</remote-id>
+    <remote-id type="cpan-module">DBI::SQL::Nano::Table_</remote-id>
+    <remote-id type="cpan-module">DBI::Util::CacheMemory</remote-id>
+    <remote-id type="cpan-module">DBI::Util::_accessor</remote-id>
+    <remote-id type="cpan-module">DBI::common</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBICx-TestDatabase/metadata.xml b/dev-perl/DBICx-TestDatabase/metadata.xml
index a53c5245712e..a0fd53f80ab4 100644
--- a/dev-perl/DBICx-TestDatabase/metadata.xml
+++ b/dev-perl/DBICx-TestDatabase/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBICx-TestDatabase</remote-id>
+    <remote-id type="cpan-module">DBICx::TestDatabase</remote-id>
+    <remote-id type="cpan-module">DBICx::TestDatabase::Subclass</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class-DynamicDefault/metadata.xml b/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
index ad0d960c137f..c091ed030202 100644
--- a/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
+++ b/dev-perl/DBIx-Class-DynamicDefault/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-DynamicDefault</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::DynamicDefault</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
index c855a27b825f..7c300b9f8006 100644
--- a/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-Boolean/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-Boolean</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn::Boolean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
index e6612880fbca..e0f2b6fb5f42 100644
--- a/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-IP</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn::IP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml b/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
index d7fbb1509095..e3fa8f1cf82c 100644
--- a/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
+++ b/dev-perl/DBIx-Class-InflateColumn-Object-Enum/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-InflateColumn-Object-Enum</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn::Object::Enum</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class-UserStamp/metadata.xml b/dev-perl/DBIx-Class-UserStamp/metadata.xml
index f7ef9ae28711..ffdf1ec007c9 100644
--- a/dev-perl/DBIx-Class-UserStamp/metadata.xml
+++ b/dev-perl/DBIx-Class-UserStamp/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DBIx-Class-UserStamp</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::UserStamp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Class/metadata.xml b/dev-perl/DBIx-Class/metadata.xml
index cfb45b29d0e1..bf43606c89a6 100644
--- a/dev-perl/DBIx-Class/metadata.xml
+++ b/dev-perl/DBIx-Class/metadata.xml
@@ -22,5 +22,92 @@
   </use>
   <upstream>
     <remote-id type="cpan">DBIx-Class</remote-id>
+    <remote-id type="cpan-module">DBIx::Class</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::AccessorGroup</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Admin</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::CDBICompat</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Carp</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Core</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Cursor</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::DB</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Exception</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::FilterColumn</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn::DateTime</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::InflateColumn::File</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Optional::Dependencies</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Ordered</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::PK</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::PK::Auto</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Relationship</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Relationship::Base</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultClass::HashRefInflator</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSet</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSetColumn</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSetManager</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSource</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSource::Table</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSource::View</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSourceHandle</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::ResultSourceProxy::Table</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Row</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::SQLMaker</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::SQLMaker::LimitDialects</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::SQLMaker::OracleJoins</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Schema</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Schema::Versioned</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Serialize::Storable</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::StartupCheck</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ACCESS</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::MS_Jet</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::MS_Jet::Cursor</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ADO::Microsoft_SQL_Server</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::AutoCast</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Cursor</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::DB2</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Firebird</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Firebird::Common</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Informix</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::InterBase</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::MSSQL</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::MultiColumnIn</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::NoBindVars</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::ACCESS</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::DB2_400_SQL</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::Firebird</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::Microsoft_SQL_Server</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::ODBC::SQL_Anywhere</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Oracle</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Oracle::Generic</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Oracle::WhereJoins</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Pg</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::Balancer</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::Balancer::First</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::Balancer::Random</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::Pool</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::Replicant</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Replicated::WithDSN</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::SQLAnywhere</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::SQLAnywhere::Cursor</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::SQLite</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::ASE</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::ASE::NoBindVars</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::FreeTDS</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::MSSQL</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::Sybase::Microsoft_SQL_Server::NoBindVars</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::UniqueIdentifier</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::DBI::mysql</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::Statistics</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::Storage::TxnScopeGuard</remote-id>
+    <remote-id type="cpan-module">DBIx::Class::UTF8Columns</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBIx::Class</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::DBIx::Class::File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-ContextualFetch/metadata.xml b/dev-perl/DBIx-ContextualFetch/metadata.xml
index 4b953ef92ba0..093170a13aee 100644
--- a/dev-perl/DBIx-ContextualFetch/metadata.xml
+++ b/dev-perl/DBIx-ContextualFetch/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBIx-ContextualFetch</remote-id>
+    <remote-id type="cpan-module">DBIx::ContextualFetch</remote-id>
+    <remote-id type="cpan-module">DBIx::ContextualFetch::db</remote-id>
+    <remote-id type="cpan-module">DBIx::ContextualFetch::st</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-DBSchema/metadata.xml b/dev-perl/DBIx-DBSchema/metadata.xml
index 6c50620b70c9..6d3ff454ec76 100644
--- a/dev-perl/DBIx-DBSchema/metadata.xml
+++ b/dev-perl/DBIx-DBSchema/metadata.xml
@@ -4,5 +4,19 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBIx-DBSchema</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::ColGroup</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::ColGroup::Index</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::ColGroup::Unique</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::Column</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD::Oracle</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD::Pg</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD::SQLite</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD::Sybase</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::DBD::mysql</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::Index</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::Table</remote-id>
+    <remote-id type="cpan-module">DBIx::DBSchema::_util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DBIx-Migration/metadata.xml b/dev-perl/DBIx-Migration/metadata.xml
index 719151b38751..9149401f1728 100644
--- a/dev-perl/DBIx-Migration/metadata.xml
+++ b/dev-perl/DBIx-Migration/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBIx-Migration</remote-id>
+    <remote-id type="cpan-module">DBIx::Migration</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DB_File-Lock/metadata.xml b/dev-perl/DB_File-Lock/metadata.xml
index 77954ea5eaa8..67dc1f28221e 100644
--- a/dev-perl/DB_File-Lock/metadata.xml
+++ b/dev-perl/DB_File-Lock/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DB_File-Lock</remote-id>
+    <remote-id type="cpan-module">DB_File::Lock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Daemon-Generic/metadata.xml b/dev-perl/Daemon-Generic/metadata.xml
index d536f3be088a..6efea4ae72ab 100644
--- a/dev-perl/Daemon-Generic/metadata.xml
+++ b/dev-perl/Daemon-Generic/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Daemon-Generic</remote-id>
+    <remote-id type="cpan-module">Daemon::Generic</remote-id>
+    <remote-id type="cpan-module">Daemon::Generic::AnyEvent</remote-id>
+    <remote-id type="cpan-module">Daemon::Generic::Event</remote-id>
+    <remote-id type="cpan-module">Daemon::Generic::While1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Danga-Socket/metadata.xml b/dev-perl/Danga-Socket/metadata.xml
index b7726704d2dd..78a5fe0de92c 100644
--- a/dev-perl/Danga-Socket/metadata.xml
+++ b/dev-perl/Danga-Socket/metadata.xml
@@ -8,5 +8,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Danga-Socket</remote-id>
+    <remote-id type="cpan-module">Danga::Socket</remote-id>
+    <remote-id type="cpan-module">Danga::Socket::Timer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-AMF/metadata.xml b/dev-perl/Data-AMF/metadata.xml
index b2d2d1fcd366..bf783a9f4521 100644
--- a/dev-perl/Data-AMF/metadata.xml
+++ b/dev-perl/Data-AMF/metadata.xml
@@ -2,9 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
-  <longdescription lang="en">
-</longdescription>
   <upstream>
     <remote-id type="cpan">Data-AMF</remote-id>
+    <remote-id type="cpan-module">Data::AMF</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Formatter</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Formatter::AMF0</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Formatter::AMF3</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Header</remote-id>
+    <remote-id type="cpan-module">Data::AMF::IO</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Message</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Packet</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Parser</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Parser::AMF0</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Parser::AMF3</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Remoting</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Type::Boolean</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Type::ByteArray</remote-id>
+    <remote-id type="cpan-module">Data::AMF::Type::Null</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Compare/metadata.xml b/dev-perl/Data-Compare/metadata.xml
index 973cf87b4edd..118ee75d1057 100644
--- a/dev-perl/Data-Compare/metadata.xml
+++ b/dev-perl/Data-Compare/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Compare</remote-id>
+    <remote-id type="cpan-module">Data::Compare</remote-id>
+    <remote-id type="cpan-module">Data::Compare::Plugins::Scalar::Properties</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Dump-Streamer/metadata.xml b/dev-perl/Data-Dump-Streamer/metadata.xml
index c441db521b4b..65926659de27 100644
--- a/dev-perl/Data-Dump-Streamer/metadata.xml
+++ b/dev-perl/Data-Dump-Streamer/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Dump-Streamer</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Streamer</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Streamer::Deparser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Dump/metadata.xml b/dev-perl/Data-Dump/metadata.xml
index f44ab6c3a768..00c28cae9c43 100644
--- a/dev-perl/Data-Dump/metadata.xml
+++ b/dev-perl/Data-Dump/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Dump</remote-id>
+    <remote-id type="cpan-module">Data::Dump</remote-id>
+    <remote-id type="cpan-module">Data::Dump::FilterContext</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Filtered</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Trace</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Trace::Call</remote-id>
+    <remote-id type="cpan-module">Data::Dump::Trace::Wrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-DumpXML/metadata.xml b/dev-perl/Data-DumpXML/metadata.xml
index 69f15707ec16..7ddddabec64d 100644
--- a/dev-perl/Data-DumpXML/metadata.xml
+++ b/dev-perl/Data-DumpXML/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-DumpXML</remote-id>
+    <remote-id type="cpan-module">Data::DumpXML</remote-id>
+    <remote-id type="cpan-module">Data::DumpXML::ParseStyle</remote-id>
+    <remote-id type="cpan-module">Data::DumpXML::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Dumper-Concise/metadata.xml b/dev-perl/Data-Dumper-Concise/metadata.xml
index df26ec4de672..406cd19444dc 100644
--- a/dev-perl/Data-Dumper-Concise/metadata.xml
+++ b/dev-perl/Data-Dumper-Concise/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Dumper-Concise</remote-id>
+    <remote-id type="cpan-module">Data::Dumper::Concise</remote-id>
+    <remote-id type="cpan-module">Data::Dumper::Concise::Sugar</remote-id>
+    <remote-id type="cpan-module">Devel::Dwarn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-FormValidator/metadata.xml b/dev-perl/Data-FormValidator/metadata.xml
index 0ff609901372..06751dc17044 100644
--- a/dev-perl/Data-FormValidator/metadata.xml
+++ b/dev-perl/Data-FormValidator/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-FormValidator</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Constraints</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Constraints::Dates</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Constraints::RegexpCommon</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Constraints::Upload</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::ConstraintsFactory</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Filters</remote-id>
+    <remote-id type="cpan-module">Data::FormValidator::Results</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Hexify/metadata.xml b/dev-perl/Data-Hexify/metadata.xml
index bb00e251c85e..b4c2799b6717 100644
--- a/dev-perl/Data-Hexify/metadata.xml
+++ b/dev-perl/Data-Hexify/metadata.xml
@@ -10,7 +10,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-	<upstream>
-		<remote-id type="cpan">Data-Hexify</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type="cpan">Data-Hexify</remote-id>
+	<remote-id type="cpan-module">Data::Hexify</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Hierarchy/metadata.xml b/dev-perl/Data-Hierarchy/metadata.xml
index f1022eb95d43..9373d5426d8b 100644
--- a/dev-perl/Data-Hierarchy/metadata.xml
+++ b/dev-perl/Data-Hierarchy/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Hierarchy</remote-id>
+    <remote-id type="cpan-module">Data::Hierarchy</remote-id>
+    <remote-id type="cpan-module">Data::Hierarchy::Relative</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-ICal/metadata.xml b/dev-perl/Data-ICal/metadata.xml
index 522e08ec9498..be3ca50b500e 100644
--- a/dev-perl/Data-ICal/metadata.xml
+++ b/dev-perl/Data-ICal/metadata.xml
@@ -4,5 +4,19 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-ICal</remote-id>
+    <remote-id type="cpan-module">Data::ICal</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Alarm::Audio</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Alarm::Display</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Alarm::Email</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Alarm::Procedure</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Event</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::FreeBusy</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Journal</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::TimeZone</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::TimeZone::Daylight</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::TimeZone::Standard</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Entry::Todo</remote-id>
+    <remote-id type="cpan-module">Data::ICal::Property</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-ObjectDriver/metadata.xml b/dev-perl/Data-ObjectDriver/metadata.xml
index 5fbbe4a8e622..39bfdd3a1c88 100644
--- a/dev-perl/Data-ObjectDriver/metadata.xml
+++ b/dev-perl/Data-ObjectDriver/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-ObjectDriver</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::BaseObject</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::BaseView</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::BaseCache</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Cache::Apache</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Cache::Cache</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Cache::Memcached</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Cache::RAM</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD::Oracle</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD::Oracle::db</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD::Pg</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD::SQLite</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBD::mysql</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::DBI</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::GearmanDBI</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::MultiPartition</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Multiplexer</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::Partition</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Driver::SimplePartition</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Errors</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Iterator</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::Profiler</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::ResultSet</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::SQL</remote-id>
+    <remote-id type="cpan-module">Data::ObjectDriver::SQL::Oracle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-OptList/metadata.xml b/dev-perl/Data-OptList/metadata.xml
index 4aa86fd4a5a4..db61bd66c08a 100644
--- a/dev-perl/Data-OptList/metadata.xml
+++ b/dev-perl/Data-OptList/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-OptList</remote-id>
+    <remote-id type="cpan-module">Data::OptList</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Page/metadata.xml b/dev-perl/Data-Page/metadata.xml
index 433c301247b6..a0953752e763 100644
--- a/dev-perl/Data-Page/metadata.xml
+++ b/dev-perl/Data-Page/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Page</remote-id>
+    <remote-id type="cpan-module">Data::Page</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Random/metadata.xml b/dev-perl/Data-Random/metadata.xml
index ba19f3c503f0..0fa81c8e90f0 100644
--- a/dev-perl/Data-Random/metadata.xml
+++ b/dev-perl/Data-Random/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Random</remote-id>
+    <remote-id type="cpan-module">Data::Random</remote-id>
+    <remote-id type="cpan-module">Data::Random::WordList</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-ShowTable/metadata.xml b/dev-perl/Data-ShowTable/metadata.xml
index 6eeccbce647a..66b9841e60ab 100644
--- a/dev-perl/Data-ShowTable/metadata.xml
+++ b/dev-perl/Data-ShowTable/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-ShowTable</remote-id>
+    <remote-id type="cpan-module">Data::ShowTable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Stag/metadata.xml b/dev-perl/Data-Stag/metadata.xml
index 7ca682d32517..5599a32d457a 100644
--- a/dev-perl/Data-Stag/metadata.xml
+++ b/dev-perl/Data-Stag/metadata.xml
@@ -9,5 +9,34 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Stag</remote-id>
+    <remote-id type="cpan-module">Data::Stag</remote-id>
+    <remote-id type="cpan-module">Data::Stag::Arr2HTML</remote-id>
+    <remote-id type="cpan-module">Data::Stag::Base</remote-id>
+    <remote-id type="cpan-module">Data::Stag::BaseGenerator</remote-id>
+    <remote-id type="cpan-module">Data::Stag::BaseHandler</remote-id>
+    <remote-id type="cpan-module">Data::Stag::ChainHandler</remote-id>
+    <remote-id type="cpan-module">Data::Stag::DTDWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::GraphHandler</remote-id>
+    <remote-id type="cpan-module">Data::Stag::HashDB</remote-id>
+    <remote-id type="cpan-module">Data::Stag::ITextParser</remote-id>
+    <remote-id type="cpan-module">Data::Stag::ITextWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::IndentParser</remote-id>
+    <remote-id type="cpan-module">Data::Stag::IndentWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::PerlWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::PodParser</remote-id>
+    <remote-id type="cpan-module">Data::Stag::SAX2Stag</remote-id>
+    <remote-id type="cpan-module">Data::Stag::Simple</remote-id>
+    <remote-id type="cpan-module">Data::Stag::StagDB</remote-id>
+    <remote-id type="cpan-module">Data::Stag::StagI</remote-id>
+    <remote-id type="cpan-module">Data::Stag::StagImpl</remote-id>
+    <remote-id type="cpan-module">Data::Stag::SxprParser</remote-id>
+    <remote-id type="cpan-module">Data::Stag::SxprWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::Util</remote-id>
+    <remote-id type="cpan-module">Data::Stag::Writer</remote-id>
+    <remote-id type="cpan-module">Data::Stag::XMLParser</remote-id>
+    <remote-id type="cpan-module">Data::Stag::XMLWriter</remote-id>
+    <remote-id type="cpan-module">Data::Stag::XSLHandler</remote-id>
+    <remote-id type="cpan-module">Data::Stag::XSLTHandler</remote-id>
+    <remote-id type="cpan-module">Data::Stag::null</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Stream-Bulk/metadata.xml b/dev-perl/Data-Stream-Bulk/metadata.xml
index b1723f62740f..007d2cd68fc4 100644
--- a/dev-perl/Data-Stream-Bulk/metadata.xml
+++ b/dev-perl/Data-Stream-Bulk/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Stream-Bulk</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Array</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Callback</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Cat</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Chunked</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::DBI</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::DBIC</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::DoneFlag</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::FileHandle</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Filter</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Nil</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Path::Class</remote-id>
+    <remote-id type="cpan-module">Data::Stream::Bulk::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-URIEncode/metadata.xml b/dev-perl/Data-URIEncode/metadata.xml
index fb3bef03629c..26bf9c1a7f87 100644
--- a/dev-perl/Data-URIEncode/metadata.xml
+++ b/dev-perl/Data-URIEncode/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-URIEncode</remote-id>
+    <remote-id type="cpan-module">Data::URIEncode</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-UUID/metadata.xml b/dev-perl/Data-UUID/metadata.xml
index 9afd2a788e10..945870da611f 100644
--- a/dev-perl/Data-UUID/metadata.xml
+++ b/dev-perl/Data-UUID/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-UUID</remote-id>
+    <remote-id type="cpan-module">Data::UUID</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Uniqid/Data-Uniqid-0.12.ebuild b/dev-perl/Data-Uniqid/Data-Uniqid-0.120.0.ebuild
similarity index 56%
rename from dev-perl/Data-Uniqid/Data-Uniqid-0.12.ebuild
rename to dev-perl/Data-Uniqid/Data-Uniqid-0.120.0.ebuild
index 6c77d834737d..c387abff934c 100644
--- a/dev-perl/Data-Uniqid/Data-Uniqid-0.12.ebuild
+++ b/dev-perl/Data-Uniqid/Data-Uniqid-0.120.0.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-Uniqid/Data-Uniqid-0.12.ebuild,v 1.2 2012/05/24 05:36:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-Uniqid/Data-Uniqid-0.120.0.ebuild,v 1.1 2012/06/24 19:28:08 tove Exp $
 
 EAPI="4"
 
 MODULE_AUTHOR="MWX"
-
+MODULE_VERSION=0.12
 inherit perl-module
 
-DESCRIPTION="Perl extension for simple genrating of unique id's"
+DESCRIPTION="Perl extension for simple generating of unique ids"
 
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/perl
+RDEPEND="
 	virtual/perl-Math-BigInt
-	virtual/perl-Time-HiRes"
+	virtual/perl-Time-HiRes
+"
 DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
diff --git a/dev-perl/Data-Uniqid/metadata.xml b/dev-perl/Data-Uniqid/metadata.xml
index e5b91425a40f..5f8a23363c3a 100644
--- a/dev-perl/Data-Uniqid/metadata.xml
+++ b/dev-perl/Data-Uniqid/metadata.xml
@@ -5,4 +5,8 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Data-Uniqid</remote-id>
+    <remote-id type="cpan-module">Data::Uniqid</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Utilities/metadata.xml b/dev-perl/Data-Utilities/metadata.xml
index 9f844ea5d349..0970e0813877 100644
--- a/dev-perl/Data-Utilities/metadata.xml
+++ b/dev-perl/Data-Utilities/metadata.xml
@@ -8,5 +8,10 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Data-Utilities</remote-id>
+    <remote-id type="cpan-module">Data::Comparator</remote-id>
+    <remote-id type="cpan-module">Data::Differences</remote-id>
+    <remote-id type="cpan-module">Data::Merger</remote-id>
+    <remote-id type="cpan-module">Data::Transformator</remote-id>
+    <remote-id type="cpan-module">Data::Utilities</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Data-Visitor/metadata.xml b/dev-perl/Data-Visitor/metadata.xml
index 004555036380..105b30b8c18f 100644
--- a/dev-perl/Data-Visitor/metadata.xml
+++ b/dev-perl/Data-Visitor/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Visitor</remote-id>
+    <remote-id type="cpan-module">Data::Visitor</remote-id>
+    <remote-id type="cpan-module">Data::Visitor::Callback</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-Calc/metadata.xml b/dev-perl/Date-Calc/metadata.xml
index ee45cb16741d..8a1f2e2f273d 100644
--- a/dev-perl/Date-Calc/metadata.xml
+++ b/dev-perl/Date-Calc/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-Calc</remote-id>
+    <remote-id type="cpan-module">Date::Calc</remote-id>
+    <remote-id type="cpan-module">Date::Calc::Object</remote-id>
+    <remote-id type="cpan-module">Date::Calc::PP</remote-id>
+    <remote-id type="cpan-module">Date::Calendar</remote-id>
+    <remote-id type="cpan-module">Date::Calendar::Profiles</remote-id>
+    <remote-id type="cpan-module">Date::Calendar::Year</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-ICal/metadata.xml b/dev-perl/Date-ICal/metadata.xml
index f70135998862..ed304c7ce834 100644
--- a/dev-perl/Date-ICal/metadata.xml
+++ b/dev-perl/Date-ICal/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-ICal</remote-id>
+    <remote-id type="cpan-module">Date::ICal</remote-id>
+    <remote-id type="cpan-module">Date::ICal::Duration</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-ISO/metadata.xml b/dev-perl/Date-ISO/metadata.xml
index c42ab1cd5d6a..7b7c0bace715 100644
--- a/dev-perl/Date-ISO/metadata.xml
+++ b/dev-perl/Date-ISO/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-ISO</remote-id>
+    <remote-id type="cpan-module">Date::ISO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-Leapyear/metadata.xml b/dev-perl/Date-Leapyear/metadata.xml
index fbce8f2aa5ee..ea46c723e4ae 100644
--- a/dev-perl/Date-Leapyear/metadata.xml
+++ b/dev-perl/Date-Leapyear/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-Leapyear</remote-id>
+    <remote-id type="cpan-module">Date::Leapyear</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-Pcalc/metadata.xml b/dev-perl/Date-Pcalc/metadata.xml
index e3127e846a8c..ecf0919c4da9 100644
--- a/dev-perl/Date-Pcalc/metadata.xml
+++ b/dev-perl/Date-Pcalc/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-Pcalc</remote-id>
+    <remote-id type="cpan-module">Date::Pcalc</remote-id>
+    <remote-id type="cpan-module">Date::Pcalc::Object</remote-id>
+    <remote-id type="cpan-module">Date::Pcalendar</remote-id>
+    <remote-id type="cpan-module">Date::Pcalendar::Profiles</remote-id>
+    <remote-id type="cpan-module">Date::Pcalendar::Year</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Date-Simple/metadata.xml b/dev-perl/Date-Simple/metadata.xml
index 15497ea2e4d1..798842c2f3cb 100644
--- a/dev-perl/Date-Simple/metadata.xml
+++ b/dev-perl/Date-Simple/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-Simple</remote-id>
+    <remote-id type="cpan-module">Date::Simple</remote-id>
+    <remote-id type="cpan-module">Date::Simple::D8</remote-id>
+    <remote-id type="cpan-module">Date::Simple::Fmt</remote-id>
+    <remote-id type="cpan-module">Date::Simple::ISO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateManip/metadata.xml b/dev-perl/DateManip/metadata.xml
index 506882377e38..44f59b9f4ae1 100644
--- a/dev-perl/DateManip/metadata.xml
+++ b/dev-perl/DateManip/metadata.xml
@@ -4,5 +4,977 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Date-Manip</remote-id>
+    <remote-id type="cpan-module">Date::Manip</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Base</remote-id>
+    <remote-id type="cpan-module">Date::Manip::DM5</remote-id>
+    <remote-id type="cpan-module">Date::Manip::DM5abbrevs</remote-id>
+    <remote-id type="cpan-module">Date::Manip::DM6</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Date</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Delta</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::catalan</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::danish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::dutch</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::english</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::finnish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::french</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::german</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::index</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::italian</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::norwegian</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::polish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::portugue</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::romanian</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::russian</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::spanish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::swedish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Lang::turkish</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Obj</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off000</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off001</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off002</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off003</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off004</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off005</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off006</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off007</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off008</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off009</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off010</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off011</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off012</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off013</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off014</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off015</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off016</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off017</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off018</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off019</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off020</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off021</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off022</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off023</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off024</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off025</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off026</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off027</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off028</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off029</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off030</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off031</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off032</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off033</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off034</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off035</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off036</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off037</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off038</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off039</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off040</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off041</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off042</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off043</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off044</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off045</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off046</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off047</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off048</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off049</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off050</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off051</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off052</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off053</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off054</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off055</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off056</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off057</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off058</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off059</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off060</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off061</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off062</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off063</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off064</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off065</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off066</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off067</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off068</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off069</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off070</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off071</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off072</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off073</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off074</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off075</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off076</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off077</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off078</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off079</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off080</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off081</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off082</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off083</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off084</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off085</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off086</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off087</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off088</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off089</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off090</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off091</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off092</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off093</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off094</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off095</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off096</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off097</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off098</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off099</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off100</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off101</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off102</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off103</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off104</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off105</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off106</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off107</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off108</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off109</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off110</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off111</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off112</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off113</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off114</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off115</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off116</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off117</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off118</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off119</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off120</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off121</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off122</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off123</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off124</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off125</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off126</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off127</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off128</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off129</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off130</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off131</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off132</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off133</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off134</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off135</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off136</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off137</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off138</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off139</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off140</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off141</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off142</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off143</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off144</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off145</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off146</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off147</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off148</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off149</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off150</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off151</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off152</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off153</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off154</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off155</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off156</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off157</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off158</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off159</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off160</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off161</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off162</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off163</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off164</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off165</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off166</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off167</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off168</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off169</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off170</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off171</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off172</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off173</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off174</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off175</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off176</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off177</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off178</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off179</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off180</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off181</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off182</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off183</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off184</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off185</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off186</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off187</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off188</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off189</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off190</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off191</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off192</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off193</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off194</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off195</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off196</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off197</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off198</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off199</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off200</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off201</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off202</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off203</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off204</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off205</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off206</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off207</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off208</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off209</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off210</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off211</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off212</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off213</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off214</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off215</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off216</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off217</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off218</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off219</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off220</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off221</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off222</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off223</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off224</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off225</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off226</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off227</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off228</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off229</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off230</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off231</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off232</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off233</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off234</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off235</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off236</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off237</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off238</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off239</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off240</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off241</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off242</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off243</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off244</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off245</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off246</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off247</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off248</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off249</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off250</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off251</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off252</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off253</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off254</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off255</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off256</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off257</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off258</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off259</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off260</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off261</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off262</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off263</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off264</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off265</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off266</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off267</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off268</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off269</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off270</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off271</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off272</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off273</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off274</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off275</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off276</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off277</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off278</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off279</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off280</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off281</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off282</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off283</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off284</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off285</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off286</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off287</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off288</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off289</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off290</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off291</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off292</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off293</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off294</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off295</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off296</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off297</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off298</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off299</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off300</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off301</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off302</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off303</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off304</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off305</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off306</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off307</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off308</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off309</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off310</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off311</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off312</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off313</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off314</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off315</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off316</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off317</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off318</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off319</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off320</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off321</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off322</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off323</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off324</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off325</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off326</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off327</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off328</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off329</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off330</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off331</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off332</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off333</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off334</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off335</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off336</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off337</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off338</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off339</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off340</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off341</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off342</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off343</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off344</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off345</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off346</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off347</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off348</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off349</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off350</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off351</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off352</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off353</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off354</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off355</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off356</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off357</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off358</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off359</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off360</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off361</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off362</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off363</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off364</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off365</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off366</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off367</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off368</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off369</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off370</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off371</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off372</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off373</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off374</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off375</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off376</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off377</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off378</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off379</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off380</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off381</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off382</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off383</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off384</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off385</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off386</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off387</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off388</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off389</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off390</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off391</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off392</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off393</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off394</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off395</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off396</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off397</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off398</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off399</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off400</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off401</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off402</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off403</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off404</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off405</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off406</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off407</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off408</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off409</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off410</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off411</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off412</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off413</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off414</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off415</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off416</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off417</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off418</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off419</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off420</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off421</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off422</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off423</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off424</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off425</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off426</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off427</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off428</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off429</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off430</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off431</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off432</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off433</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off434</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off435</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off436</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off437</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off438</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off439</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off440</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off441</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off442</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off443</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off444</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off445</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off446</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off447</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off448</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off449</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off450</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off451</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off452</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off453</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off454</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off455</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off456</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off457</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off458</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off459</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off460</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off461</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off462</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off463</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off464</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off465</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off466</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off467</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off468</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off469</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off470</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off471</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off472</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off473</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off474</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off475</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off476</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off477</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off478</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off479</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off480</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off481</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off482</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off483</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off484</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off485</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off486</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off487</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Offset::off488</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Recur</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::a00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afabid00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afaccr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afaddi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afalgi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afasma00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbama00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbang00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbanj00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbiss00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afblan00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbraz00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afbuju00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afcair00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afcasa00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afceut00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afcona00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afdaka00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afdar_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afdjib00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afdoua00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afel_a00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::affree00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afgabo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afhara00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afjoha00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afjuba00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afkamp00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afkhar00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afkiga00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afkins00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aflago00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aflibr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aflome00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afluan00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aflubu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aflusa00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmala00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmapu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmase00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmbab00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmoga00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afmonr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afnair00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afndja00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afniam00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afnoua00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afouag00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afport00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afsao_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aftrip00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aftuni00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::afwind00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amadak00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amanch00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amangu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amanti00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amarag00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amarub00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amasun00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amatik00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambahi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambahi01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambarb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambele00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambeli00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambeul00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amblan00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amboa_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambogo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambois00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ambuen00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcamb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcamp00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcanc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcara00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcata00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcaye00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcaym00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcent00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amchic00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amchih00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcord00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcost00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcres00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcuia00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amcura00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdanm00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdaws00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdaws01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdenv00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdetr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amdomi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amedmo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ameiru00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amel_s00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amfort00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amglac00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amgodt00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amgoos00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amgran00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amgren00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amguad00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amguat00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amguay00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amguya00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amhali00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amhava00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amherm00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amindi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aminuv00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amiqal00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amjama00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amjuju00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amjune00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amknox00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amla_p00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amla_r00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amlima00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amlos_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amloui00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammace00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammana00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammana01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammare00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammart00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammata00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammaza00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammend00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammeno00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammeri00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammetl00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammexi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammiqu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammonc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammont00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammont01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammont02</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammont03</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ammont04</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnass00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnew_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnew_01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnipi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnome00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amnoro00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amojin00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ampana00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ampang00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ampara00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ampete00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amphoe00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amport00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amport01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amport02</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ampuer00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amrain00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amrank00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amreci00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amregi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amreso00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amrio_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amrio_01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsalt00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsan_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsan_01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsant00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsant01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsant02</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsant03</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsao_00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amscor00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amsitk00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amst_j00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amst_k00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amst_l00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amst_t00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amst_v00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amswif00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtegu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtell00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amthul00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amthun00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtiju00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtoro00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtort00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amtucu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amushu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amvanc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amveva00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amvinc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amwhit00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amwina00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amwinn00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amyaku00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::amyell00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ancase00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::andavi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::andumo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anmacq00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anmaws00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anmcmu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anpalm00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anroth00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ansyow00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::anvost00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asaden00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asalma00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asamma00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asanad00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asaqta00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asaqto00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asashg00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbagh00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbahr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbaku00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbang00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbeir00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbish00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asbrun00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aschoi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aschon00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ascolo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asdama00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asdhak00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asdili00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asduba00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asdush00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asgaza00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asharb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ashebr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asho_c00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ashong00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ashovd00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asirku00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asjaka00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asjaya00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asjeru00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askabu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askamc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askara00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askash00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askath00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askolk00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askras00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askual00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askuch00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::askuwa00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asmaca00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asmaga00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asmaka00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asmani00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asmusc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asnico00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asnovo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asnovo01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asomsk00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asoral00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asphno00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aspont00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aspyon00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asqata00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asqyzy00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asrang00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asriya00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::assakh00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::assama00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asseou00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asshan00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::assing00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::astaip00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::astash00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::astbil00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::astehr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asthim00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::astoky00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asulaa00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asurum00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asvien00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asvlad00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asyaku00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asyeka00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::asyere00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atazor00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atberm00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atcana00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atcape00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atfaro00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atmade00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atreyk00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atsout00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atst_h00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::atstan00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::auadel00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aubris00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aubrok00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aucurr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::audarw00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aueucl00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::auhoba00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aulind00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aulord00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aumelb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::aupert00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ausydn00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::b00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::c00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::cet00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::d00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::e00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eet00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmt00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm02</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm03</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm04</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm05</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm06</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm07</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm08</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm09</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm10</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm11</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm12</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtm13</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp01</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp02</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp03</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp04</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp05</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp06</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp07</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp08</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp09</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp10</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::etgmtp11</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euamst00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euando00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euathe00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eubelg00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euberl00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eubrus00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eubuch00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eubuda00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euchis00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eucope00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eudubl00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eugibr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euhels00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euista00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eukali00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eukiev00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eulisb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eulond00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euluxe00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eumadr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eumalt00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eumins00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eumona00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eumosc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euoslo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eupari00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euprag00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euriga00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eurome00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eusama00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eusimf00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eusofi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eustoc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eutall00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::eutira00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euuzhg00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euvadu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euvien00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euviln00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euvolg00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euwars00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euzapo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::euzuri00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::f00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::g00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::h00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::i00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inanta00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inchag00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inchri00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::incoco00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::incomo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inkerg00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inmahe00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inmald00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inmaur00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inmayo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::inreun00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::k00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::l00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::m00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::met00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::n00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::o00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::p00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paapia00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paauck00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pachat00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pachuu00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paeast00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paefat00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paende00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pafaka00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pafiji00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pafuna00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pagala00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pagamb00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paguad00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paguam00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pahono00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pakiri00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pakosr00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pakwaj00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pamaju00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pamarq00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pamidw00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::panaur00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paniue00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::panorf00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::panoum00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::papago00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::papala00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::papitc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::papohn00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::paport00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pararo00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pasaip00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::patahi00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::patara00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::patong00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pawake00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::pawall00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::q00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::r00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::s00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::t00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::u00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::ut00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::utc00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::v00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::w00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::wet00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::x00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::y00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ::z00</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZ_Base</remote-id>
+    <remote-id type="cpan-module">Date::Manip::TZdata</remote-id>
+    <remote-id type="cpan-module">Date::Manip::Zones</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Event-ICal/metadata.xml b/dev-perl/DateTime-Event-ICal/metadata.xml
index 080ea7d02528..7b4acd81495c 100644
--- a/dev-perl/DateTime-Event-ICal/metadata.xml
+++ b/dev-perl/DateTime-Event-ICal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Event-ICal</remote-id>
+    <remote-id type="cpan-module">DateTime::Event::ICal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Event-Recurrence/metadata.xml b/dev-perl/DateTime-Event-Recurrence/metadata.xml
index 3daa5177a611..f2563832034b 100644
--- a/dev-perl/DateTime-Event-Recurrence/metadata.xml
+++ b/dev-perl/DateTime-Event-Recurrence/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Event-Recurrence</remote-id>
+    <remote-id type="cpan-module">DateTime::Event::Recurrence</remote-id>
+    <remote-id type="cpan-module">DateTime::Set::ICal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Builder/metadata.xml b/dev-perl/DateTime-Format-Builder/metadata.xml
index 9651e31490d4..b6299ed79546 100644
--- a/dev-perl/DateTime-Format-Builder/metadata.xml
+++ b/dev-perl/DateTime-Format-Builder/metadata.xml
@@ -8,5 +8,12 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Builder</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser::Dispatch</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser::Quick</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser::Regex</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser::Strptime</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Builder::Parser::generic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-DateManip/metadata.xml b/dev-perl/DateTime-Format-DateManip/metadata.xml
index 97ccac29b5a3..cd13079dc862 100644
--- a/dev-perl/DateTime-Format-DateManip/metadata.xml
+++ b/dev-perl/DateTime-Format-DateManip/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-DateManip</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::DateManip</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-DateParse/metadata.xml b/dev-perl/DateTime-Format-DateParse/metadata.xml
index 2287f98cafb2..e3c7c8efc9a8 100644
--- a/dev-perl/DateTime-Format-DateParse/metadata.xml
+++ b/dev-perl/DateTime-Format-DateParse/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-DateParse</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::DateParse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Flexible/metadata.xml b/dev-perl/DateTime-Format-Flexible/metadata.xml
index a9b3b4e3b861..178942e727d6 100644
--- a/dev-perl/DateTime-Format-Flexible/metadata.xml
+++ b/dev-perl/DateTime-Format-Flexible/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Flexible</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Flexible</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Flexible::lang</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Flexible::lang::de</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Flexible::lang::en</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Flexible::lang::es</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-HTTP/metadata.xml b/dev-perl/DateTime-Format-HTTP/metadata.xml
index 2511c5779629..e4321b59f61a 100644
--- a/dev-perl/DateTime-Format-HTTP/metadata.xml
+++ b/dev-perl/DateTime-Format-HTTP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-HTTP</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::HTTP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-ICal/metadata.xml b/dev-perl/DateTime-Format-ICal/metadata.xml
index 26121a02cd6a..3bf4e5ed9ba8 100644
--- a/dev-perl/DateTime-Format-ICal/metadata.xml
+++ b/dev-perl/DateTime-Format-ICal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-ICal</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::ICal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-ISO8601/metadata.xml b/dev-perl/DateTime-Format-ISO8601/metadata.xml
index 2fcf0392e35b..dbe13bf7eb22 100644
--- a/dev-perl/DateTime-Format-ISO8601/metadata.xml
+++ b/dev-perl/DateTime-Format-ISO8601/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-ISO8601</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::ISO8601</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Mail/metadata.xml b/dev-perl/DateTime-Format-Mail/metadata.xml
index 29d5c9018f7e..7d67d905300a 100644
--- a/dev-perl/DateTime-Format-Mail/metadata.xml
+++ b/dev-perl/DateTime-Format-Mail/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Mail</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Mail</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Natural/metadata.xml b/dev-perl/DateTime-Format-Natural/metadata.xml
index 39735668f0c9..3bf86429614d 100644
--- a/dev-perl/DateTime-Format-Natural/metadata.xml
+++ b/dev-perl/DateTime-Format-Natural/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Natural</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Calc</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Compat</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Duration</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Duration::Checks</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Expand</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Extract</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Formatted</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Helpers</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Lang::Base</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Lang::EN</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Rewrite</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Test</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Utils</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Natural::Wrappers</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-SQLite/metadata.xml b/dev-perl/DateTime-Format-SQLite/metadata.xml
index 08c24cedce26..b4961120911f 100644
--- a/dev-perl/DateTime-Format-SQLite/metadata.xml
+++ b/dev-perl/DateTime-Format-SQLite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-SQLite</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::SQLite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-Strptime/metadata.xml b/dev-perl/DateTime-Format-Strptime/metadata.xml
index bb0ce3efe108..d6307661b4f2 100644
--- a/dev-perl/DateTime-Format-Strptime/metadata.xml
+++ b/dev-perl/DateTime-Format-Strptime/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-Format-Strptime</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::Strptime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Format-W3CDTF/metadata.xml b/dev-perl/DateTime-Format-W3CDTF/metadata.xml
index 82bfdc8a5c55..4852f9e8a689 100644
--- a/dev-perl/DateTime-Format-W3CDTF/metadata.xml
+++ b/dev-perl/DateTime-Format-W3CDTF/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Format-W3CDTF</remote-id>
+    <remote-id type="cpan-module">DateTime::Format::W3CDTF</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-HiRes/metadata.xml b/dev-perl/DateTime-HiRes/metadata.xml
index 6f2fff0cbdaf..601520c1670d 100644
--- a/dev-perl/DateTime-HiRes/metadata.xml
+++ b/dev-perl/DateTime-HiRes/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">DateTime-HiRes</remote-id>
+    <remote-id type="cpan-module">DateTime::HiRes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Locale/metadata.xml b/dev-perl/DateTime-Locale/metadata.xml
index 3cb4a187fb1d..d58dd83edb2a 100644
--- a/dev-perl/DateTime-Locale/metadata.xml
+++ b/dev-perl/DateTime-Locale/metadata.xml
@@ -4,5 +4,474 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Locale</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::Base</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::Catalog</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::aa</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::aa_DJ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::aa_ER</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::aa_ER_SAAHO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::aa_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::af</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::af_NA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::af_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ak</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ak_GH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::am</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::am_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_AE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_BH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_DZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_EG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_IQ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_JO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_KW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_LB</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_LY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_MA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_OM</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_QA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_SA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_SD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_SY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_TN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ar_YE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::as</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::as_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az_AZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az_Cyrl_AZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::az_Latn_AZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::be</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::be_BY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bg</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bg_BG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bn_BD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bn_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bo_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bo_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bs</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::bs_BA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::byn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::byn_ER</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ca</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ca_ES</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cch</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cch_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cop</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cs</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cs_CZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cy</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::cy_GB</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::da</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::da_DK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_AT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_BE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_CH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_DE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_LI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::de_LU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::dv</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::dv_MV</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::dz</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::dz_BT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ee</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ee_GH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ee_TG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::el</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::el_CY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::el_GR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::el_POLYTON</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_AS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_AU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_BE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_BW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_BZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_CA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_Dsrt</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_Dsrt_US</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_GB</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_GU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_HK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_IE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_JM</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_MH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_MP</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_MT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_NA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_NZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_PH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_PK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_SG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_Shaw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_TT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_UM</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_US</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_US_POSIX</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_VI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::en_ZW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::eo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_AR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_BO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_CL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_CO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_CR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_DO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_EC</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_ES</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_GT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_HN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_MX</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_NI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_PA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_PE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_PR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_PY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_SV</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_US</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_UY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::es_VE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::et</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::et_EE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::eu</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::eu_ES</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fa</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fa_AF</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fa_IR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fi</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fi_FI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fil</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fil_PH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fo_FO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_BE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_CA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_CH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_FR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_LU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_MC</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fr_SN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fur</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::fur_IT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ga</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ga_IE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gaa</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gaa_GH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gez</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gez_ER</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gez_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gl_ES</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gsw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gsw_CH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gu</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gu_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gv</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::gv_GB</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Arab</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Arab_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Arab_SD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_GH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Latn_GH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Latn_NE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_Latn_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_NE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ha_SD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::haw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::haw_US</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::he</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::he_IL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hi</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hi_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hr_HR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hu</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hu_HU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hy</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hy_AM</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::hy_AM_REVISED</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ia</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::id</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::id_ID</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ig</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ig_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ii</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ii_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::is</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::is_IS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::it</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::it_CH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::it_IT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::iu</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ja</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ja_JP</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ka</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ka_GE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kaj</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kaj_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kam</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kam_KE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kcg</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kcg_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kfo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kfo_CI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kk</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kk_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kk_Cyrl_KZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kk_KZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kl_GL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::km</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::km_KH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kn_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ko</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ko_KR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kok</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kok_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kpe</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kpe_GN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kpe_LR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Arab</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Arab_IQ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Arab_IR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Arab_SY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_IQ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_IR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_Latn_TR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_SY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ku_TR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::kw_GB</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ky</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ky_KG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ln</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ln_CD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ln_CG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lo_LA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lt</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lt_LT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lv</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::lv_LV</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mk</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mk_MK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ml</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ml_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_Cyrl_MN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_MN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_Mong</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mn_Mong_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mr_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ms</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ms_BN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ms_MY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mt</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::mt_MT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::my</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::my_MM</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nb</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nb_NO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nds</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nds_DE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ne</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ne_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ne_NP</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nl_BE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nl_NL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nn_NO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::no</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nr_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nso</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::nso_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ny</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ny_MW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::oc</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::oc_FR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::om</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::om_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::om_KE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::or</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::or_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_Arab</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_Arab_PK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_Guru</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_Guru_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pa_PK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pl_PL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ps</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ps_AF</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pt</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pt_BR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::pt_PT</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ro</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ro_MD</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ro_RO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::root</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ru</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ru_RU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ru_UA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::rw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::rw_RW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sa</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sa_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::se</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::se_FI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::se_NO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sh</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sh_BA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sh_CS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sh_YU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::si</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::si_LK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sid</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sid_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sk</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sk_SK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sl_SI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::so</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::so_DJ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::so_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::so_KE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::so_SO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sq</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sq_AL</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_BA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_CS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl_BA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl_CS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl_ME</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl_RS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Cyrl_YU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn_BA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn_CS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn_ME</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn_RS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_Latn_YU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_ME</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_RS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sr_YU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ss</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ss_SZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ss_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::st</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::st_LS</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::st_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sv</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sv_FI</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sv_SE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sw</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sw_KE</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::sw_TZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::syr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::syr_SY</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ta</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ta_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::te</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::te_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tg</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tg_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tg_Cyrl_TJ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tg_TJ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::th</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::th_TH</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ti</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ti_ER</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ti_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tig</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tig_ER</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tn_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::to</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::to_TO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tr</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tr_TR</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::trv</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::trv_TW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ts</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ts_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tt</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::tt_RU</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ug</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ug_Arab</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ug_Arab_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ug_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uk</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uk_UA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ur</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ur_IN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ur_PK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_AF</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Arab</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Arab_AF</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Cyrl</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Cyrl_UZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_Latn_UZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::uz_UZ</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ve</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::ve_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::vi</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::vi_VN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wal</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wal_ET</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wo_Latn</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wo_Latn_SN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::wo_SN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::xh</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::xh_ZA</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::yo</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::yo_NG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_HK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hans</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hans_CN</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hans_HK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hans_MO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hans_SG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hant</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hant_HK</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hant_MO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_Hant_TW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_MO</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_SG</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zh_TW</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zu</remote-id>
+    <remote-id type="cpan-module">DateTime::Locale::zu_ZA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-Set/metadata.xml b/dev-perl/DateTime-Set/metadata.xml
index bdcc600d577a..1cd758244d34 100644
--- a/dev-perl/DateTime-Set/metadata.xml
+++ b/dev-perl/DateTime-Set/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-Set</remote-id>
+    <remote-id type="cpan-module">DateTime::Set</remote-id>
+    <remote-id type="cpan-module">DateTime::Span</remote-id>
+    <remote-id type="cpan-module">DateTime::SpanSet</remote-id>
+    <remote-id type="cpan-module">Set::Infinite::_recurrence</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime-TimeZone/metadata.xml b/dev-perl/DateTime-TimeZone/metadata.xml
index b6cdbf6b7b4b..1235a7d03cd6 100644
--- a/dev-perl/DateTime-TimeZone/metadata.xml
+++ b/dev-perl/DateTime-TimeZone/metadata.xml
@@ -4,5 +4,426 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime-TimeZone</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Abidjan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Accra</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Addis_Ababa</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Algiers</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Asmara</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Bamako</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Bangui</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Banjul</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Bissau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Blantyre</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Brazzaville</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Bujumbura</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Cairo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Casablanca</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Ceuta</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Conakry</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Dakar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Dar_es_Salaam</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Djibouti</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Douala</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::El_Aaiun</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Freetown</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Gaborone</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Harare</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Johannesburg</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Juba</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Kampala</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Khartoum</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Kigali</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Kinshasa</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Lagos</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Libreville</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Lome</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Luanda</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Lubumbashi</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Lusaka</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Malabo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Maputo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Maseru</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Mbabane</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Mogadishu</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Monrovia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Nairobi</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Ndjamena</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Niamey</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Nouakchott</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Ouagadougou</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Porto_Novo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Sao_Tome</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Tripoli</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Tunis</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Africa::Windhoek</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Adak</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Anchorage</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Anguilla</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Antigua</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Araguaina</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Buenos_Aires</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Catamarca</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Cordoba</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Jujuy</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::La_Rioja</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Mendoza</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Rio_Gallegos</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Salta</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::San_Juan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::San_Luis</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Tucuman</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Argentina::Ushuaia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Aruba</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Asuncion</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Atikokan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Bahia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Bahia_Banderas</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Barbados</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Belem</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Belize</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Blanc_Sablon</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Boa_Vista</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Bogota</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Boise</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Cambridge_Bay</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Campo_Grande</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Cancun</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Caracas</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Cayenne</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Cayman</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Chicago</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Chihuahua</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Costa_Rica</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Creston</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Cuiaba</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Curacao</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Danmarkshavn</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Dawson</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Dawson_Creek</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Denver</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Detroit</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Dominica</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Edmonton</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Eirunepe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::El_Salvador</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Fortaleza</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Glace_Bay</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Godthab</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Goose_Bay</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Grand_Turk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Grenada</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Guadeloupe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Guatemala</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Guayaquil</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Guyana</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Halifax</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Havana</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Hermosillo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Indianapolis</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Knox</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Marengo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Petersburg</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Tell_City</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Vevay</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Vincennes</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Indiana::Winamac</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Inuvik</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Iqaluit</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Jamaica</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Juneau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Kentucky::Louisville</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Kentucky::Monticello</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::La_Paz</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Lima</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Los_Angeles</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Maceio</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Managua</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Manaus</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Martinique</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Matamoros</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Mazatlan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Menominee</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Merida</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Metlakatla</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Mexico_City</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Miquelon</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Moncton</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Monterrey</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Montevideo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Montreal</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Montserrat</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Nassau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::New_York</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Nipigon</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Nome</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Noronha</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::North_Dakota::Beulah</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::North_Dakota::Center</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::North_Dakota::New_Salem</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Ojinaga</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Panama</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Pangnirtung</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Paramaribo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Phoenix</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Port_au_Prince</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Port_of_Spain</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Porto_Velho</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Puerto_Rico</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Rainy_River</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Rankin_Inlet</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Recife</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Regina</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Resolute</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Rio_Branco</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Santa_Isabel</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Santarem</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Santiago</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Santo_Domingo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Sao_Paulo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Scoresbysund</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Sitka</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::St_Johns</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::St_Kitts</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::St_Lucia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::St_Thomas</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::St_Vincent</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Swift_Current</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Tegucigalpa</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Thule</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Thunder_Bay</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Tijuana</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Toronto</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Tortola</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Vancouver</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Whitehorse</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Winnipeg</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Yakutat</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::America::Yellowknife</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Casey</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Davis</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::DumontDUrville</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Macquarie</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Mawson</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::McMurdo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Palmer</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Rothera</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Syowa</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Antarctica::Vostok</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Aden</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Almaty</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Amman</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Anadyr</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Aqtau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Aqtobe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Ashgabat</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Baghdad</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Bahrain</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Baku</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Bangkok</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Beirut</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Bishkek</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Brunei</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Choibalsan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Chongqing</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Colombo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Damascus</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Dhaka</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Dili</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Dubai</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Dushanbe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Gaza</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Harbin</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Hebron</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Ho_Chi_Minh</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Hong_Kong</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Hovd</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Irkutsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Jakarta</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Jayapura</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Jerusalem</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kabul</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kamchatka</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Karachi</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kashgar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kathmandu</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kolkata</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Krasnoyarsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kuala_Lumpur</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kuching</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Kuwait</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Macau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Magadan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Makassar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Manila</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Muscat</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Nicosia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Novokuznetsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Novosibirsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Omsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Oral</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Phnom_Penh</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Pontianak</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Pyongyang</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Qatar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Qyzylorda</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Rangoon</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Riyadh</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Sakhalin</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Samarkand</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Seoul</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Shanghai</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Singapore</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Taipei</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Tashkent</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Tbilisi</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Tehran</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Thimphu</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Tokyo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Ulaanbaatar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Urumqi</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Vientiane</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Vladivostok</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Yakutsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Yekaterinburg</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Asia::Yerevan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Azores</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Bermuda</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Canary</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Cape_Verde</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Faroe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Madeira</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Reykjavik</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::South_Georgia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::St_Helena</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Atlantic::Stanley</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Adelaide</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Brisbane</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Broken_Hill</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Currie</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Darwin</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Eucla</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Hobart</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Lindeman</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Lord_Howe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Melbourne</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Perth</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Australia::Sydney</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::CET</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::CST6CDT</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Catalog</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::EET</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::EST</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::EST5EDT</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Amsterdam</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Andorra</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Athens</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Belgrade</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Berlin</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Brussels</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Bucharest</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Budapest</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Chisinau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Copenhagen</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Dublin</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Gibraltar</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Helsinki</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Istanbul</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Kaliningrad</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Kiev</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Lisbon</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::London</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Luxembourg</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Madrid</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Malta</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Minsk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Monaco</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Moscow</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Oslo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Paris</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Prague</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Riga</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Rome</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Samara</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Simferopol</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Sofia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Stockholm</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Tallinn</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Tirane</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Uzhgorod</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Vaduz</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Vienna</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Vilnius</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Volgograd</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Warsaw</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Zaporozhye</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Europe::Zurich</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Floating</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::HST</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Antananarivo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Chagos</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Christmas</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Cocos</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Comoro</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Kerguelen</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Mahe</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Maldives</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Mauritius</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Mayotte</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Indian::Reunion</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Local</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Local::Unix</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Local::VMS</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Local::Win32</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::MET</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::MST</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::MST7MDT</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OffsetOnly</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OlsonDB</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OlsonDB::Change</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OlsonDB::Observance</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OlsonDB::Rule</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::OlsonDB::Zone</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::PST8PDT</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Apia</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Auckland</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Chatham</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Chuuk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Easter</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Efate</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Enderbury</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Fakaofo</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Fiji</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Funafuti</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Galapagos</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Gambier</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Guadalcanal</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Guam</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Honolulu</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Johnston</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Kiritimati</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Kosrae</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Kwajalein</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Majuro</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Marquesas</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Midway</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Nauru</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Niue</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Norfolk</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Noumea</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Pago_Pago</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Palau</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Pitcairn</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Pohnpei</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Port_Moresby</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Rarotonga</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Saipan</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Tahiti</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Tarawa</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Tongatapu</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Wake</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::Pacific::Wallis</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::UTC</remote-id>
+    <remote-id type="cpan-module">DateTime::TimeZone::WET</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTime/metadata.xml b/dev-perl/DateTime/metadata.xml
index 2a8ee14e6996..e0c32f6cf4d6 100644
--- a/dev-perl/DateTime/metadata.xml
+++ b/dev-perl/DateTime/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTime</remote-id>
+    <remote-id type="cpan-module">DateTime</remote-id>
+    <remote-id type="cpan-module">DateTime::Duration</remote-id>
+    <remote-id type="cpan-module">DateTime::Helpers</remote-id>
+    <remote-id type="cpan-module">DateTime::Infinite</remote-id>
+    <remote-id type="cpan-module">DateTime::Infinite::Future</remote-id>
+    <remote-id type="cpan-module">DateTime::Infinite::Past</remote-id>
+    <remote-id type="cpan-module">DateTime::LeapSecond</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DateTimeX-Easy/metadata.xml b/dev-perl/DateTimeX-Easy/metadata.xml
index 03260fd97674..8e164d0c90c1 100644
--- a/dev-perl/DateTimeX-Easy/metadata.xml
+++ b/dev-perl/DateTimeX-Easy/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DateTimeX-Easy</remote-id>
+    <remote-id type="cpan-module">DateTimeX::Easy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Debug-Client/metadata.xml b/dev-perl/Debug-Client/metadata.xml
index 951f57c2a24a..c4dacdc9063d 100644
--- a/dev-perl/Debug-Client/metadata.xml
+++ b/dev-perl/Debug-Client/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Debug-Client</remote-id>
+    <remote-id type="cpan-module">Debug::Client</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/DelimMatch/metadata.xml b/dev-perl/DelimMatch/metadata.xml
index 5f71c93593d6..7c457a0c1fa6 100644
--- a/dev-perl/DelimMatch/metadata.xml
+++ b/dev-perl/DelimMatch/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DelimMatch</remote-id>
+    <remote-id type="cpan-module">Text::DelimMatch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-ArgNames/metadata.xml b/dev-perl/Devel-ArgNames/metadata.xml
index 05db8f230fc5..a3606f4450f2 100644
--- a/dev-perl/Devel-ArgNames/metadata.xml
+++ b/dev-perl/Devel-ArgNames/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-ArgNames</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">Devel::ArgNames</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Caller/metadata.xml b/dev-perl/Devel-Caller/metadata.xml
index 2cb19471436c..39ddf048c906 100644
--- a/dev-perl/Devel-Caller/metadata.xml
+++ b/dev-perl/Devel-Caller/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Caller</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">Devel::Caller</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Cycle/metadata.xml b/dev-perl/Devel-Cycle/metadata.xml
index 2448e178b43f..5e35acf0fc73 100644
--- a/dev-perl/Devel-Cycle/metadata.xml
+++ b/dev-perl/Devel-Cycle/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Cycle</remote-id>
+    <remote-id type="cpan-module">Devel::Cycle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Declare/metadata.xml b/dev-perl/Devel-Declare/metadata.xml
index 47f7d9861c0a..b6bf5d44379f 100644
--- a/dev-perl/Devel-Declare/metadata.xml
+++ b/dev-perl/Devel-Declare/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-Declare</remote-id>
+    <remote-id type="cpan-module">Devel::Declare</remote-id>
+    <remote-id type="cpan-module">Devel::Declare::Context::Simple</remote-id>
+    <remote-id type="cpan-module">Devel::Declare::MethodInstaller::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Dumpvar/metadata.xml b/dev-perl/Devel-Dumpvar/metadata.xml
index 650cadc40f4c..324900d498ec 100644
--- a/dev-perl/Devel-Dumpvar/metadata.xml
+++ b/dev-perl/Devel-Dumpvar/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Dumpvar</remote-id>
+    <remote-id type="cpan-module">Devel::Dumpvar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-GlobalDestruction/metadata.xml b/dev-perl/Devel-GlobalDestruction/metadata.xml
index 2afce58f091d..baabe5d85d7a 100644
--- a/dev-perl/Devel-GlobalDestruction/metadata.xml
+++ b/dev-perl/Devel-GlobalDestruction/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-GlobalDestruction</remote-id>
+    <remote-id type="cpan-module">Devel::GlobalDestruction</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-LexAlias/metadata.xml b/dev-perl/Devel-LexAlias/metadata.xml
index 2dc27648e7a4..1a0902d689e3 100644
--- a/dev-perl/Devel-LexAlias/metadata.xml
+++ b/dev-perl/Devel-LexAlias/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-LexAlias</remote-id>
+    <remote-id type="cpan-module">Devel::LexAlias</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-NYTProf/metadata.xml b/dev-perl/Devel-NYTProf/metadata.xml
index cbdeed75a9c6..166ef9e713a2 100644
--- a/dev-perl/Devel-NYTProf/metadata.xml
+++ b/dev-perl/Devel-NYTProf/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-NYTProf</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Apache</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Constants</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Core</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Data</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::FileHandle</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::FileInfo</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::ReadStream</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Reader</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Run</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::SubInfo</remote-id>
+    <remote-id type="cpan-module">Devel::NYTProf::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Profiler/metadata.xml b/dev-perl/Devel-Profiler/metadata.xml
index 93a010a0e7a5..4e0786401726 100644
--- a/dev-perl/Devel-Profiler/metadata.xml
+++ b/dev-perl/Devel-Profiler/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Profiler</remote-id>
+    <remote-id type="cpan-module">Devel::Profiler</remote-id>
+    <remote-id type="cpan-module">Devel::Profiler::Apache</remote-id>
+    <remote-id type="cpan-module">Devel::Profiler::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-REPL/metadata.xml b/dev-perl/Devel-REPL/metadata.xml
index ddc6e2d28087..5d791834aecb 100644
--- a/dev-perl/Devel-REPL/metadata.xml
+++ b/dev-perl/Devel-REPL/metadata.xml
@@ -7,5 +7,43 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Devel-REPL</remote-id>
+    <remote-id type="cpan-module">Devel::REPL</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Error</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Meta::Plugin</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::B::Concise</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Colors</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Commands</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Completion</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::Globals</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::INC</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::Keywords</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::LexEnv</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::Methods</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::CompletionDriver::Turtles</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::DDS</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::DumpHistory</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::FancyPrompt</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::FindVariable</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::History</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Interrupt</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::LexEnv</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::MultiLine::PPI</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::NewlineHack</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Nopaste</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::OutputCache</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::PPI</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Packages</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Packages::DefaultScratchpad</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Peek</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::ReadLineHistory</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Refresh</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::ShowClass</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Timing</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Plugin::Turtles</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Profile</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Profile::Default</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Profile::Minimal</remote-id>
+    <remote-id type="cpan-module">Devel::REPL::Script</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Refactor/metadata.xml b/dev-perl/Devel-Refactor/metadata.xml
index e68f0160e1e2..a425903bafbc 100644
--- a/dev-perl/Devel-Refactor/metadata.xml
+++ b/dev-perl/Devel-Refactor/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Refactor</remote-id>
+    <remote-id type="cpan-module">Devel::Refactor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Size/metadata.xml b/dev-perl/Devel-Size/metadata.xml
index f7b0c060f78a..0ba76a8af4f3 100644
--- a/dev-perl/Devel-Size/metadata.xml
+++ b/dev-perl/Devel-Size/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Size</remote-id>
+    <remote-id type="cpan-module">Devel::Size</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-SmallProf/metadata.xml b/dev-perl/Devel-SmallProf/metadata.xml
index 599f33d3eb67..d1176b68065b 100644
--- a/dev-perl/Devel-SmallProf/metadata.xml
+++ b/dev-perl/Devel-SmallProf/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-SmallProf</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">Devel::SmallProf</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-StackTrace-AsHTML/metadata.xml b/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
index 4c0f689ca566..fb68e582d80c 100644
--- a/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
+++ b/dev-perl/Devel-StackTrace-AsHTML/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-StackTrace-AsHTML</remote-id>
+    <remote-id type="cpan-module">Devel::StackTrace::AsHTML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-StackTrace/metadata.xml b/dev-perl/Devel-StackTrace/metadata.xml
index 7faa0d557edd..be7d8a5f3bde 100644
--- a/dev-perl/Devel-StackTrace/metadata.xml
+++ b/dev-perl/Devel-StackTrace/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-StackTrace</remote-id>
+    <remote-id type="cpan-module">Devel::StackTrace</remote-id>
+    <remote-id type="cpan-module">Devel::StackTrace::Frame</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Devel-Symdump/metadata.xml b/dev-perl/Devel-Symdump/metadata.xml
index 70b1ed46189c..0aa457f8e143 100644
--- a/dev-perl/Devel-Symdump/metadata.xml
+++ b/dev-perl/Devel-Symdump/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Devel-Symdump</remote-id>
+    <remote-id type="cpan-module">Devel::Symdump</remote-id>
+    <remote-id type="cpan-module">Devel::Symdump::Export</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Device-SerialPort/metadata.xml b/dev-perl/Device-SerialPort/metadata.xml
index 9a3cb8bff526..f52f98cd9b53 100644
--- a/dev-perl/Device-SerialPort/metadata.xml
+++ b/dev-perl/Device-SerialPort/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Device-SerialPort</remote-id>
+    <remote-id type="cpan-module">Device::SerialPort</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-CRC/metadata.xml b/dev-perl/Digest-CRC/metadata.xml
index fc2dbe8b0658..91bf3307cb1f 100644
--- a/dev-perl/Digest-CRC/metadata.xml
+++ b/dev-perl/Digest-CRC/metadata.xml
@@ -10,7 +10,8 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-	<upstream>
-		<remote-id type="cpan">Digest-CRC</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type="cpan">Digest-CRC</remote-id>
+	<remote-id type="cpan-module">Digest::CRC</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-HMAC/metadata.xml b/dev-perl/Digest-HMAC/metadata.xml
index b998dc3e2bff..991f5da6de41 100644
--- a/dev-perl/Digest-HMAC/metadata.xml
+++ b/dev-perl/Digest-HMAC/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-HMAC</remote-id>
+    <remote-id type="cpan-module">Digest::HMAC</remote-id>
+    <remote-id type="cpan-module">Digest::HMAC_MD5</remote-id>
+    <remote-id type="cpan-module">Digest::HMAC_SHA1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-MD4/metadata.xml b/dev-perl/Digest-MD4/metadata.xml
index 40531d10cb5b..34b3fece7114 100644
--- a/dev-perl/Digest-MD4/metadata.xml
+++ b/dev-perl/Digest-MD4/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-MD4</remote-id>
+    <remote-id type="cpan-module">Digest::MD4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-MD5-File/metadata.xml b/dev-perl/Digest-MD5-File/metadata.xml
index 1120a6a96882..86766d6bd6de 100644
--- a/dev-perl/Digest-MD5-File/metadata.xml
+++ b/dev-perl/Digest-MD5-File/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-MD5-File</remote-id>
+    <remote-id type="cpan-module">Digest::MD5::File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-Nilsimsa/metadata.xml b/dev-perl/Digest-Nilsimsa/metadata.xml
index 726ac96be269..4e5d471fe61c 100644
--- a/dev-perl/Digest-Nilsimsa/metadata.xml
+++ b/dev-perl/Digest-Nilsimsa/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-Nilsimsa</remote-id>
+    <remote-id type="cpan-module">Digest::Nilsimsa</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-Perl-MD5/metadata.xml b/dev-perl/Digest-Perl-MD5/metadata.xml
index ebef5c5f47a5..babd1767f122 100644
--- a/dev-perl/Digest-Perl-MD5/metadata.xml
+++ b/dev-perl/Digest-Perl-MD5/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-Perl-MD5</remote-id>
+    <remote-id type="cpan-module">Digest::Perl::MD5</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Digest-SHA1/metadata.xml b/dev-perl/Digest-SHA1/metadata.xml
index 5b6407378bc0..8565ca2628ef 100644
--- a/dev-perl/Digest-SHA1/metadata.xml
+++ b/dev-perl/Digest-SHA1/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-SHA1</remote-id>
+    <remote-id type="cpan-module">Digest::SHA1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Dist-CheckConflicts/metadata.xml b/dev-perl/Dist-CheckConflicts/metadata.xml
index ff5d9a1e0b39..faa8be585bc9 100644
--- a/dev-perl/Dist-CheckConflicts/metadata.xml
+++ b/dev-perl/Dist-CheckConflicts/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Dist-CheckConflicts</remote-id>
+    <remote-id type="cpan-module">Dist::CheckConflicts</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/EV/metadata.xml b/dev-perl/EV/metadata.xml
index d37ab3e563ae..6b7dfb625e43 100644
--- a/dev-perl/EV/metadata.xml
+++ b/dev-perl/EV/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">EV</remote-id>
+    <remote-id type="cpan-module">EV</remote-id>
+    <remote-id type="cpan-module">EV::MakeMaker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Eidetic/metadata.xml b/dev-perl/Eidetic/metadata.xml
index 79427f0a4115..bc54aea99dcc 100644
--- a/dev-perl/Eidetic/metadata.xml
+++ b/dev-perl/Eidetic/metadata.xml
@@ -10,11 +10,7 @@
 		types of interfacing to be used. It is currently used by several
 		applications, including STP, docsys, and rackview.
 	</longdescription>
-  <use>
-    <flag name="auth">Enables <pkg>dev-perl/Apache-AuthTicket</pkg> based
+  <use><flag name="auth">Enables <pkg>dev-perl/Apache-AuthTicket</pkg> based
 			cookie authentication</flag>
   </use>
-  <upstream>
-    <remote-id type="cpan">Eidetic</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Emacs-PDE/metadata.xml b/dev-perl/Emacs-PDE/metadata.xml
index 855574e75740..447ce92afa8d 100644
--- a/dev-perl/Emacs-PDE/metadata.xml
+++ b/dev-perl/Emacs-PDE/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Emacs-PDE</remote-id>
+    <remote-id type="cpan-module">Emacs::PDE</remote-id>
+    <remote-id type="cpan-module">Emacs::PDE::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Abstract/metadata.xml b/dev-perl/Email-Abstract/metadata.xml
index 99888f9a43d3..a80f68c30350 100644
--- a/dev-perl/Email-Abstract/metadata.xml
+++ b/dev-perl/Email-Abstract/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Abstract</remote-id>
+    <remote-id type="cpan-module">Email::Abstract</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::EmailMIME</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::EmailSimple</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::MIMEEntity</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::MailInternet</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::MailMessage</remote-id>
+    <remote-id type="cpan-module">Email::Abstract::Plugin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Address/metadata.xml b/dev-perl/Email-Address/metadata.xml
index 426ffb2629b0..fcfdcad8ce46 100644
--- a/dev-perl/Email-Address/metadata.xml
+++ b/dev-perl/Email-Address/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Address</remote-id>
+    <remote-id type="cpan-module">Email::Address</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Date-Format/metadata.xml b/dev-perl/Email-Date-Format/metadata.xml
index 5f4a29760af7..42ba4e3ee6a1 100644
--- a/dev-perl/Email-Date-Format/metadata.xml
+++ b/dev-perl/Email-Date-Format/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Email-Date-Format</remote-id>
+		<remote-id type="cpan-module">Email::Date::Format</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Date/metadata.xml b/dev-perl/Email-Date/metadata.xml
index 98d9a1a4f404..7c4d3e13861d 100644
--- a/dev-perl/Email-Date/metadata.xml
+++ b/dev-perl/Email-Date/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Date</remote-id>
+    <remote-id type="cpan-module">Email::Date</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Filter/metadata.xml b/dev-perl/Email-Filter/metadata.xml
index 68126d5116be..82bcf4b2ded8 100644
--- a/dev-perl/Email-Filter/metadata.xml
+++ b/dev-perl/Email-Filter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Filter</remote-id>
+    <remote-id type="cpan-module">Email::Filter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Find/metadata.xml b/dev-perl/Email-Find/metadata.xml
index 9ae0c11deb5f..2fbaf6458cc9 100644
--- a/dev-perl/Email-Find/metadata.xml
+++ b/dev-perl/Email-Find/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Find</remote-id>
+    <remote-id type="cpan-module">Email::Find</remote-id>
+    <remote-id type="cpan-module">Email::Find::addrspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-FolderType/metadata.xml b/dev-perl/Email-FolderType/metadata.xml
index bdfe065ce635..ad04c5942c2a 100644
--- a/dev-perl/Email-FolderType/metadata.xml
+++ b/dev-perl/Email-FolderType/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-FolderType</remote-id>
+    <remote-id type="cpan-module">Email::FolderType</remote-id>
+    <remote-id type="cpan-module">Email::FolderType::Ezmlm</remote-id>
+    <remote-id type="cpan-module">Email::FolderType::MH</remote-id>
+    <remote-id type="cpan-module">Email::FolderType::Maildir</remote-id>
+    <remote-id type="cpan-module">Email::FolderType::Mbox</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-LocalDelivery/metadata.xml b/dev-perl/Email-LocalDelivery/metadata.xml
index 96f851f63cd0..c1f609ee2ac3 100644
--- a/dev-perl/Email-LocalDelivery/metadata.xml
+++ b/dev-perl/Email-LocalDelivery/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-LocalDelivery</remote-id>
+    <remote-id type="cpan-module">Email::LocalDelivery</remote-id>
+    <remote-id type="cpan-module">Email::LocalDelivery::Maildir</remote-id>
+    <remote-id type="cpan-module">Email::LocalDelivery::Mbox</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml b/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
index 95c75b16c730..cb0110962216 100644
--- a/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
+++ b/dev-perl/Email-MIME-Attachment-Stripper/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-MIME-Attachment-Stripper</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Attachment::Stripper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-MIME-ContentType/metadata.xml b/dev-perl/Email-MIME-ContentType/metadata.xml
index ae70d33f4058..7d722e49dd55 100644
--- a/dev-perl/Email-MIME-ContentType/metadata.xml
+++ b/dev-perl/Email-MIME-ContentType/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-MIME-ContentType</remote-id>
+    <remote-id type="cpan-module">Email::MIME::ContentType</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-MIME-Encodings/metadata.xml b/dev-perl/Email-MIME-Encodings/metadata.xml
index 1c02ecf80027..4bfcc8a74539 100644
--- a/dev-perl/Email-MIME-Encodings/metadata.xml
+++ b/dev-perl/Email-MIME-Encodings/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-MIME-Encodings</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Encodings</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-MIME/Email-MIME-1.910.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.910.0.ebuild
index 0042cc63e79f..2747289602c4 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.910.0.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.910.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/Email-MIME/Email-MIME-1.910.0.ebuild,v 1.7 2012/03/24 20:03:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME/Email-MIME-1.910.0.ebuild,v 1.8 2012/06/24 12:50:01 tove Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Easy MIME message parsing"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/Email-MessageID
diff --git a/dev-perl/Email-MIME/metadata.xml b/dev-perl/Email-MIME/metadata.xml
index a123b9092b51..b7fd347f2bd2 100644
--- a/dev-perl/Email-MIME/metadata.xml
+++ b/dev-perl/Email-MIME/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-MIME</remote-id>
+    <remote-id type="cpan-module">Email::MIME</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Creator</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Header</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Modifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-MessageID/metadata.xml b/dev-perl/Email-MessageID/metadata.xml
index 8cd416717809..7c5a619806cc 100644
--- a/dev-perl/Email-MessageID/metadata.xml
+++ b/dev-perl/Email-MessageID/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-MessageID</remote-id>
+    <remote-id type="cpan-module">Email::MessageID</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Reply/metadata.xml b/dev-perl/Email-Reply/metadata.xml
index 9970caaf4027..37b49067758a 100644
--- a/dev-perl/Email-Reply/metadata.xml
+++ b/dev-perl/Email-Reply/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Reply</remote-id>
+    <remote-id type="cpan-module">Email::Reply</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Send/metadata.xml b/dev-perl/Email-Send/metadata.xml
index 8c29f9de60ea..5af783341d9f 100644
--- a/dev-perl/Email-Send/metadata.xml
+++ b/dev-perl/Email-Send/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Send</remote-id>
+    <remote-id type="cpan-module">Email::Send</remote-id>
+    <remote-id type="cpan-module">Email::Send::NNTP</remote-id>
+    <remote-id type="cpan-module">Email::Send::Qmail</remote-id>
+    <remote-id type="cpan-module">Email::Send::SMTP</remote-id>
+    <remote-id type="cpan-module">Email::Send::Sendmail</remote-id>
+    <remote-id type="cpan-module">Email::Send::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Sender/metadata.xml b/dev-perl/Email-Sender/metadata.xml
index 8aac789e3ea5..1a0c11c67440 100644
--- a/dev-perl/Email-Sender/metadata.xml
+++ b/dev-perl/Email-Sender/metadata.xml
@@ -4,5 +4,29 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Sender</remote-id>
+    <remote-id type="cpan-module">Email::Sender</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Failure</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Failure::Multi</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Failure::Permanent</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Failure::Temporary</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Manual</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Manual::QuickStart</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Role::CommonSending</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Role::HasMessage</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Simple</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Success</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Success::Partial</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::DevNull</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Failable</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Maildir</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Mbox</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Print</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::SMTP</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::SMTP::Persistent</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Sendmail</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Test</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Transport::Wrapper</remote-id>
+    <remote-id type="cpan-module">Email::Sender::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Simple/metadata.xml b/dev-perl/Email-Simple/metadata.xml
index 3b4b668bf3f5..acc7ce20bb15 100644
--- a/dev-perl/Email-Simple/metadata.xml
+++ b/dev-perl/Email-Simple/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Simple</remote-id>
+    <remote-id type="cpan-module">Email::Simple</remote-id>
+    <remote-id type="cpan-module">Email::Simple::Creator</remote-id>
+    <remote-id type="cpan-module">Email::Simple::Header</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Email-Valid/metadata.xml b/dev-perl/Email-Valid/metadata.xml
index f672c57c77fe..2e08fc6fec6f 100644
--- a/dev-perl/Email-Valid/metadata.xml
+++ b/dev-perl/Email-Valid/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Email-Valid</remote-id>
+    <remote-id type="cpan-module">Email::Valid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-Detect/metadata.xml b/dev-perl/Encode-Detect/metadata.xml
index 5726b19485b4..0516670fe1e8 100644
--- a/dev-perl/Encode-Detect/metadata.xml
+++ b/dev-perl/Encode-Detect/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode-Detect</remote-id>
+    <remote-id type="cpan-module">Encode::Detect</remote-id>
+    <remote-id type="cpan-module">Encode::Detect::Detector</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-HanConvert/metadata.xml b/dev-perl/Encode-HanConvert/metadata.xml
index 350a9fa35009..08b3f67d35ce 100644
--- a/dev-perl/Encode-HanConvert/metadata.xml
+++ b/dev-perl/Encode-HanConvert/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode-HanConvert</remote-id>
+    <remote-id type="cpan-module">Encode::HanConvert</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-HanExtra/metadata.xml b/dev-perl/Encode-HanExtra/metadata.xml
index f5d88baa06c8..e404bff8ad8d 100644
--- a/dev-perl/Encode-HanExtra/metadata.xml
+++ b/dev-perl/Encode-HanExtra/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode-HanExtra</remote-id>
+    <remote-id type="cpan-module">Encode::HanExtra</remote-id>
+    <remote-id type="cpan-module">Encode::TW::Unisys::SOSI1</remote-id>
+    <remote-id type="cpan-module">Encode::TW::Unisys::SOSI2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-IMAPUTF7/metadata.xml b/dev-perl/Encode-IMAPUTF7/metadata.xml
index 5806e67c2653..86b174562511 100644
--- a/dev-perl/Encode-IMAPUTF7/metadata.xml
+++ b/dev-perl/Encode-IMAPUTF7/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode-IMAPUTF7</remote-id>
+    <remote-id type="cpan-module">Encode::IMAPUTF7</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-Locale/metadata.xml b/dev-perl/Encode-Locale/metadata.xml
index 27dea2fe7ccf..0b26b9e65d8f 100644
--- a/dev-perl/Encode-Locale/metadata.xml
+++ b/dev-perl/Encode-Locale/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Encode-Locale</remote-id>
+		<remote-id type="cpan-module">Encode::Locale</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Encode-compat/metadata.xml b/dev-perl/Encode-compat/metadata.xml
index d0ba036db06b..b1d1bb03e65a 100644
--- a/dev-perl/Encode-compat/metadata.xml
+++ b/dev-perl/Encode-compat/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode-compat</remote-id>
+    <remote-id type="cpan-module">Encode</remote-id>
+    <remote-id type="cpan-module">Encode::Alias</remote-id>
+    <remote-id type="cpan-module">Encode::compat</remote-id>
+    <remote-id type="cpan-module">Encode::compat::5006001</remote-id>
+    <remote-id type="cpan-module">Encode::compat::Alias</remote-id>
+    <remote-id type="cpan-module">Encode::compat::common</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Error/metadata.xml b/dev-perl/Error/metadata.xml
index 410ea4b8c781..a96e01256d1a 100644
--- a/dev-perl/Error/metadata.xml
+++ b/dev-perl/Error/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Error</remote-id>
+    <remote-id type="cpan-module">Error</remote-id>
+    <remote-id type="cpan-module">Error::Simple</remote-id>
+    <remote-id type="cpan-module">Error::WarnDie</remote-id>
+    <remote-id type="cpan-module">Error::subs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Eval-Closure/metadata.xml b/dev-perl/Eval-Closure/metadata.xml
index 7754eb1513fe..96ba05dc0098 100644
--- a/dev-perl/Eval-Closure/metadata.xml
+++ b/dev-perl/Eval-Closure/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
 	<remote-id type="cpan">Eval-Closure</remote-id>
+	<remote-id type="cpan-module">Eval::Closure</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Eval-LineNumbers/metadata.xml b/dev-perl/Eval-LineNumbers/metadata.xml
index 1a1b97954b8e..c9a04fda05f0 100644
--- a/dev-perl/Eval-LineNumbers/metadata.xml
+++ b/dev-perl/Eval-LineNumbers/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Eval-LineNumbers</remote-id>
+    <remote-id type="cpan-module">Eval::LineNumbers</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Event-ExecFlow/metadata.xml b/dev-perl/Event-ExecFlow/metadata.xml
index 05882b044256..84182f80b090 100644
--- a/dev-perl/Event-ExecFlow/metadata.xml
+++ b/dev-perl/Event-ExecFlow/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Event-ExecFlow</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Event::CondVar</remote-id>
+    <remote-id type="cpan-module">AnyEvent::Impl::Event::Glib</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Callbacks</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Frontend</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Frontend::Term</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Job</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Job::Code</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Job::Command</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Job::Group</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Scheduler</remote-id>
+    <remote-id type="cpan-module">Event::ExecFlow::Scheduler::SimpleMax</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Event-RPC/metadata.xml b/dev-perl/Event-RPC/metadata.xml
index d33cc55a33d5..8105f0a21118 100644
--- a/dev-perl/Event-RPC/metadata.xml
+++ b/dev-perl/Event-RPC/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Event-RPC</remote-id>
+    <remote-id type="cpan-module">Event::RPC</remote-id>
+    <remote-id type="cpan-module">Event::RPC::AuthPasswdHash</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Client</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Connection</remote-id>
+    <remote-id type="cpan-module">Event::RPC::LogConnection</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Logger</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Loop</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Loop::Event</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Loop::Glib</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Message</remote-id>
+    <remote-id type="cpan-module">Event::RPC::Server</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Event/metadata.xml b/dev-perl/Event/metadata.xml
index 4e2344b93819..a188696de99c 100644
--- a/dev-perl/Event/metadata.xml
+++ b/dev-perl/Event/metadata.xml
@@ -4,5 +4,23 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Event</remote-id>
+    <remote-id type="cpan-module">Event</remote-id>
+    <remote-id type="cpan-module">Event::Event::Dataful</remote-id>
+    <remote-id type="cpan-module">Event::Event::Io</remote-id>
+    <remote-id type="cpan-module">Event::MakeMaker</remote-id>
+    <remote-id type="cpan-module">Event::Watcher</remote-id>
+    <remote-id type="cpan-module">Event::Watcher::Tied</remote-id>
+    <remote-id type="cpan-module">Event::generic</remote-id>
+    <remote-id type="cpan-module">Event::generic::Source</remote-id>
+    <remote-id type="cpan-module">Event::group</remote-id>
+    <remote-id type="cpan-module">Event::idle</remote-id>
+    <remote-id type="cpan-module">Event::io</remote-id>
+    <remote-id type="cpan-module">Event::msg</remote-id>
+    <remote-id type="cpan-module">Event::process</remote-id>
+    <remote-id type="cpan-module">Event::semaphore</remote-id>
+    <remote-id type="cpan-module">Event::signal</remote-id>
+    <remote-id type="cpan-module">Event::timer</remote-id>
+    <remote-id type="cpan-module">Event::type</remote-id>
+    <remote-id type="cpan-module">Event::var</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exception-Base/metadata.xml b/dev-perl/Exception-Base/metadata.xml
index a9ff7ddeea7c..ed7bdc49d9fd 100644
--- a/dev-perl/Exception-Base/metadata.xml
+++ b/dev-perl/Exception-Base/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Base</remote-id>
+    <remote-id type="cpan-module">Exception::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exception-Class/metadata.xml b/dev-perl/Exception-Class/metadata.xml
index 3eaf5e6b0fe6..654c23483a25 100644
--- a/dev-perl/Exception-Class/metadata.xml
+++ b/dev-perl/Exception-Class/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Exception-Class</remote-id>
+    <remote-id type="cpan-module">Exception::Class</remote-id>
+    <remote-id type="cpan-module">Exception::Class::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exception-Died/metadata.xml b/dev-perl/Exception-Died/metadata.xml
index a59ad49eee4b..e762c2ba649b 100644
--- a/dev-perl/Exception-Died/metadata.xml
+++ b/dev-perl/Exception-Died/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Died</remote-id>
+    <remote-id type="cpan-module">Exception::Died</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exception-System/metadata.xml b/dev-perl/Exception-System/metadata.xml
index 33f00c3c07be..4d8fd467cb99 100644
--- a/dev-perl/Exception-System/metadata.xml
+++ b/dev-perl/Exception-System/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-System</remote-id>
+    <remote-id type="cpan-module">Exception::System</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exception-Warning/metadata.xml b/dev-perl/Exception-Warning/metadata.xml
index 4a644e42094a..63635304ff35 100644
--- a/dev-perl/Exception-Warning/metadata.xml
+++ b/dev-perl/Exception-Warning/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Exception-Warning</remote-id>
+    <remote-id type="cpan-module">Exception::Warning</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Expect/metadata.xml b/dev-perl/Expect/metadata.xml
index ca9cd115001f..208e37f1672b 100644
--- a/dev-perl/Expect/metadata.xml
+++ b/dev-perl/Expect/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Expect</remote-id>
+    <remote-id type="cpan-module">Expect</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exporter-Cluster/metadata.xml b/dev-perl/Exporter-Cluster/metadata.xml
index 345e74cb270b..978c67c42ed8 100644
--- a/dev-perl/Exporter-Cluster/metadata.xml
+++ b/dev-perl/Exporter-Cluster/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Exporter-Cluster</remote-id>
+    <remote-id type="cpan-module">Exporter::Cluster</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Exporter-Lite/metadata.xml b/dev-perl/Exporter-Lite/metadata.xml
index ceaea77407af..667a0ba37ae1 100644
--- a/dev-perl/Exporter-Lite/metadata.xml
+++ b/dev-perl/Exporter-Lite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Exporter-Lite</remote-id>
+    <remote-id type="cpan-module">Exporter::Lite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-AutoInstall/metadata.xml b/dev-perl/ExtUtils-AutoInstall/metadata.xml
index fb6e96569da5..fdbe9a1ef066 100644
--- a/dev-perl/ExtUtils-AutoInstall/metadata.xml
+++ b/dev-perl/ExtUtils-AutoInstall/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-AutoInstall</remote-id>
+    <remote-id type="cpan-module">ExtUtils::AutoInstall</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-F77/metadata.xml b/dev-perl/ExtUtils-F77/metadata.xml
index 9a7672af4580..e715bbe1c8fa 100644
--- a/dev-perl/ExtUtils-F77/metadata.xml
+++ b/dev-perl/ExtUtils-F77/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-F77</remote-id>
+    <remote-id type="cpan-module">ExtUtils::F77</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-XSBuilder/metadata.xml b/dev-perl/ExtUtils-XSBuilder/metadata.xml
index fb7c39d2299e..d1f142c8fbff 100644
--- a/dev-perl/ExtUtils-XSBuilder/metadata.xml
+++ b/dev-perl/ExtUtils-XSBuilder/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-XSBuilder</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::C::grammar</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::CallbackMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::FunctionMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::MapBase</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::MapUtil</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::PODTemplate</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::ParseSource</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::StructureMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::TypeMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSBuilder::WrapXS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ExtUtils-XSpp/metadata.xml b/dev-perl/ExtUtils-XSpp/metadata.xml
index 0d420bce334f..f47248d8c444 100644
--- a/dev-perl/ExtUtils-XSpp/metadata.xml
+++ b/dev-perl/ExtUtils-XSpp/metadata.xml
@@ -4,5 +4,41 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-XSpp</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Cmd</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Driver</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::code</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::object</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::perlcode</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::simple</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::stdmessage</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Exception::unknown</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Grammar</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Grammar::YappDriver</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Lexer</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Access</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Argument</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Class</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Comment</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Constructor</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Destructor</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Enum</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::EnumValue</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::File</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Function</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Method</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Module</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Package</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::PercAny</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Preprocessor</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Raw</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Node::Type</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Parser</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Typemap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Typemap::parsed</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Typemap::reference</remote-id>
+    <remote-id type="cpan-module">ExtUtils::XSpp::Typemap::simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/FCGI-ProcManager/metadata.xml b/dev-perl/FCGI-ProcManager/metadata.xml
index 37aa1ca2dcb9..1c0cd43f5880 100644
--- a/dev-perl/FCGI-ProcManager/metadata.xml
+++ b/dev-perl/FCGI-ProcManager/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">FCGI-ProcManager</remote-id>
+    <remote-id type="cpan-module">FCGI::ProcManager</remote-id>
+    <remote-id type="cpan-module">FCGI::ProcManager::Constrained</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/FCGI/metadata.xml b/dev-perl/FCGI/metadata.xml
index e171b470d055..dada22096b1a 100644
--- a/dev-perl/FCGI/metadata.xml
+++ b/dev-perl/FCGI/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">FCGI</remote-id>
+    <remote-id type="cpan-module">FCGI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Fatal-Exception/metadata.xml b/dev-perl/Fatal-Exception/metadata.xml
index 118440559128..94b089a5f2cb 100644
--- a/dev-perl/Fatal-Exception/metadata.xml
+++ b/dev-perl/Fatal-Exception/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Fatal-Exception</remote-id>
+    <remote-id type="cpan-module">Exception::Argument</remote-id>
+    <remote-id type="cpan-module">Exception::Fatal</remote-id>
+    <remote-id type="cpan-module">Fatal::Exception</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Feed-Find/metadata.xml b/dev-perl/Feed-Find/metadata.xml
index 46895c8f5dba..b0c66db5091b 100644
--- a/dev-perl/Feed-Find/metadata.xml
+++ b/dev-perl/Feed-Find/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Feed-Find</remote-id>
+    <remote-id type="cpan-module">Feed::Find</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Festival-Client-Async/metadata.xml b/dev-perl/Festival-Client-Async/metadata.xml
index 70abac57358b..f6aef09bf638 100644
--- a/dev-perl/Festival-Client-Async/metadata.xml
+++ b/dev-perl/Festival-Client-Async/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Festival-Client-Async</remote-id>
+    <remote-id type="cpan-module">Festival::Client::Async</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-BOM/metadata.xml b/dev-perl/File-BOM/metadata.xml
index feb7e458d127..46b549d08d79 100644
--- a/dev-perl/File-BOM/metadata.xml
+++ b/dev-perl/File-BOM/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-BOM</remote-id>
+    <remote-id type="cpan-module">File::BOM</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-BaseDir/metadata.xml b/dev-perl/File-BaseDir/metadata.xml
index 95c211653519..85bd0e215caa 100644
--- a/dev-perl/File-BaseDir/metadata.xml
+++ b/dev-perl/File-BaseDir/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-BaseDir</remote-id>
+    <remote-id type="cpan-module">File::BaseDir</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Copy-Recursive/metadata.xml b/dev-perl/File-Copy-Recursive/metadata.xml
index 7bdf55dcfca9..00e82041c0b8 100644
--- a/dev-perl/File-Copy-Recursive/metadata.xml
+++ b/dev-perl/File-Copy-Recursive/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Copy-Recursive</remote-id>
+    <remote-id type="cpan-module">File::Copy::Recursive</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-DesktopEntry/metadata.xml b/dev-perl/File-DesktopEntry/metadata.xml
index 84860f5237ac..a8efbbde2006 100644
--- a/dev-perl/File-DesktopEntry/metadata.xml
+++ b/dev-perl/File-DesktopEntry/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-DesktopEntry</remote-id>
+    <remote-id type="cpan-module">File::DesktopEntry</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-DirWalk/metadata.xml b/dev-perl/File-DirWalk/metadata.xml
index 1e7098885db3..a306bb979f99 100644
--- a/dev-perl/File-DirWalk/metadata.xml
+++ b/dev-perl/File-DirWalk/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-DirWalk</remote-id>
+    <remote-id type="cpan-module">File::DirWalk</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Find-Rule/metadata.xml b/dev-perl/File-Find-Rule/metadata.xml
index 042d5866df6a..a591bf460384 100644
--- a/dev-perl/File-Find-Rule/metadata.xml
+++ b/dev-perl/File-Find-Rule/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Find-Rule</remote-id>
+    <remote-id type="cpan-module">File::Find::Rule</remote-id>
+    <remote-id type="cpan-module">File::Find::Rule::Test::ATeam</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Flat/metadata.xml b/dev-perl/File-Flat/metadata.xml
index 0f75c60ed069..c539fad499f2 100644
--- a/dev-perl/File-Flat/metadata.xml
+++ b/dev-perl/File-Flat/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Flat</remote-id>
+    <remote-id type="cpan-module">File::Flat</remote-id>
+    <remote-id type="cpan-module">File::Flat::Object</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Flock/metadata.xml b/dev-perl/File-Flock/metadata.xml
index c0153f8a6b26..a3233b30b7a0 100644
--- a/dev-perl/File-Flock/metadata.xml
+++ b/dev-perl/File-Flock/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Flock</remote-id>
+    <remote-id type="cpan-module">File::Flock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Grep/metadata.xml b/dev-perl/File-Grep/metadata.xml
index aa6b3a900401..8568c945035f 100644
--- a/dev-perl/File-Grep/metadata.xml
+++ b/dev-perl/File-Grep/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">File-Grep</remote-id>
+    <remote-id type="cpan-module">File::Grep</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-HomeDir/metadata.xml b/dev-perl/File-HomeDir/metadata.xml
index cad4a483c2f8..d18eb3f766b6 100644
--- a/dev-perl/File-HomeDir/metadata.xml
+++ b/dev-perl/File-HomeDir/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-HomeDir</remote-id>
+    <remote-id type="cpan-module">File::HomeDir</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Darwin</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Darwin::Carbon</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Darwin::Cocoa</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Driver</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::FreeDesktop</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::MacOS9</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::TIE</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Test</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Unix</remote-id>
+    <remote-id type="cpan-module">File::HomeDir::Windows</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Listing/metadata.xml b/dev-perl/File-Listing/metadata.xml
index 7e797016357e..de2c36a27f81 100644
--- a/dev-perl/File-Listing/metadata.xml
+++ b/dev-perl/File-Listing/metadata.xml
@@ -4,5 +4,11 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">File-Listing</remote-id>
+		<remote-id type="cpan-module">File::Listing</remote-id>
+		<remote-id type="cpan-module">File::Listing::apache</remote-id>
+		<remote-id type="cpan-module">File::Listing::dosftp</remote-id>
+		<remote-id type="cpan-module">File::Listing::netware</remote-id>
+		<remote-id type="cpan-module">File::Listing::unix</remote-id>
+		<remote-id type="cpan-module">File::Listing::vms</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-MMagic/metadata.xml b/dev-perl/File-MMagic/metadata.xml
index 77c846c94268..b8c57e2219a3 100644
--- a/dev-perl/File-MMagic/metadata.xml
+++ b/dev-perl/File-MMagic/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-MMagic</remote-id>
+    <remote-id type="cpan-module">File::MMagic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Map/metadata.xml b/dev-perl/File-Map/metadata.xml
index a6e723d1768d..eb9dc383bb65 100644
--- a/dev-perl/File-Map/metadata.xml
+++ b/dev-perl/File-Map/metadata.xml
@@ -8,5 +8,6 @@
 </longdescription>
 <upstream>
   <remote-id type="cpan">File-Map</remote-id>
+  <remote-id type="cpan-module">File::Map</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-MimeInfo/metadata.xml b/dev-perl/File-MimeInfo/metadata.xml
index ad62132ba823..51356485ffef 100644
--- a/dev-perl/File-MimeInfo/metadata.xml
+++ b/dev-perl/File-MimeInfo/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-MimeInfo</remote-id>
+    <remote-id type="cpan-module">File::MimeInfo</remote-id>
+    <remote-id type="cpan-module">File::MimeInfo::Applications</remote-id>
+    <remote-id type="cpan-module">File::MimeInfo::Magic</remote-id>
+    <remote-id type="cpan-module">File::MimeInfo::Rox</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-NCopy/metadata.xml b/dev-perl/File-NCopy/metadata.xml
index 9a98ff521d4f..9f41b1eaee2f 100644
--- a/dev-perl/File-NCopy/metadata.xml
+++ b/dev-perl/File-NCopy/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-NCopy</remote-id>
+    <remote-id type="cpan-module">File::NCopy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-NFSLock/metadata.xml b/dev-perl/File-NFSLock/metadata.xml
index 001f8d469e8e..bf3edce1141e 100644
--- a/dev-perl/File-NFSLock/metadata.xml
+++ b/dev-perl/File-NFSLock/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-NFSLock</remote-id>
+    <remote-id type="cpan-module">File::NFSLock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Next/metadata.xml b/dev-perl/File-Next/metadata.xml
index 28b1d840f7ed..574da2f7a34f 100644
--- a/dev-perl/File-Next/metadata.xml
+++ b/dev-perl/File-Next/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Next</remote-id>
+    <remote-id type="cpan-module">File::Next</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Path-Expand/metadata.xml b/dev-perl/File-Path-Expand/metadata.xml
index bb09d35b9811..d0eabc4fd077 100644
--- a/dev-perl/File-Path-Expand/metadata.xml
+++ b/dev-perl/File-Path-Expand/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Path-Expand</remote-id>
+    <remote-id type="cpan-module">File::Path::Expand</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-ReadBackwards/metadata.xml b/dev-perl/File-ReadBackwards/metadata.xml
index 817739574009..672a308a6b23 100644
--- a/dev-perl/File-ReadBackwards/metadata.xml
+++ b/dev-perl/File-ReadBackwards/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-ReadBackwards</remote-id>
+    <remote-id type="cpan-module">File::ReadBackwards</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Remove/metadata.xml b/dev-perl/File-Remove/metadata.xml
index 2994e6e2b657..6f4c4e9dea99 100644
--- a/dev-perl/File-Remove/metadata.xml
+++ b/dev-perl/File-Remove/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Remove</remote-id>
+    <remote-id type="cpan-module">File::Remove</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-RsyncP/metadata.xml b/dev-perl/File-RsyncP/metadata.xml
index 20fd1ecf468f..2faa30571984 100644
--- a/dev-perl/File-RsyncP/metadata.xml
+++ b/dev-perl/File-RsyncP/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-RsyncP</remote-id>
+    <remote-id type="cpan-module">File::RsyncP</remote-id>
+    <remote-id type="cpan-module">File::RsyncP::Digest</remote-id>
+    <remote-id type="cpan-module">File::RsyncP::FileIO</remote-id>
+    <remote-id type="cpan-module">File::RsyncP::FileList</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Scan-ClamAV/metadata.xml b/dev-perl/File-Scan-ClamAV/metadata.xml
index a0075b7a61a0..9f1048850627 100644
--- a/dev-perl/File-Scan-ClamAV/metadata.xml
+++ b/dev-perl/File-Scan-ClamAV/metadata.xml
@@ -4,5 +4,6 @@
   <herd>net-mail</herd>
   <upstream>
     <remote-id type="cpan">File-Scan-ClamAV</remote-id>
+    <remote-id type="cpan-module">File::Scan::ClamAV</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-SearchPath/metadata.xml b/dev-perl/File-SearchPath/metadata.xml
index 033b642d2114..8f0be417b240 100644
--- a/dev-perl/File-SearchPath/metadata.xml
+++ b/dev-perl/File-SearchPath/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">File-SearchPath</remote-id>
+    <remote-id type="cpan-module">File::SearchPath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-ShareDir/metadata.xml b/dev-perl/File-ShareDir/metadata.xml
index b57c8832c6b9..499001211c68 100644
--- a/dev-perl/File-ShareDir/metadata.xml
+++ b/dev-perl/File-ShareDir/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-ShareDir</remote-id>
+    <remote-id type="cpan-module">File::ShareDir</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Slurp-Unicode/metadata.xml b/dev-perl/File-Slurp-Unicode/metadata.xml
index ee72fb07ae43..27bb95518e07 100644
--- a/dev-perl/File-Slurp-Unicode/metadata.xml
+++ b/dev-perl/File-Slurp-Unicode/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Slurp-Unicode</remote-id>
+    <remote-id type="cpan-module">File::Slurp::Unicode</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Slurp/metadata.xml b/dev-perl/File-Slurp/metadata.xml
index 55678f9a8f1a..a79093adafdd 100644
--- a/dev-perl/File-Slurp/metadata.xml
+++ b/dev-perl/File-Slurp/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Slurp</remote-id>
+    <remote-id type="cpan-module">File::Slurp</remote-id>
+    <remote-id type="cpan-module">FileSlurp_12</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Sort/metadata.xml b/dev-perl/File-Sort/metadata.xml
index 8fb160d05d38..7d45fbf7af76 100644
--- a/dev-perl/File-Sort/metadata.xml
+++ b/dev-perl/File-Sort/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">File-Sort</remote-id>
+    <remote-id type="cpan-module">File::Sort</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Stat-Bits/metadata.xml b/dev-perl/File-Stat-Bits/metadata.xml
index 7207efaa6a38..798fe0c50e3f 100644
--- a/dev-perl/File-Stat-Bits/metadata.xml
+++ b/dev-perl/File-Stat-Bits/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Stat-Bits</remote-id>
+    <remote-id type="cpan-module">File::Stat::Bits</remote-id>
+    <remote-id type="cpan-module">File::Stat::Bits::dirty</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Stat-Moose/metadata.xml b/dev-perl/File-Stat-Moose/metadata.xml
index 70d4b919caff..b7002ee862c5 100644
--- a/dev-perl/File-Stat-Moose/metadata.xml
+++ b/dev-perl/File-Stat-Moose/metadata.xml
@@ -7,5 +7,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">File-Stat-Moose</remote-id>
+    <remote-id type="cpan-module">Exception::IO</remote-id>
+    <remote-id type="cpan-module">File::Stat::Moose</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::CacheFileHandle</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::OpenHandle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Sync/metadata.xml b/dev-perl/File-Sync/metadata.xml
index 3297254be48c..d5f59ff3dcae 100644
--- a/dev-perl/File-Sync/metadata.xml
+++ b/dev-perl/File-Sync/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Sync</remote-id>
+    <remote-id type="cpan-module">File::Sync</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Tail/metadata.xml b/dev-perl/File-Tail/metadata.xml
index 45dd649341dc..fda7212d4967 100644
--- a/dev-perl/File-Tail/metadata.xml
+++ b/dev-perl/File-Tail/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Tail</remote-id>
+    <remote-id type="cpan-module">File::Tail</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Tempdir/metadata.xml b/dev-perl/File-Tempdir/metadata.xml
index 9cb75bdbf96d..d7be16a1dfba 100644
--- a/dev-perl/File-Tempdir/metadata.xml
+++ b/dev-perl/File-Tempdir/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Tempdir</remote-id>
+    <remote-id type="cpan-module">File::Tempdir</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Type/metadata.xml b/dev-perl/File-Type/metadata.xml
index c4f5d0eaf062..cb581a897c2d 100644
--- a/dev-perl/File-Type/metadata.xml
+++ b/dev-perl/File-Type/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Type</remote-id>
+    <remote-id type="cpan-module">File::Type</remote-id>
+    <remote-id type="cpan-module">File::Type::Builder</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-Which/metadata.xml b/dev-perl/File-Which/metadata.xml
index d1026829d098..98674b01a174 100644
--- a/dev-perl/File-Which/metadata.xml
+++ b/dev-perl/File-Which/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Which</remote-id>
+    <remote-id type="cpan-module">File::Which</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-chdir/metadata.xml b/dev-perl/File-chdir/metadata.xml
index 30682fd8209d..7ba1b7eca646 100644
--- a/dev-perl/File-chdir/metadata.xml
+++ b/dev-perl/File-chdir/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-chdir</remote-id>
+    <remote-id type="cpan-module">File::chdir</remote-id>
+    <remote-id type="cpan-module">File::chdir::ARRAY</remote-id>
+    <remote-id type="cpan-module">File::chdir::SCALAR</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-chmod/metadata.xml b/dev-perl/File-chmod/metadata.xml
index dc9849fe4a62..46001de9ec64 100644
--- a/dev-perl/File-chmod/metadata.xml
+++ b/dev-perl/File-chmod/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-chmod</remote-id>
+    <remote-id type="cpan-module">File::chmod</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/File-pushd/metadata.xml b/dev-perl/File-pushd/metadata.xml
index 3865cb0e2bd1..845518865ded 100644
--- a/dev-perl/File-pushd/metadata.xml
+++ b/dev-perl/File-pushd/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-pushd</remote-id>
+    <remote-id type="cpan-module">File::pushd</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/FileHandle-Unget/metadata.xml b/dev-perl/FileHandle-Unget/metadata.xml
index 0189367636f4..ba47adc9c959 100644
--- a/dev-perl/FileHandle-Unget/metadata.xml
+++ b/dev-perl/FileHandle-Unget/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">FileHandle-Unget</remote-id>
+    <remote-id type="cpan-module">FileHandle::Unget</remote-id>
+    <remote-id type="cpan-module">FileHandle::Unget::Tie</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Filesys-Df/metadata.xml b/dev-perl/Filesys-Df/metadata.xml
index 0862f6f992fd..cf4a3b469190 100644
--- a/dev-perl/Filesys-Df/metadata.xml
+++ b/dev-perl/Filesys-Df/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Filesys-Df</remote-id>
+    <remote-id type="cpan-module">Filesys::Df</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Filesys-DiskSpace/metadata.xml b/dev-perl/Filesys-DiskSpace/metadata.xml
index 6488906042d6..dc9cd8494b83 100644
--- a/dev-perl/Filesys-DiskSpace/metadata.xml
+++ b/dev-perl/Filesys-DiskSpace/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Filesys-DiskSpace</remote-id>
+    <remote-id type="cpan-module">Filesys::DiskSpace</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Filesys-Notify-Simple/metadata.xml b/dev-perl/Filesys-Notify-Simple/metadata.xml
index ef1accdf1ac2..1e606e070876 100644
--- a/dev-perl/Filesys-Notify-Simple/metadata.xml
+++ b/dev-perl/Filesys-Notify-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Filesys-Notify-Simple</remote-id>
+    <remote-id type="cpan-module">Filesys::Notify::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Finance-Quote/metadata.xml b/dev-perl/Finance-Quote/metadata.xml
index d0e10dab5298..8fb0295902cf 100644
--- a/dev-perl/Finance-Quote/metadata.xml
+++ b/dev-perl/Finance-Quote/metadata.xml
@@ -4,5 +4,52 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Finance-Quote</remote-id>
+    <remote-id type="cpan-module">Finance::Quote</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::AEX</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::AIAHK</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::ASEGR</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::ASX</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::BMONesbittBurns</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Bourso</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Cdnfundlibrary</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Cominvest</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Currencies</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::DWS</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Deka</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::FTPortfolios</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Fidelity</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::FinanceCanada</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Finanzpartner</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Fool</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::GoldMoney</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::HEX</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::HU</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::IndiaMutual</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::LeRevenu</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::ManInvestments</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Morningstar</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::NZX</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Platinum</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::SEB</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::StockHouseCanada</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::TSP</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::TSX</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Tdefunds</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Tdwaterhouse</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Tiaacref</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Troweprice</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Trustnet</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::USFedBonds</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Union</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::UserAgent</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::VWD</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::Asia</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::Australia</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::Base</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::Brasil</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::Europe</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::NZ</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::Yahoo::USA</remote-id>
+    <remote-id type="cpan-module">Finance::Quote::ZA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Finance-YahooQuote/metadata.xml b/dev-perl/Finance-YahooQuote/metadata.xml
index 242e3b5f6b92..b9af8b3015a3 100644
--- a/dev-perl/Finance-YahooQuote/metadata.xml
+++ b/dev-perl/Finance-YahooQuote/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Finance-YahooQuote</remote-id>
+    <remote-id type="cpan-module">Finance::YahooQuote</remote-id>
+    <remote-id type="cpan-module">RequestAgent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Font-AFM/metadata.xml b/dev-perl/Font-AFM/metadata.xml
index 7b62992c3991..e95542d740dd 100644
--- a/dev-perl/Font-AFM/metadata.xml
+++ b/dev-perl/Font-AFM/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Font-AFM</remote-id>
+    <remote-id type="cpan-module">Font::AFM</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::Courier</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::CourierBold</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::CourierBoldOblique</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::CourierOblique</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::Helvetica</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::HelveticaBold</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::HelveticaBoldOblique</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::HelveticaOblique</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::TimesBold</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::TimesBoldItalic</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::TimesItalic</remote-id>
+    <remote-id type="cpan-module">Font::Metrics::TimesRoman</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Font-TTF/metadata.xml b/dev-perl/Font-TTF/metadata.xml
index edec7606455f..1b44430c1c62 100644
--- a/dev-perl/Font-TTF/metadata.xml
+++ b/dev-perl/Font-TTF/metadata.xml
@@ -5,5 +5,70 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Font-TTF</remote-id>
+    <remote-id type="cpan-module">Font::TTF</remote-id>
+    <remote-id type="cpan-module">Font::TTF::AATKern</remote-id>
+    <remote-id type="cpan-module">Font::TTF::AATutils</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Anchor</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Bsln</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Cmap</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Coverage</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Cvt_</remote-id>
+    <remote-id type="cpan-module">Font::TTF::DSIG</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Delta</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Dumper</remote-id>
+    <remote-id type="cpan-module">Font::TTF::EBDT</remote-id>
+    <remote-id type="cpan-module">Font::TTF::EBLC</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Fdsc</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Feat</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Fmtx</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Font</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Fpgm</remote-id>
+    <remote-id type="cpan-module">Font::TTF::GDEF</remote-id>
+    <remote-id type="cpan-module">Font::TTF::GPOS</remote-id>
+    <remote-id type="cpan-module">Font::TTF::GSUB</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Glyf</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Glyph</remote-id>
+    <remote-id type="cpan-module">Font::TTF::GrFeat</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Hdmx</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Head</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Hhea</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Hmtx</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern::ClassArray</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern::CompactClassArray</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern::OrderedList</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern::StateTable</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Kern::Subtable</remote-id>
+    <remote-id type="cpan-module">Font::TTF::LTSH</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Loca</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Maxp</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Chain</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Contextual</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Insertion</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Ligature</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Noncontextual</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Rearrangement</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Mort::Subtable</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Name</remote-id>
+    <remote-id type="cpan-module">Font::TTF::OS_2</remote-id>
+    <remote-id type="cpan-module">Font::TTF::OTTags</remote-id>
+    <remote-id type="cpan-module">Font::TTF::OldCmap</remote-id>
+    <remote-id type="cpan-module">Font::TTF::OldMort</remote-id>
+    <remote-id type="cpan-module">Font::TTF::PCLT</remote-id>
+    <remote-id type="cpan-module">Font::TTF::PSNames</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Post</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Prep</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Prop</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Segarr</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Sill</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Table</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Ttc</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Ttopen</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Utils</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Vhea</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Vmtx</remote-id>
+    <remote-id type="cpan-module">Font::TTF::Win32</remote-id>
+    <remote-id type="cpan-module">Font::TTF::XMLparse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Format-Human-Bytes/metadata.xml b/dev-perl/Format-Human-Bytes/metadata.xml
index 2f0be97dd797..3a2aa9890d1c 100644
--- a/dev-perl/Format-Human-Bytes/metadata.xml
+++ b/dev-perl/Format-Human-Bytes/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Format-Human-Bytes</remote-id>
+    <remote-id type="cpan-module">Format::Human::Bytes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/FreezeThaw/metadata.xml b/dev-perl/FreezeThaw/metadata.xml
index fd3771dbf5b5..b1fed1984bdd 100644
--- a/dev-perl/FreezeThaw/metadata.xml
+++ b/dev-perl/FreezeThaw/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">FreezeThaw</remote-id>
+    <remote-id type="cpan-module">FreezeThaw</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Fuse/metadata.xml b/dev-perl/Fuse/metadata.xml
index 0b2e227ff2a0..9acc7ad5980a 100644
--- a/dev-perl/Fuse/metadata.xml
+++ b/dev-perl/Fuse/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
-  <longdescription lang="en">
-	</longdescription>
   <upstream>
     <remote-id type="cpan">Fuse</remote-id>
+    <remote-id type="cpan-module">Fuse</remote-id>
+    <remote-id type="cpan-module">test::helper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GD-Barcode/metadata.xml b/dev-perl/GD-Barcode/metadata.xml
index 4ea5ccad29c9..4fc479143ac5 100644
--- a/dev-perl/GD-Barcode/metadata.xml
+++ b/dev-perl/GD-Barcode/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GD-Barcode</remote-id>
+    <remote-id type="cpan-module">GD::Barcode</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::COOP2of5</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::Code39</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::EAN13</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::EAN8</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::IATA2of5</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::ITF</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::Industrial2of5</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::Matrix2of5</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::NW7</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::QRcode</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::UPCA</remote-id>
+    <remote-id type="cpan-module">GD::Barcode::UPCE</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GD-Graph3d/metadata.xml b/dev-perl/GD-Graph3d/metadata.xml
index cfdbb20b9591..e84b54edc29f 100644
--- a/dev-perl/GD-Graph3d/metadata.xml
+++ b/dev-perl/GD-Graph3d/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GD-Graph3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph::axestype3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph::bars3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph::cylinder</remote-id>
+    <remote-id type="cpan-module">GD::Graph::cylinder3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph::lines3d</remote-id>
+    <remote-id type="cpan-module">GD::Graph::pie3d</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GD-SVG/metadata.xml b/dev-perl/GD-SVG/metadata.xml
index d7853b971fb8..eebad95d062f 100644
--- a/dev-perl/GD-SVG/metadata.xml
+++ b/dev-perl/GD-SVG/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GD-SVG</remote-id>
+    <remote-id type="cpan-module">GD::SVG</remote-id>
+    <remote-id type="cpan-module">GD::SVG::Font</remote-id>
+    <remote-id type="cpan-module">GD::SVG::Image</remote-id>
+    <remote-id type="cpan-module">GD::SVG::Polygon</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GD/metadata.xml b/dev-perl/GD/metadata.xml
index 07173e440902..ee4d2129fc42 100644
--- a/dev-perl/GD/metadata.xml
+++ b/dev-perl/GD/metadata.xml
@@ -7,5 +7,10 @@
   </use>
   <upstream>
     <remote-id type="cpan">GD</remote-id>
+    <remote-id type="cpan-module">GD</remote-id>
+    <remote-id type="cpan-module">GD::Group</remote-id>
+    <remote-id type="cpan-module">GD::Polygon</remote-id>
+    <remote-id type="cpan-module">GD::Polyline</remote-id>
+    <remote-id type="cpan-module">GD::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GDGraph/metadata.xml b/dev-perl/GDGraph/metadata.xml
index c628997e42a9..6fdb825eea3c 100644
--- a/dev-perl/GDGraph/metadata.xml
+++ b/dev-perl/GDGraph/metadata.xml
@@ -4,5 +4,19 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GDGraph</remote-id>
+    <remote-id type="cpan-module">GD::Graph</remote-id>
+    <remote-id type="cpan-module">GD::Graph::Data</remote-id>
+    <remote-id type="cpan-module">GD::Graph::Error</remote-id>
+    <remote-id type="cpan-module">GD::Graph::area</remote-id>
+    <remote-id type="cpan-module">GD::Graph::axestype</remote-id>
+    <remote-id type="cpan-module">GD::Graph::bars</remote-id>
+    <remote-id type="cpan-module">GD::Graph::colour</remote-id>
+    <remote-id type="cpan-module">GD::Graph::hbars</remote-id>
+    <remote-id type="cpan-module">GD::Graph::lines</remote-id>
+    <remote-id type="cpan-module">GD::Graph::linespoints</remote-id>
+    <remote-id type="cpan-module">GD::Graph::mixed</remote-id>
+    <remote-id type="cpan-module">GD::Graph::pie</remote-id>
+    <remote-id type="cpan-module">GD::Graph::points</remote-id>
+    <remote-id type="cpan-module">GD::Graph::utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GDTextUtil/metadata.xml b/dev-perl/GDTextUtil/metadata.xml
index 83d526a7c3fa..708672626642 100644
--- a/dev-perl/GDTextUtil/metadata.xml
+++ b/dev-perl/GDTextUtil/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GDTextUtil</remote-id>
+    <remote-id type="cpan-module">GD::Text</remote-id>
+    <remote-id type="cpan-module">GD::Text::Align</remote-id>
+    <remote-id type="cpan-module">GD::Text::Wrap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GSSAPI/metadata.xml b/dev-perl/GSSAPI/metadata.xml
index 296524c31aee..7d1e3403059e 100644
--- a/dev-perl/GSSAPI/metadata.xml
+++ b/dev-perl/GSSAPI/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GSSAPI</remote-id>
+    <remote-id type="cpan-module">GSSAPI</remote-id>
+    <remote-id type="cpan-module">GSSAPI::OID</remote-id>
+    <remote-id type="cpan-module">GSSAPI::OID::Set</remote-id>
+    <remote-id type="cpan-module">GSSAPI::Status</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GStreamer-Interfaces/metadata.xml b/dev-perl/GStreamer-Interfaces/metadata.xml
index d8ecb082d9d1..2b18338b102f 100644
--- a/dev-perl/GStreamer-Interfaces/metadata.xml
+++ b/dev-perl/GStreamer-Interfaces/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GStreamer-Interfaces</remote-id>
+    <remote-id type="cpan-module">GStreamer::Interfaces</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GStreamer/metadata.xml b/dev-perl/GStreamer/metadata.xml
index b8988fb1eb57..8ed26bf5ec06 100644
--- a/dev-perl/GStreamer/metadata.xml
+++ b/dev-perl/GStreamer/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GStreamer</remote-id>
+    <remote-id type="cpan-module">GStreamer</remote-id>
+    <remote-id type="cpan-module">GStreamer::Caps</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gearman-Client-Async/metadata.xml b/dev-perl/Gearman-Client-Async/metadata.xml
index 7cf74439232b..5ded6298d510 100644
--- a/dev-perl/Gearman-Client-Async/metadata.xml
+++ b/dev-perl/Gearman-Client-Async/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman-Client-Async</remote-id>
+    <remote-id type="cpan-module">Gearman::Client::Async</remote-id>
+    <remote-id type="cpan-module">Gearman::Client::Async::Connection</remote-id>
+    <remote-id type="cpan-module">Gearman::ResponseParser::Async</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gearman-Server/metadata.xml b/dev-perl/Gearman-Server/metadata.xml
index 6b4155078866..eab9c53e7e68 100644
--- a/dev-perl/Gearman-Server/metadata.xml
+++ b/dev-perl/Gearman-Server/metadata.xml
@@ -8,5 +8,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman-Server</remote-id>
+    <remote-id type="cpan-module">Gearman::Server</remote-id>
+    <remote-id type="cpan-module">Gearman::Server::Client</remote-id>
+    <remote-id type="cpan-module">Gearman::Server::Job</remote-id>
+    <remote-id type="cpan-module">Gearman::Server::Listener</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gearman/metadata.xml b/dev-perl/Gearman/metadata.xml
index c99eadca8b1a..2d37766df63d 100644
--- a/dev-perl/Gearman/metadata.xml
+++ b/dev-perl/Gearman/metadata.xml
@@ -8,5 +8,15 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Gearman</remote-id>
+    <remote-id type="cpan-module">Gearman::Client</remote-id>
+    <remote-id type="cpan-module">Gearman::Job</remote-id>
+    <remote-id type="cpan-module">Gearman::JobStatus</remote-id>
+    <remote-id type="cpan-module">Gearman::Objects</remote-id>
+    <remote-id type="cpan-module">Gearman::ResponseParser</remote-id>
+    <remote-id type="cpan-module">Gearman::ResponseParser::Taskset</remote-id>
+    <remote-id type="cpan-module">Gearman::Task</remote-id>
+    <remote-id type="cpan-module">Gearman::Taskset</remote-id>
+    <remote-id type="cpan-module">Gearman::Util</remote-id>
+    <remote-id type="cpan-module">Gearman::Worker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gentoo-PerlMod-Version/metadata.xml b/dev-perl/Gentoo-PerlMod-Version/metadata.xml
index b77f7b416559..6ead6585de42 100644
--- a/dev-perl/Gentoo-PerlMod-Version/metadata.xml
+++ b/dev-perl/Gentoo-PerlMod-Version/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Gentoo-PerlMod-Version</remote-id>
+		<remote-id type="cpan-module">Gentoo::PerlMod::Version</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Geo-IP/metadata.xml b/dev-perl/Geo-IP/metadata.xml
index 15de6dc132dc..8b9ac5754a81 100644
--- a/dev-perl/Geo-IP/metadata.xml
+++ b/dev-perl/Geo-IP/metadata.xml
@@ -6,5 +6,8 @@
   <longdescription>Look up country by IP Address</longdescription>
   <upstream>
     <remote-id type="cpan">Geo-IP</remote-id>
+    <remote-id type="cpan-module">Geo::IP</remote-id>
+    <remote-id type="cpan-module">Geo::IP::Record</remote-id>
+    <remote-id type="cpan-module">Geo::Mirror</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Geography-Countries/metadata.xml b/dev-perl/Geography-Countries/metadata.xml
index 658eabaf21d0..7bedde4bc424 100644
--- a/dev-perl/Geography-Countries/metadata.xml
+++ b/dev-perl/Geography-Countries/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Geography-Countries</remote-id>
+    <remote-id type="cpan-module">Geography::Countries</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Getopt-ArgvFile/metadata.xml b/dev-perl/Getopt-ArgvFile/metadata.xml
index d3d0c1dec085..d06941ef30c0 100644
--- a/dev-perl/Getopt-ArgvFile/metadata.xml
+++ b/dev-perl/Getopt-ArgvFile/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Getopt-ArgvFile</remote-id>
+    <remote-id type="cpan-module">Getopt::ArgvFile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Getopt-GUI-Long/metadata.xml b/dev-perl/Getopt-GUI-Long/metadata.xml
index 9aa4f2940c4b..3f019d2bc0c0 100644
--- a/dev-perl/Getopt-GUI-Long/metadata.xml
+++ b/dev-perl/Getopt-GUI-Long/metadata.xml
@@ -8,6 +8,6 @@
 </maintainer>
 <upstream>
 	<remote-id type="cpan">Getopt-GUI-Long</remote-id>
+	<remote-id type="cpan-module">Getopt::GUI::Long</remote-id>
 </upstream>
 </pkgmetadata>
-
diff --git a/dev-perl/Getopt-Long-Descriptive/metadata.xml b/dev-perl/Getopt-Long-Descriptive/metadata.xml
index 3fb0e53eab36..315b14827458 100644
--- a/dev-perl/Getopt-Long-Descriptive/metadata.xml
+++ b/dev-perl/Getopt-Long-Descriptive/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Getopt-Long-Descriptive</remote-id>
+    <remote-id type="cpan-module">Getopt::Long::Descriptive</remote-id>
+    <remote-id type="cpan-module">Getopt::Long::Descriptive::Opts</remote-id>
+    <remote-id type="cpan-module">Getopt::Long::Descriptive::Usage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Getopt-Mixed/metadata.xml b/dev-perl/Getopt-Mixed/metadata.xml
index 394b7eb4e2a4..b91b44f9b64f 100644
--- a/dev-perl/Getopt-Mixed/metadata.xml
+++ b/dev-perl/Getopt-Mixed/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Getopt-Mixed</remote-id>
+    <remote-id type="cpan-module">Getopt::Mixed</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GnuPG-Interface/metadata.xml b/dev-perl/GnuPG-Interface/metadata.xml
index ef7860794169..ab0fb78b4b85 100644
--- a/dev-perl/GnuPG-Interface/metadata.xml
+++ b/dev-perl/GnuPG-Interface/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GnuPG-Interface</remote-id>
+    <remote-id type="cpan-module">GnuPG::Fingerprint</remote-id>
+    <remote-id type="cpan-module">GnuPG::Handles</remote-id>
+    <remote-id type="cpan-module">GnuPG::HashInit</remote-id>
+    <remote-id type="cpan-module">GnuPG::Key</remote-id>
+    <remote-id type="cpan-module">GnuPG::Options</remote-id>
+    <remote-id type="cpan-module">GnuPG::PrimaryKey</remote-id>
+    <remote-id type="cpan-module">GnuPG::PublicKey</remote-id>
+    <remote-id type="cpan-module">GnuPG::Revoker</remote-id>
+    <remote-id type="cpan-module">GnuPG::SecretKey</remote-id>
+    <remote-id type="cpan-module">GnuPG::Signature</remote-id>
+    <remote-id type="cpan-module">GnuPG::SubKey</remote-id>
+    <remote-id type="cpan-module">GnuPG::UserAttribute</remote-id>
+    <remote-id type="cpan-module">GnuPG::UserId</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Goo-Canvas/metadata.xml b/dev-perl/Goo-Canvas/metadata.xml
index 8869e472ac36..8742fce7fbdd 100644
--- a/dev-perl/Goo-Canvas/metadata.xml
+++ b/dev-perl/Goo-Canvas/metadata.xml
@@ -7,5 +7,6 @@ GTK+ does't has an buildin canvas widget. GooCanvas is wonderful. It is easy to
 </longdescription>
   <upstream>
     <remote-id type="cpan">Goo-Canvas</remote-id>
+    <remote-id type="cpan-module">Goo::Canvas</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Graph/metadata.xml b/dev-perl/Graph/metadata.xml
index 22a2826dbc24..646b85a2341a 100644
--- a/dev-perl/Graph/metadata.xml
+++ b/dev-perl/Graph/metadata.xml
@@ -4,5 +4,26 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Graph</remote-id>
+    <remote-id type="cpan-module">Graph</remote-id>
+    <remote-id type="cpan-module">Graph::AdjacencyMap</remote-id>
+    <remote-id type="cpan-module">Graph::AdjacencyMap::Heavy</remote-id>
+    <remote-id type="cpan-module">Graph::AdjacencyMap::Light</remote-id>
+    <remote-id type="cpan-module">Graph::AdjacencyMap::Vertex</remote-id>
+    <remote-id type="cpan-module">Graph::AdjacencyMatrix</remote-id>
+    <remote-id type="cpan-module">Graph::Attribute</remote-id>
+    <remote-id type="cpan-module">Graph::BitMatrix</remote-id>
+    <remote-id type="cpan-module">Graph::Directed</remote-id>
+    <remote-id type="cpan-module">Graph::MSTHeapElem</remote-id>
+    <remote-id type="cpan-module">Graph::Matrix</remote-id>
+    <remote-id type="cpan-module">Graph::SPTHeapElem</remote-id>
+    <remote-id type="cpan-module">Graph::TransitiveClosure</remote-id>
+    <remote-id type="cpan-module">Graph::TransitiveClosure::Matrix</remote-id>
+    <remote-id type="cpan-module">Graph::Traversal</remote-id>
+    <remote-id type="cpan-module">Graph::Traversal::BFS</remote-id>
+    <remote-id type="cpan-module">Graph::Traversal::DFS</remote-id>
+    <remote-id type="cpan-module">Graph::Undirected</remote-id>
+    <remote-id type="cpan-module">Graph::UnionFind</remote-id>
+    <remote-id type="cpan-module">Heap071::Elem</remote-id>
+    <remote-id type="cpan-module">Heap071::Fibonacci</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GraphViz/metadata.xml b/dev-perl/GraphViz/metadata.xml
index 01fa1b3bb9ad..2e8626388d09 100644
--- a/dev-perl/GraphViz/metadata.xml
+++ b/dev-perl/GraphViz/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">GraphViz</remote-id>
+    <remote-id type="cpan-module">Devel::GraphVizProf</remote-id>
+    <remote-id type="cpan-module">GraphViz</remote-id>
+    <remote-id type="cpan-module">GraphViz::Data::Grapher</remote-id>
+    <remote-id type="cpan-module">GraphViz::No</remote-id>
+    <remote-id type="cpan-module">GraphViz::Parse::RecDescent</remote-id>
+    <remote-id type="cpan-module">GraphViz::Parse::Yacc</remote-id>
+    <remote-id type="cpan-module">GraphViz::Parse::Yapp</remote-id>
+    <remote-id type="cpan-module">GraphViz::Regex</remote-id>
+    <remote-id type="cpan-module">GraphViz::Small</remote-id>
+    <remote-id type="cpan-module">GraphViz::XML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Graphics-ColorNames/metadata.xml b/dev-perl/Graphics-ColorNames/metadata.xml
index 6b31fc292c04..9cfb397274ed 100644
--- a/dev-perl/Graphics-ColorNames/metadata.xml
+++ b/dev-perl/Graphics-ColorNames/metadata.xml
@@ -11,5 +11,10 @@
   </use>
   <upstream>
     <remote-id type="cpan">Graphics-ColorNames</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorNames</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorNames::HTML</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorNames::Netscape</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorNames::Windows</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorNames::X</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Graphics-ColorObject/metadata.xml b/dev-perl/Graphics-ColorObject/metadata.xml
index 5b625c3e7dae..4ff4342f69d1 100644
--- a/dev-perl/Graphics-ColorObject/metadata.xml
+++ b/dev-perl/Graphics-ColorObject/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Graphics-ColorObject</remote-id>
+    <remote-id type="cpan-module">Graphics::ColorObject</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml b/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
index 30db871e50c3..80fce192a27d 100644
--- a/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
+++ b/dev-perl/Gtk2-Ex-PodViewer/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-PodViewer</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PodViewer</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PodViewer::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml b/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
index f08373b51799..3eb2788e005c 100644
--- a/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
+++ b/dev-perl/Gtk2-Ex-PrintDialog/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-PrintDialog</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PrintDialog</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PrintDialog::Darwin</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PrintDialog::Linux</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PrintDialog::MSWin32</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::PrintDialog::Unix</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml b/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
index 09bc661b1379..0dcafa018993 100644
--- a/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
+++ b/dev-perl/Gtk2-Ex-Simple-List/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-Simple-List</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::Simple::List</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::Simple::TiedCommon</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::Simple::TiedList</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::Simple::TiedRow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-ImageView/metadata.xml b/dev-perl/Gtk2-ImageView/metadata.xml
index 4294a34117c9..dd464e96ade1 100644
--- a/dev-perl/Gtk2-ImageView/metadata.xml
+++ b/dev-perl/Gtk2-ImageView/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-ImageView</remote-id>
+    <remote-id type="cpan-module">Gtk2::ImageView</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Notify/metadata.xml b/dev-perl/Gtk2-Notify/metadata.xml
index 2276f8355048..c276f24f8902 100644
--- a/dev-perl/Gtk2-Notify/metadata.xml
+++ b/dev-perl/Gtk2-Notify/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Notify</remote-id>
+    <remote-id type="cpan-module">Gtk2::Notify</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Unique/metadata.xml b/dev-perl/Gtk2-Unique/metadata.xml
index 4970402e2cd7..daa6afc1ff76 100644
--- a/dev-perl/Gtk2-Unique/metadata.xml
+++ b/dev-perl/Gtk2-Unique/metadata.xml
@@ -6,9 +6,8 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
-        <upstream>
-                <remote-id type="cpan">Gtk2-Unique</remote-id>
-        </upstream>
+<upstream>
+<remote-id type="cpan">Gtk2-Unique</remote-id>
+<remote-id type="cpan-module">Gtk2::Unique</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-WebKit/metadata.xml b/dev-perl/Gtk2-WebKit/metadata.xml
index 4c1ad1d1e62b..1a33ebc2a4c6 100644
--- a/dev-perl/Gtk2-WebKit/metadata.xml
+++ b/dev-perl/Gtk2-WebKit/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-WebKit</remote-id>
+    <remote-id type="cpan-module">Gtk2::WebKit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Guard/metadata.xml b/dev-perl/Guard/metadata.xml
index d61b7c238304..03d75b955788 100644
--- a/dev-perl/Guard/metadata.xml
+++ b/dev-perl/Guard/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Guard</remote-id>
+    <remote-id type="cpan-module">Guard</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Clean/metadata.xml b/dev-perl/HTML-Clean/metadata.xml
index af4bda38a07e..857a0aefecfc 100644
--- a/dev-perl/HTML-Clean/metadata.xml
+++ b/dev-perl/HTML-Clean/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Clean</remote-id>
+    <remote-id type="cpan-module">HTML::Clean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Element-Extended/metadata.xml b/dev-perl/HTML-Element-Extended/metadata.xml
index bb51f3b42bdb..2dd9015d3d64 100644
--- a/dev-perl/HTML-Element-Extended/metadata.xml
+++ b/dev-perl/HTML-Element-Extended/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Element-Extended</remote-id>
+    <remote-id type="cpan-module">HTML::ElementGlob</remote-id>
+    <remote-id type="cpan-module">HTML::ElementRaw</remote-id>
+    <remote-id type="cpan-module">HTML::ElementSuper</remote-id>
+    <remote-id type="cpan-module">HTML::ElementSuper::ContentWatchdog</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable::DataElement</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable::Element</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable::HeaderElement</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable::RowElement</remote-id>
+    <remote-id type="cpan-module">HTML::ElementTable::RowGlob</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-FillInForm/metadata.xml b/dev-perl/HTML-FillInForm/metadata.xml
index d84472292699..521ac2789563 100644
--- a/dev-perl/HTML-FillInForm/metadata.xml
+++ b/dev-perl/HTML-FillInForm/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-FillInForm</remote-id>
+    <remote-id type="cpan-module">HTML::FillInForm</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Form/metadata.xml b/dev-perl/HTML-Form/metadata.xml
index dd52e8c747c0..9ea2bf227f45 100644
--- a/dev-perl/HTML-Form/metadata.xml
+++ b/dev-perl/HTML-Form/metadata.xml
@@ -4,5 +4,14 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">HTML-Form</remote-id>
+		<remote-id type="cpan-module">HTML::Form</remote-id>
+		<remote-id type="cpan-module">HTML::Form::FileInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::IgnoreInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::ImageInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::Input</remote-id>
+		<remote-id type="cpan-module">HTML::Form::KeygenInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::ListInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::SubmitInput</remote-id>
+		<remote-id type="cpan-module">HTML::Form::TextInput</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Format/metadata.xml b/dev-perl/HTML-Format/metadata.xml
index 20888eddca58..95f3302dc62d 100644
--- a/dev-perl/HTML-Format/metadata.xml
+++ b/dev-perl/HTML-Format/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Format</remote-id>
+    <remote-id type="cpan-module">HTML::FormatPS</remote-id>
+    <remote-id type="cpan-module">HTML::FormatRTF</remote-id>
+    <remote-id type="cpan-module">HTML::FormatText</remote-id>
+    <remote-id type="cpan-module">HTML::Formatter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-FromText/metadata.xml b/dev-perl/HTML-FromText/metadata.xml
index 794ec7f9f0d4..50ae4180f0ca 100644
--- a/dev-perl/HTML-FromText/metadata.xml
+++ b/dev-perl/HTML-FromText/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-FromText</remote-id>
+    <remote-id type="cpan-module">HTML::FromText</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-HTMLDoc/metadata.xml b/dev-perl/HTML-HTMLDoc/metadata.xml
index 5a7f88159ff4..666edd355465 100644
--- a/dev-perl/HTML-HTMLDoc/metadata.xml
+++ b/dev-perl/HTML-HTMLDoc/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-HTMLDoc</remote-id>
+    <remote-id type="cpan-module">HTML::HTMLDoc</remote-id>
+    <remote-id type="cpan-module">HTML::HTMLDoc::PDF</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-LinkExtractor/metadata.xml b/dev-perl/HTML-LinkExtractor/metadata.xml
index e70d427e928d..009a4df34397 100644
--- a/dev-perl/HTML-LinkExtractor/metadata.xml
+++ b/dev-perl/HTML-LinkExtractor/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-LinkExtractor</remote-id>
+    <remote-id type="cpan-module">HTML::LinkExtractor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Mason-PSGIHandler/metadata.xml b/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
index e5bb693c2c29..933ccaa5fc70 100644
--- a/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
+++ b/dev-perl/HTML-Mason-PSGIHandler/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Mason-PSGIHandler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::PSGIHandler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::PSGIHandler::Streamy</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Request::PSGI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Mason/metadata.xml b/dev-perl/HTML-Mason/metadata.xml
index 33dfafcc4e6a..5786ec5b395c 100644
--- a/dev-perl/HTML-Mason/metadata.xml
+++ b/dev-perl/HTML-Mason/metadata.xml
@@ -2,11 +2,51 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
-  <use>
-    <flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg>
+  <use><flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg>
 			support</flag>
   </use>
   <upstream>
     <remote-id type="cpan">HTML-Mason</remote-id>
+    <remote-id type="cpan-module">Apache::Mason</remote-id>
+    <remote-id type="cpan-module">Bundle::HTML::Mason</remote-id>
+    <remote-id type="cpan-module">HTML::Mason</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Apache::Request</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::ApacheHandler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::CGIHandler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Cache::BaseCache</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Compiler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Compiler::ToObject</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Component</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Component::FileBased</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Component::Subcomponent</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::ComponentSource</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Escapes</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Exception</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Exception::Compilation</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Exception::Syntax</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Exceptions</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::FakeApache</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::FakeTable</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::FakeTableHash</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Handler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Interp</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Lexer</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::MethodMaker</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin::Context</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin::Context::EndComponent</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin::Context::EndRequest</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin::Context::StartComponent</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Plugin::Context::StartRequest</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Request</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Request::ApacheHandler</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Request::CGI</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Resolver</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Resolver::File</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Resolver::Null</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Tests</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Tools</remote-id>
+    <remote-id type="cpan-module">HTML::Mason::Utils</remote-id>
+    <remote-id type="cpan-module">Tie::Handle::Mason</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Parser/metadata.xml b/dev-perl/HTML-Parser/metadata.xml
index f307b730f39f..a09709141a05 100644
--- a/dev-perl/HTML-Parser/metadata.xml
+++ b/dev-perl/HTML-Parser/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Parser</remote-id>
+    <remote-id type="cpan-module">HTML::Entities</remote-id>
+    <remote-id type="cpan-module">HTML::Filter</remote-id>
+    <remote-id type="cpan-module">HTML::HeadParser</remote-id>
+    <remote-id type="cpan-module">HTML::LinkExtor</remote-id>
+    <remote-id type="cpan-module">HTML::Parser</remote-id>
+    <remote-id type="cpan-module">HTML::PullParser</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Quoted/metadata.xml b/dev-perl/HTML-Quoted/metadata.xml
index 32211f3f2719..36046f8441f0 100644
--- a/dev-perl/HTML-Quoted/metadata.xml
+++ b/dev-perl/HTML-Quoted/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Quoted</remote-id>
+    <remote-id type="cpan-module">HTML::Quoted</remote-id>
+    <remote-id type="cpan-module">HTML::Quoted::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-RewriteAttributes/metadata.xml b/dev-perl/HTML-RewriteAttributes/metadata.xml
index 9ab6f87f0259..044428967c5b 100644
--- a/dev-perl/HTML-RewriteAttributes/metadata.xml
+++ b/dev-perl/HTML-RewriteAttributes/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-RewriteAttributes</remote-id>
+    <remote-id type="cpan-module">HTML::RewriteAttributes</remote-id>
+    <remote-id type="cpan-module">HTML::RewriteAttributes::Links</remote-id>
+    <remote-id type="cpan-module">HTML::RewriteAttributes::Resources</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Scrubber/metadata.xml b/dev-perl/HTML-Scrubber/metadata.xml
index 3e8ed7627fbd..d225c9fc5a34 100644
--- a/dev-perl/HTML-Scrubber/metadata.xml
+++ b/dev-perl/HTML-Scrubber/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Scrubber</remote-id>
+    <remote-id type="cpan-module">HTML::Scrubber</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-SimpleParse/metadata.xml b/dev-perl/HTML-SimpleParse/metadata.xml
index 4a1fcc17235b..68af9af5686b 100644
--- a/dev-perl/HTML-SimpleParse/metadata.xml
+++ b/dev-perl/HTML-SimpleParse/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-SimpleParse</remote-id>
+    <remote-id type="cpan-module">HTML::SimpleParse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Strip/metadata.xml b/dev-perl/HTML-Strip/metadata.xml
index efd748cbdbf1..76d3c1a9c968 100644
--- a/dev-perl/HTML-Strip/metadata.xml
+++ b/dev-perl/HTML-Strip/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Strip</remote-id>
+    <remote-id type="cpan-module">HTML::Strip</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Table/metadata.xml b/dev-perl/HTML-Table/metadata.xml
index 4e31b3939744..9dfc2f5f0eab 100644
--- a/dev-perl/HTML-Table/metadata.xml
+++ b/dev-perl/HTML-Table/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Table</remote-id>
+    <remote-id type="cpan-module">HTML::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-TableContentParser/metadata.xml b/dev-perl/HTML-TableContentParser/metadata.xml
index c412f80eee36..f1516fb8d4f6 100644
--- a/dev-perl/HTML-TableContentParser/metadata.xml
+++ b/dev-perl/HTML-TableContentParser/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TableContentParser</remote-id>
+    <remote-id type="cpan-module">HTML::TableContentParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-TableExtract/metadata.xml b/dev-perl/HTML-TableExtract/metadata.xml
index 096761d9fea9..3cdf03d12c65 100644
--- a/dev-perl/HTML-TableExtract/metadata.xml
+++ b/dev-perl/HTML-TableExtract/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-TableExtract</remote-id>
+    <remote-id type="cpan-module">HTML::TableExtract</remote-id>
+    <remote-id type="cpan-module">HTML::TableExtract::Rasterize</remote-id>
+    <remote-id type="cpan-module">HTML::TableExtract::StripHTML</remote-id>
+    <remote-id type="cpan-module">HTML::TableExtract::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-TableParser/metadata.xml b/dev-perl/HTML-TableParser/metadata.xml
index 5ffb9d5bd78a..ceb3d6d4e4cc 100644
--- a/dev-perl/HTML-TableParser/metadata.xml
+++ b/dev-perl/HTML-TableParser/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">HTML-TableParser</remote-id>
+    <remote-id type="cpan-module">HTML::TableParser</remote-id>
+    <remote-id type="cpan-module">HTML::TableParser::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Tagset/metadata.xml b/dev-perl/HTML-Tagset/metadata.xml
index c05abb942fba..15b13b959bff 100644
--- a/dev-perl/HTML-Tagset/metadata.xml
+++ b/dev-perl/HTML-Tagset/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Tagset</remote-id>
+    <remote-id type="cpan-module">HTML::Tagset</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Template-Expr/metadata.xml b/dev-perl/HTML-Template-Expr/metadata.xml
index 8e01090fcf7a..71189b0bd4ac 100644
--- a/dev-perl/HTML-Template-Expr/metadata.xml
+++ b/dev-perl/HTML-Template-Expr/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Template-Expr</remote-id>
+    <remote-id type="cpan-module">HTML::Template::Expr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Template-JIT/metadata.xml b/dev-perl/HTML-Template-JIT/metadata.xml
index 2b34310a7e5b..4fb8a25fbaff 100644
--- a/dev-perl/HTML-Template-JIT/metadata.xml
+++ b/dev-perl/HTML-Template-JIT/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Template-JIT</remote-id>
+    <remote-id type="cpan-module">HTML::Template::JIT</remote-id>
+    <remote-id type="cpan-module">HTML::Template::JIT::Base</remote-id>
+    <remote-id type="cpan-module">HTML::Template::JIT::Compiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Template/metadata.xml b/dev-perl/HTML-Template/metadata.xml
index 2b7117302d03..8a393ba5c903 100644
--- a/dev-perl/HTML-Template/metadata.xml
+++ b/dev-perl/HTML-Template/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Template</remote-id>
+    <remote-id type="cpan-module">HTML::Template</remote-id>
+    <remote-id type="cpan-module">HTML::Template::COND</remote-id>
+    <remote-id type="cpan-module">HTML::Template::DEFAULT</remote-id>
+    <remote-id type="cpan-module">HTML::Template::ESCAPE</remote-id>
+    <remote-id type="cpan-module">HTML::Template::FAQ</remote-id>
+    <remote-id type="cpan-module">HTML::Template::JSESCAPE</remote-id>
+    <remote-id type="cpan-module">HTML::Template::LOOP</remote-id>
+    <remote-id type="cpan-module">HTML::Template::NOOP</remote-id>
+    <remote-id type="cpan-module">HTML::Template::PRINTSCALAR</remote-id>
+    <remote-id type="cpan-module">HTML::Template::URLESCAPE</remote-id>
+    <remote-id type="cpan-module">HTML::Template::VAR</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-TokeParser-Simple/metadata.xml b/dev-perl/HTML-TokeParser-Simple/metadata.xml
index 481f737ae131..c84bb59012fb 100644
--- a/dev-perl/HTML-TokeParser-Simple/metadata.xml
+++ b/dev-perl/HTML-TokeParser-Simple/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-TokeParser-Simple</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Comment</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Declaration</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::ProcessInstruction</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Tag</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Tag::End</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Tag::Start</remote-id>
+    <remote-id type="cpan-module">HTML::TokeParser::Simple::Token::Text</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Tree/metadata.xml b/dev-perl/HTML-Tree/metadata.xml
index 0422ed1e73f1..34fba997f9a7 100644
--- a/dev-perl/HTML-Tree/metadata.xml
+++ b/dev-perl/HTML-Tree/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTML-Tree</remote-id>
+    <remote-id type="cpan-module">HTML::AsSubs</remote-id>
+    <remote-id type="cpan-module">HTML::Element</remote-id>
+    <remote-id type="cpan-module">HTML::Element::traverse</remote-id>
+    <remote-id type="cpan-module">HTML::Parse</remote-id>
+    <remote-id type="cpan-module">HTML::Tree</remote-id>
+    <remote-id type="cpan-module">HTML::TreeBuilder</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Body/metadata.xml b/dev-perl/HTTP-Body/metadata.xml
index d9928ed39003..d0ddb33a9b23 100644
--- a/dev-perl/HTTP-Body/metadata.xml
+++ b/dev-perl/HTTP-Body/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-Body</remote-id>
+    <remote-id type="cpan-module">HTTP::Body</remote-id>
+    <remote-id type="cpan-module">HTTP::Body::MultiPart</remote-id>
+    <remote-id type="cpan-module">HTTP::Body::OctetStream</remote-id>
+    <remote-id type="cpan-module">HTTP::Body::UrlEncoded</remote-id>
+    <remote-id type="cpan-module">HTTP::Body::XForms</remote-id>
+    <remote-id type="cpan-module">HTTP::Body::XFormsMultipart</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-BrowserDetect/metadata.xml b/dev-perl/HTTP-BrowserDetect/metadata.xml
index 78801c6dc5e9..b96430b2e350 100644
--- a/dev-perl/HTTP-BrowserDetect/metadata.xml
+++ b/dev-perl/HTTP-BrowserDetect/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-BrowserDetect</remote-id>
+    <remote-id type="cpan-module">HTTP::BrowserDetect</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Cache-Transparent/metadata.xml b/dev-perl/HTTP-Cache-Transparent/metadata.xml
index d2a6970ea074..b9b90d19bef0 100644
--- a/dev-perl/HTTP-Cache-Transparent/metadata.xml
+++ b/dev-perl/HTTP-Cache-Transparent/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-Cache-Transparent</remote-id>
+    <remote-id type="cpan-module">HTTP::Cache::Transparent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Cookies/metadata.xml b/dev-perl/HTTP-Cookies/metadata.xml
index 6682d19f81c0..5454d93d4da7 100644
--- a/dev-perl/HTTP-Cookies/metadata.xml
+++ b/dev-perl/HTTP-Cookies/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 	        <remote-id type="cpan">HTTP-Cookies</remote-id>
+	        <remote-id type="cpan-module">HTTP::Cookies</remote-id>
+	        <remote-id type="cpan-module">HTTP::Cookies::Microsoft</remote-id>
+	        <remote-id type="cpan-module">HTTP::Cookies::Netscape</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-DAV/metadata.xml b/dev-perl/HTTP-DAV/metadata.xml
index 8728b2c70311..be37eaf9d8a0 100644
--- a/dev-perl/HTTP-DAV/metadata.xml
+++ b/dev-perl/HTTP-DAV/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-DAV</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Comms</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Headers</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Lock</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Resource</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::ResourceList</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Response</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::UserAgent</remote-id>
+    <remote-id type="cpan-module">HTTP::DAV::Utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Daemon/metadata.xml b/dev-perl/HTTP-Daemon/metadata.xml
index e35a2f5c458d..1a898955486c 100644
--- a/dev-perl/HTTP-Daemon/metadata.xml
+++ b/dev-perl/HTTP-Daemon/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">HTTP-Daemon</remote-id>
+		<remote-id type="cpan-module">HTTP::Daemon</remote-id>
+		<remote-id type="cpan-module">HTTP::Daemon::ClientConn</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Date/metadata.xml b/dev-perl/HTTP-Date/metadata.xml
index cca4f8aa005c..07299304bb5a 100644
--- a/dev-perl/HTTP-Date/metadata.xml
+++ b/dev-perl/HTTP-Date/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">HTTP-Date</remote-id>
+		<remote-id type="cpan-module">HTTP::Date</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Message/metadata.xml b/dev-perl/HTTP-Message/metadata.xml
index 2c9473b53205..98dd3178196c 100644
--- a/dev-perl/HTTP-Message/metadata.xml
+++ b/dev-perl/HTTP-Message/metadata.xml
@@ -4,5 +4,15 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">HTTP-Message</remote-id>
+		<remote-id type="cpan-module">HTTP::Config</remote-id>
+		<remote-id type="cpan-module">HTTP::Headers</remote-id>
+		<remote-id type="cpan-module">HTTP::Headers::Auth</remote-id>
+		<remote-id type="cpan-module">HTTP::Headers::ETag</remote-id>
+		<remote-id type="cpan-module">HTTP::Headers::Util</remote-id>
+		<remote-id type="cpan-module">HTTP::Message</remote-id>
+		<remote-id type="cpan-module">HTTP::Request</remote-id>
+		<remote-id type="cpan-module">HTTP::Request::Common</remote-id>
+		<remote-id type="cpan-module">HTTP::Response</remote-id>
+		<remote-id type="cpan-module">HTTP::Status</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Negotiate/metadata.xml b/dev-perl/HTTP-Negotiate/metadata.xml
index 89ce644d54ca..9ee008e66bb8 100644
--- a/dev-perl/HTTP-Negotiate/metadata.xml
+++ b/dev-perl/HTTP-Negotiate/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">HTTP-Negotiate</remote-id>
+		<remote-id type="cpan-module">HTTP::Negotiate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Response-Encoding/metadata.xml b/dev-perl/HTTP-Response-Encoding/metadata.xml
index bbd050a42435..cb9f7accb95f 100644
--- a/dev-perl/HTTP-Response-Encoding/metadata.xml
+++ b/dev-perl/HTTP-Response-Encoding/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-Response-Encoding</remote-id>
+    <remote-id type="cpan-module">HTTP::Response::Encoding</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Server-Simple-Mason/metadata.xml b/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
index 396c9b14b9ef..9f683c95c05d 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
+++ b/dev-perl/HTTP-Server-Simple-Mason/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-Server-Simple-Mason</remote-id>
+    <remote-id type="cpan-module">HTTP::Server::Simple::Mason</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Server-Simple/metadata.xml b/dev-perl/HTTP-Server-Simple/metadata.xml
index 61c4a8540210..2d082f1b7b0e 100644
--- a/dev-perl/HTTP-Server-Simple/metadata.xml
+++ b/dev-perl/HTTP-Server-Simple/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTP-Server-Simple</remote-id>
+    <remote-id type="cpan-module">HTTP::Server::Simple</remote-id>
+    <remote-id type="cpan-module">HTTP::Server::Simple::CGI</remote-id>
+    <remote-id type="cpan-module">HTTP::Server::Simple::CGI::Environment</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTPD-User-Manage/metadata.xml b/dev-perl/HTTPD-User-Manage/metadata.xml
index bbcc0c5f91f1..af8233a39c93 100644
--- a/dev-perl/HTTPD-User-Manage/metadata.xml
+++ b/dev-perl/HTTPD-User-Manage/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">HTTPD-User-Manage</remote-id>
+    <remote-id type="cpan-module">DBNull_File</remote-id>
+    <remote-id type="cpan-module">HTTPD::AdminBase</remote-id>
+    <remote-id type="cpan-module">HTTPD::Authen</remote-id>
+    <remote-id type="cpan-module">HTTPD::Authen::Basic</remote-id>
+    <remote-id type="cpan-module">HTTPD::Authen::Digest</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::DBM</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::DBM::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::DBM::apache</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::SQL</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::SQL::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::Text</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::Text::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::GroupAdmin::Text::cern</remote-id>
+    <remote-id type="cpan-module">HTTPD::Realm</remote-id>
+    <remote-id type="cpan-module">HTTPD::RealmDef</remote-id>
+    <remote-id type="cpan-module">HTTPD::RealmManager</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::DBM</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::DBM::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::DBM::netscape</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::SQL</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::SQL::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::Text</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::Text::_generic</remote-id>
+    <remote-id type="cpan-module">HTTPD::UserAdmin::Text::cern</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Hash-Merge/metadata.xml b/dev-perl/Hash-Merge/metadata.xml
index ad6c1aa84169..363b587020b4 100644
--- a/dev-perl/Hash-Merge/metadata.xml
+++ b/dev-perl/Hash-Merge/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Hash-Merge</remote-id>
+    <remote-id type="cpan-module">Hash::Merge</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Hash-MoreUtils/metadata.xml b/dev-perl/Hash-MoreUtils/metadata.xml
index e5b91425a40f..b002fd97a606 100644
--- a/dev-perl/Hash-MoreUtils/metadata.xml
+++ b/dev-perl/Hash-MoreUtils/metadata.xml
@@ -5,4 +5,8 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Hash-MoreUtils</remote-id>
+    <remote-id type="cpan-module">Hash::MoreUtils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Hash-MultiValue/metadata.xml b/dev-perl/Hash-MultiValue/metadata.xml
index 3c1ee36512e0..acf2732aba52 100644
--- a/dev-perl/Hash-MultiValue/metadata.xml
+++ b/dev-perl/Hash-MultiValue/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Hash-MultiValue</remote-id>
+    <remote-id type="cpan-module">Hash::MultiValue</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Hash-NoRef/metadata.xml b/dev-perl/Hash-NoRef/metadata.xml
index 031033502d45..8812b3d97168 100644
--- a/dev-perl/Hash-NoRef/metadata.xml
+++ b/dev-perl/Hash-NoRef/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Hash-NoRef</remote-id>
+    <remote-id type="cpan-module">Hash::NoRef</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Heap/metadata.xml b/dev-perl/Heap/metadata.xml
index f3dfed74b14f..4131b241f1b1 100644
--- a/dev-perl/Heap/metadata.xml
+++ b/dev-perl/Heap/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Heap</remote-id>
+    <remote-id type="cpan-module">Heap</remote-id>
+    <remote-id type="cpan-module">Heap::Binary</remote-id>
+    <remote-id type="cpan-module">Heap::Binomial</remote-id>
+    <remote-id type="cpan-module">Heap::Elem</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::Num</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::NumRev</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::Ref</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::RefRev</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::Str</remote-id>
+    <remote-id type="cpan-module">Heap::Elem::StrRev</remote-id>
+    <remote-id type="cpan-module">Heap::Fibonacci</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Hook-LexWrap/metadata.xml b/dev-perl/Hook-LexWrap/metadata.xml
index 23e05841ef73..56e803c326d8 100644
--- a/dev-perl/Hook-LexWrap/metadata.xml
+++ b/dev-perl/Hook-LexWrap/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Hook-LexWrap</remote-id>
+    <remote-id type="cpan-module">Hook::LexWrap</remote-id>
+    <remote-id type="cpan-module">Hook::LexWrap::Cleanup</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IMAP-Admin/metadata.xml b/dev-perl/IMAP-Admin/metadata.xml
index ba0b74950f0a..3fa78e222aee 100644
--- a/dev-perl/IMAP-Admin/metadata.xml
+++ b/dev-perl/IMAP-Admin/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IMAP-Admin</remote-id>
+    <remote-id type="cpan-module">IMAP::Admin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-AIO/metadata.xml b/dev-perl/IO-AIO/metadata.xml
index ed20b6beac0a..1a13e8812eeb 100644
--- a/dev-perl/IO-AIO/metadata.xml
+++ b/dev-perl/IO-AIO/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">IO-AIO</remote-id>
+    <remote-id type="cpan-module">IO::AIO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-All/metadata.xml b/dev-perl/IO-All/metadata.xml
index 625a7c00f3e4..636f0c6fdb9a 100644
--- a/dev-perl/IO-All/metadata.xml
+++ b/dev-perl/IO-All/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-All</remote-id>
+    <remote-id type="cpan-module">IO::All</remote-id>
+    <remote-id type="cpan-module">IO::All::Base</remote-id>
+    <remote-id type="cpan-module">IO::All::DBM</remote-id>
+    <remote-id type="cpan-module">IO::All::Dir</remote-id>
+    <remote-id type="cpan-module">IO::All::File</remote-id>
+    <remote-id type="cpan-module">IO::All::Filesys</remote-id>
+    <remote-id type="cpan-module">IO::All::Link</remote-id>
+    <remote-id type="cpan-module">IO::All::MLDBM</remote-id>
+    <remote-id type="cpan-module">IO::All::Pipe</remote-id>
+    <remote-id type="cpan-module">IO::All::STDIO</remote-id>
+    <remote-id type="cpan-module">IO::All::Socket</remote-id>
+    <remote-id type="cpan-module">IO::All::String</remote-id>
+    <remote-id type="cpan-module">IO::All::Temp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-BufferedSelect/metadata.xml b/dev-perl/IO-BufferedSelect/metadata.xml
index 23c778eccbaa..0d0ba3f6f168 100644
--- a/dev-perl/IO-BufferedSelect/metadata.xml
+++ b/dev-perl/IO-BufferedSelect/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">IO-BufferedSelect</remote-id>
+    <remote-id type="cpan-module">IO::BufferedSelect</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Capture/metadata.xml b/dev-perl/IO-Capture/metadata.xml
index 01b4e64ea2ab..f83e04c2715e 100644
--- a/dev-perl/IO-Capture/metadata.xml
+++ b/dev-perl/IO-Capture/metadata.xml
@@ -7,5 +7,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Capture</remote-id>
+    <remote-id type="cpan-module">IO::Capture</remote-id>
+    <remote-id type="cpan-module">IO::Capture::Stderr</remote-id>
+    <remote-id type="cpan-module">IO::Capture::Stdout</remote-id>
+    <remote-id type="cpan-module">IO::Capture::Tie_STDx</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Digest/metadata.xml b/dev-perl/IO-Digest/metadata.xml
index bda604d8dc00..52de4fee4822 100644
--- a/dev-perl/IO-Digest/metadata.xml
+++ b/dev-perl/IO-Digest/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Digest</remote-id>
+    <remote-id type="cpan-module">IO::Digest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Interface/metadata.xml b/dev-perl/IO-Interface/metadata.xml
index 2cdde17453dc..28edd64995e5 100644
--- a/dev-perl/IO-Interface/metadata.xml
+++ b/dev-perl/IO-Interface/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Interface</remote-id>
+    <remote-id type="cpan-module">IO::Interface</remote-id>
+    <remote-id type="cpan-module">IO::Interface::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-LockedFile/metadata.xml b/dev-perl/IO-LockedFile/metadata.xml
index 5a70f4988b8e..8445f31194fe 100644
--- a/dev-perl/IO-LockedFile/metadata.xml
+++ b/dev-perl/IO-LockedFile/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-LockedFile</remote-id>
+    <remote-id type="cpan-module">IO::LockedFile</remote-id>
+    <remote-id type="cpan-module">IO::LockedFile::Flock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Multiplex/metadata.xml b/dev-perl/IO-Multiplex/metadata.xml
index e839a0f160ce..973979842116 100644
--- a/dev-perl/IO-Multiplex/metadata.xml
+++ b/dev-perl/IO-Multiplex/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Multiplex</remote-id>
+    <remote-id type="cpan-module">IO::Multiplex</remote-id>
+    <remote-id type="cpan-module">IO::Multiplex::Handle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Pager/metadata.xml b/dev-perl/IO-Pager/metadata.xml
index 47e4fee6886d..6af72af582a0 100644
--- a/dev-perl/IO-Pager/metadata.xml
+++ b/dev-perl/IO-Pager/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Pager</remote-id>
+    <remote-id type="cpan-module">IO::Pager</remote-id>
+    <remote-id type="cpan-module">IO::Pager::Buffered</remote-id>
+    <remote-id type="cpan-module">IO::Pager::Page</remote-id>
+    <remote-id type="cpan-module">IO::Pager::Unbuffered</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Socket-INET6/metadata.xml b/dev-perl/IO-Socket-INET6/metadata.xml
index 93e22f1c2dfc..ae8ab76845fc 100644
--- a/dev-perl/IO-Socket-INET6/metadata.xml
+++ b/dev-perl/IO-Socket-INET6/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Socket-INET6</remote-id>
+    <remote-id type="cpan-module">IO::Socket::INET6</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-String/metadata.xml b/dev-perl/IO-String/metadata.xml
index 646f72976ebf..e6aec16673c8 100644
--- a/dev-perl/IO-String/metadata.xml
+++ b/dev-perl/IO-String/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-String</remote-id>
+    <remote-id type="cpan-module">IO::String</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Tee/metadata.xml b/dev-perl/IO-Tee/metadata.xml
index af8908f2a17f..3ee0b11b78b5 100644
--- a/dev-perl/IO-Tee/metadata.xml
+++ b/dev-perl/IO-Tee/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Tee</remote-id>
+    <remote-id type="cpan-module">IO::Tee</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Tty/metadata.xml b/dev-perl/IO-Tty/metadata.xml
index e74f5139be17..80b8a7073f6a 100644
--- a/dev-perl/IO-Tty/metadata.xml
+++ b/dev-perl/IO-Tty/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Tty</remote-id>
+    <remote-id type="cpan-module">IO::Pty</remote-id>
+    <remote-id type="cpan-module">IO::Tty</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Util/metadata.xml b/dev-perl/IO-Util/metadata.xml
index ad98599043d5..cf5e75a9da8b 100644
--- a/dev-perl/IO-Util/metadata.xml
+++ b/dev-perl/IO-Util/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Util</remote-id>
+    <remote-id type="cpan-module">IO::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-stringy/metadata.xml b/dev-perl/IO-stringy/metadata.xml
index dbe1941d3a56..113a1e38dd06 100644
--- a/dev-perl/IO-stringy/metadata.xml
+++ b/dev-perl/IO-stringy/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-stringy</remote-id>
+    <remote-id type="cpan-module">IO::AtomicFile</remote-id>
+    <remote-id type="cpan-module">IO::Clever</remote-id>
+    <remote-id type="cpan-module">IO::InnerFile</remote-id>
+    <remote-id type="cpan-module">IO::Lines</remote-id>
+    <remote-id type="cpan-module">IO::Scalar</remote-id>
+    <remote-id type="cpan-module">IO::ScalarArray</remote-id>
+    <remote-id type="cpan-module">IO::Stringy</remote-id>
+    <remote-id type="cpan-module">IO::Wrap</remote-id>
+    <remote-id type="cpan-module">IO::WrapTie</remote-id>
+    <remote-id type="cpan-module">IO::WrapTie::Master</remote-id>
+    <remote-id type="cpan-module">IO::WrapTie::Slave</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IP-Anonymous/metadata.xml b/dev-perl/IP-Anonymous/metadata.xml
index 187b172fbc10..19228b8aa97e 100644
--- a/dev-perl/IP-Anonymous/metadata.xml
+++ b/dev-perl/IP-Anonymous/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IP-Anonymous</remote-id>
+    <remote-id type="cpan-module">IP::Anonymous</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IP-Country/metadata.xml b/dev-perl/IP-Country/metadata.xml
index dea6da6bbc60..63b5db5f88c3 100644
--- a/dev-perl/IP-Country/metadata.xml
+++ b/dev-perl/IP-Country/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IP-Country</remote-id>
+    <remote-id type="cpan-module">IP::Authority</remote-id>
+    <remote-id type="cpan-module">IP::Country</remote-id>
+    <remote-id type="cpan-module">IP::Country::Fast</remote-id>
+    <remote-id type="cpan-module">IP::Country::MaxMind</remote-id>
+    <remote-id type="cpan-module">IP::Country::Medium</remote-id>
+    <remote-id type="cpan-module">IP::Country::Slow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-Run/metadata.xml b/dev-perl/IPC-Run/metadata.xml
index 43115853944e..02ff1de6dae0 100644
--- a/dev-perl/IPC-Run/metadata.xml
+++ b/dev-perl/IPC-Run/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-Run</remote-id>
+    <remote-id type="cpan-module">IPC::Run</remote-id>
+    <remote-id type="cpan-module">IPC::Run::Debug</remote-id>
+    <remote-id type="cpan-module">IPC::Run::IO</remote-id>
+    <remote-id type="cpan-module">IPC::Run::Timer</remote-id>
+    <remote-id type="cpan-module">IPC::Run::Win32Helper</remote-id>
+    <remote-id type="cpan-module">IPC::Run::Win32IO</remote-id>
+    <remote-id type="cpan-module">IPC::Run::Win32Pump</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-Run3/metadata.xml b/dev-perl/IPC-Run3/metadata.xml
index 92a2a0f43161..c7951d47146a 100644
--- a/dev-perl/IPC-Run3/metadata.xml
+++ b/dev-perl/IPC-Run3/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-Run3</remote-id>
+    <remote-id type="cpan-module">IPC::Run3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-ShareLite/metadata.xml b/dev-perl/IPC-ShareLite/metadata.xml
index a7ecd4d61250..c4b787ffd8d7 100644
--- a/dev-perl/IPC-ShareLite/metadata.xml
+++ b/dev-perl/IPC-ShareLite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-ShareLite</remote-id>
+    <remote-id type="cpan-module">IPC::ShareLite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-Shareable/metadata.xml b/dev-perl/IPC-Shareable/metadata.xml
index 237295ca4e31..ab14d96293da 100644
--- a/dev-perl/IPC-Shareable/metadata.xml
+++ b/dev-perl/IPC-Shareable/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-Shareable</remote-id>
+    <remote-id type="cpan-module">IPC::Shareable</remote-id>
+    <remote-id type="cpan-module">IPC::Shareable::SharedMem</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-Signal/metadata.xml b/dev-perl/IPC-Signal/metadata.xml
index be6619994c09..c90699255c46 100644
--- a/dev-perl/IPC-Signal/metadata.xml
+++ b/dev-perl/IPC-Signal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-Signal</remote-id>
+    <remote-id type="cpan-module">IPC::Signal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IPC-System-Simple/metadata.xml b/dev-perl/IPC-System-Simple/metadata.xml
index 31ecdaa136f9..4f1c19de0522 100644
--- a/dev-perl/IPC-System-Simple/metadata.xml
+++ b/dev-perl/IPC-System-Simple/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">IPC-System-Simple</remote-id>
+		<remote-id type="cpan-module">IPC::System::Simple</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Ima-DBI/metadata.xml b/dev-perl/Ima-DBI/metadata.xml
index bb57a039d2f7..1a9ccb8d2644 100644
--- a/dev-perl/Ima-DBI/metadata.xml
+++ b/dev-perl/Ima-DBI/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Ima-DBI</remote-id>
+    <remote-id type="cpan-module">Ima::DBI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Image-Imlib2/metadata.xml b/dev-perl/Image-Imlib2/metadata.xml
index 24b833b0b811..786690e41994 100644
--- a/dev-perl/Image-Imlib2/metadata.xml
+++ b/dev-perl/Image-Imlib2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Image-Imlib2</remote-id>
+    <remote-id type="cpan-module">Image::Imlib2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Image-Scale/metadata.xml b/dev-perl/Image-Scale/metadata.xml
index d16accb01ee5..71d60d822491 100644
--- a/dev-perl/Image-Scale/metadata.xml
+++ b/dev-perl/Image-Scale/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Image-Scale</remote-id>
+    <remote-id type="cpan-module">Image::Scale</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ImageInfo/metadata.xml b/dev-perl/ImageInfo/metadata.xml
index 00a204defcc9..4b6ee2e0e151 100644
--- a/dev-perl/ImageInfo/metadata.xml
+++ b/dev-perl/ImageInfo/metadata.xml
@@ -4,5 +4,26 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Image-Info</remote-id>
+    <remote-id type="cpan-module">Bundle::Image::Info::Everything</remote-id>
+    <remote-id type="cpan-module">Bundle::Image::Info::PNG</remote-id>
+    <remote-id type="cpan-module">Bundle::Image::Info::SVG</remote-id>
+    <remote-id type="cpan-module">Bundle::Image::Info::XBM</remote-id>
+    <remote-id type="cpan-module">Bundle::Image::Info::XPM</remote-id>
+    <remote-id type="cpan-module">Image::Info</remote-id>
+    <remote-id type="cpan-module">Image::Info::BMP</remote-id>
+    <remote-id type="cpan-module">Image::Info::GIF</remote-id>
+    <remote-id type="cpan-module">Image::Info::ICO</remote-id>
+    <remote-id type="cpan-module">Image::Info::JPEG</remote-id>
+    <remote-id type="cpan-module">Image::Info::PNG</remote-id>
+    <remote-id type="cpan-module">Image::Info::PPM</remote-id>
+    <remote-id type="cpan-module">Image::Info::Result</remote-id>
+    <remote-id type="cpan-module">Image::Info::SVG</remote-id>
+    <remote-id type="cpan-module">Image::Info::SVG::XMLLibXMLReader</remote-id>
+    <remote-id type="cpan-module">Image::Info::SVG::XMLSimple</remote-id>
+    <remote-id type="cpan-module">Image::Info::TIFF</remote-id>
+    <remote-id type="cpan-module">Image::Info::XBM</remote-id>
+    <remote-id type="cpan-module">Image::Info::XPM</remote-id>
+    <remote-id type="cpan-module">Image::TIFF</remote-id>
+    <remote-id type="cpan-module">Image::TIFF::Rational</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ImageSize/metadata.xml b/dev-perl/ImageSize/metadata.xml
index 31b2277eddc9..804238efada6 100644
--- a/dev-perl/ImageSize/metadata.xml
+++ b/dev-perl/ImageSize/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Image-Size</remote-id>
+    <remote-id type="cpan-module">Image::Size</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Inline-Python/metadata.xml b/dev-perl/Inline-Python/metadata.xml
index 3b8ace2039a8..4c1f6a4f464c 100644
--- a/dev-perl/Inline-Python/metadata.xml
+++ b/dev-perl/Inline-Python/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Inline-Python</remote-id>
+    <remote-id type="cpan-module">Inline::Python</remote-id>
+    <remote-id type="cpan-module">Inline::Python::Function</remote-id>
+    <remote-id type="cpan-module">Inline::Python::Object</remote-id>
+    <remote-id type="cpan-module">Inline::Python::Object::Data</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Inline/metadata.xml b/dev-perl/Inline/metadata.xml
index a029fb6e5aac..488b00aecebf 100644
--- a/dev-perl/Inline/metadata.xml
+++ b/dev-perl/Inline/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Inline</remote-id>
+    <remote-id type="cpan-module">Foo::Tester</remote-id>
+    <remote-id type="cpan-module">Inline</remote-id>
+    <remote-id type="cpan-module">Inline::C</remote-id>
+    <remote-id type="cpan-module">Inline::C::ParseRecDescent</remote-id>
+    <remote-id type="cpan-module">Inline::C::ParseRegExp</remote-id>
+    <remote-id type="cpan-module">Inline::Foo</remote-id>
+    <remote-id type="cpan-module">Inline::MakeMaker</remote-id>
+    <remote-id type="cpan-module">Inline::denter</remote-id>
+    <remote-id type="cpan-module">Math::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JSON-Any/metadata.xml b/dev-perl/JSON-Any/metadata.xml
index 4734133c3926..d95613f0e822 100644
--- a/dev-perl/JSON-Any/metadata.xml
+++ b/dev-perl/JSON-Any/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">JSON-Any</remote-id>
+    <remote-id type="cpan-module">JSON::Any</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JSON-RPC/metadata.xml b/dev-perl/JSON-RPC/metadata.xml
index 9e77dac8ba26..f98b8b111dfe 100644
--- a/dev-perl/JSON-RPC/metadata.xml
+++ b/dev-perl/JSON-RPC/metadata.xml
@@ -4,5 +4,22 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">JSON-RPC</remote-id>
+    <remote-id type="cpan-module">JSON::RPC</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Constants</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Dispatch</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Client</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Procedure</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::ReturnObject</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server::Apache</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server::Apache2</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server::CGI</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server::Daemon</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::Server::system</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Legacy::ServiceObject</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Parser</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Procedure</remote-id>
+    <remote-id type="cpan-module">JSON::RPC::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml b/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
index bf40bb31fee5..3d7903ae57fd 100644
--- a/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
+++ b/dev-perl/JSON-XS-VersionOneAndTwo/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">JSON-XS-VersionOneAndTwo</remote-id>
+    <remote-id type="cpan-module">JSON::XS::VersionOneAndTwo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JSON-XS/metadata.xml b/dev-perl/JSON-XS/metadata.xml
index 334476d1d49c..ccf3411c6cfb 100644
--- a/dev-perl/JSON-XS/metadata.xml
+++ b/dev-perl/JSON-XS/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">JSON-XS</remote-id>
+    <remote-id type="cpan-module">JSON::XS</remote-id>
+    <remote-id type="cpan-module">JSON::XS::Boolean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JSON/metadata.xml b/dev-perl/JSON/metadata.xml
index 6ef5981ff4e5..71f7c40c070b 100644
--- a/dev-perl/JSON/metadata.xml
+++ b/dev-perl/JSON/metadata.xml
@@ -8,5 +8,13 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">JSON</remote-id>
+    <remote-id type="cpan-module">JSON</remote-id>
+    <remote-id type="cpan-module">JSON::Backend::PP</remote-id>
+    <remote-id type="cpan-module">JSON::Boolean</remote-id>
+    <remote-id type="cpan-module">JSON::PP</remote-id>
+    <remote-id type="cpan-module">JSON::PP5005</remote-id>
+    <remote-id type="cpan-module">JSON::PP56</remote-id>
+    <remote-id type="cpan-module">JSON::PP::IncrParser</remote-id>
+    <remote-id type="cpan-module">JSON::backportPP::Boolean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JavaScript-Minifier/metadata.xml b/dev-perl/JavaScript-Minifier/metadata.xml
index 3bf9397060b9..5e64ef090b6a 100644
--- a/dev-perl/JavaScript-Minifier/metadata.xml
+++ b/dev-perl/JavaScript-Minifier/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">JavaScript-Minifier</remote-id>
+    <remote-id type="cpan-module">JavaScript::Minifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/JavaScript-SpiderMonkey/metadata.xml b/dev-perl/JavaScript-SpiderMonkey/metadata.xml
index c81aa69ce335..9609720785a1 100644
--- a/dev-perl/JavaScript-SpiderMonkey/metadata.xml
+++ b/dev-perl/JavaScript-SpiderMonkey/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">JavaScript-SpiderMonkey</remote-id>
+    <remote-id type="cpan-module">JavaScript::SpiderMonkey</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Jcode/metadata.xml b/dev-perl/Jcode/metadata.xml
index 55495960c6a9..2f6e8e8a58fa 100644
--- a/dev-perl/Jcode/metadata.xml
+++ b/dev-perl/Jcode/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Jcode</remote-id>
+    <remote-id type="cpan-module">Jcode</remote-id>
+    <remote-id type="cpan-module">Jcode::Constants</remote-id>
+    <remote-id type="cpan-module">Jcode::H2Z</remote-id>
+    <remote-id type="cpan-module">Jcode::Tr</remote-id>
+    <remote-id type="cpan-module">Jcode::Unicode</remote-id>
+    <remote-id type="cpan-module">Jcode::Unicode::Constants</remote-id>
+    <remote-id type="cpan-module">Jcode::Unicode::NoXS</remote-id>
+    <remote-id type="cpan-module">Jcode::_Classic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/LWP-Authen-Wsse/metadata.xml b/dev-perl/LWP-Authen-Wsse/metadata.xml
index c7c815c67239..b4e34d0fb885 100644
--- a/dev-perl/LWP-Authen-Wsse/metadata.xml
+++ b/dev-perl/LWP-Authen-Wsse/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">LWP-Authen-Wsse</remote-id>
+    <remote-id type="cpan-module">LWP::Authen::Wsse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/LWP-MediaTypes/metadata.xml b/dev-perl/LWP-MediaTypes/metadata.xml
index e018587c5fbb..6518d8c41521 100644
--- a/dev-perl/LWP-MediaTypes/metadata.xml
+++ b/dev-perl/LWP-MediaTypes/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">LWP-MediaTypes</remote-id>
+		<remote-id type="cpan-module">LWP::MediaTypes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/LWP-Protocol-https/metadata.xml b/dev-perl/LWP-Protocol-https/metadata.xml
index 22a5a75d2501..4a0ec0000a27 100644
--- a/dev-perl/LWP-Protocol-https/metadata.xml
+++ b/dev-perl/LWP-Protocol-https/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">LWP-Protocol-https</remote-id>
+		<remote-id type="cpan-module">LWP::Protocol::https</remote-id>
+		<remote-id type="cpan-module">LWP::Protocol::https::Socket</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/LWP-UserAgent-Determined/metadata.xml b/dev-perl/LWP-UserAgent-Determined/metadata.xml
index bc863820eece..cc7679008756 100644
--- a/dev-perl/LWP-UserAgent-Determined/metadata.xml
+++ b/dev-perl/LWP-UserAgent-Determined/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">LWP-UserAgent-Determined</remote-id>
+    <remote-id type="cpan-module">LWP::UserAgent::Determined</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/LWPx-ParanoidAgent/metadata.xml b/dev-perl/LWPx-ParanoidAgent/metadata.xml
index a3259a6e193d..d0311261bade 100644
--- a/dev-perl/LWPx-ParanoidAgent/metadata.xml
+++ b/dev-perl/LWPx-ParanoidAgent/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">LWPx-ParanoidAgent</remote-id>
+    <remote-id type="cpan-module">LWPx::ParanoidAgent</remote-id>
+    <remote-id type="cpan-module">LWPx::Protocol::http_paranoid</remote-id>
+    <remote-id type="cpan-module">LWPx::Protocol::http_paranoid::Socket</remote-id>
+    <remote-id type="cpan-module">LWPx::Protocol::http_paranoid::SocketMethods</remote-id>
+    <remote-id type="cpan-module">LWPx::Protocol::https_paranoid</remote-id>
+    <remote-id type="cpan-module">LWPx::Protocol::https_paranoid::Socket</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lab-Measurement/metadata.xml b/dev-perl/Lab-Measurement/metadata.xml
index acb0ea1b5364..fc9289ec31b0 100644
--- a/dev-perl/Lab-Measurement/metadata.xml
+++ b/dev-perl/Lab-Measurement/metadata.xml
@@ -8,5 +8,45 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Lab-Measurement</remote-id>
+		<remote-id type="cpan-module">Lab::Bus</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::DEBUG</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::IsoBus</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::LinuxGPIB</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::MODBUS_RS232</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::RS232</remote-id>
+		<remote-id type="cpan-module">Lab::Bus::VISA</remote-id>
+		<remote-id type="cpan-module">Lab::Connection</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::DEBUG</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::GPIB</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::IsoBus</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::LinuxGPIB</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::MODBUS_RS232</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::VISA</remote-id>
+		<remote-id type="cpan-module">Lab::Connection::VISA_GPIB</remote-id>
+		<remote-id type="cpan-module">Lab::Data::Meta</remote-id>
+		<remote-id type="cpan-module">Lab::Data::PDL</remote-id>
+		<remote-id type="cpan-module">Lab::Data::Plotter</remote-id>
+		<remote-id type="cpan-module">Lab::Data::Writer</remote-id>
+		<remote-id type="cpan-module">Lab::Data::XMLtree</remote-id>
+		<remote-id type="cpan-module">Lab::Exception</remote-id>
+		<remote-id type="cpan-module">Lab::Exception::Base</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::DummySource</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::HP34401A</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::HP3458A</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::HP83732A</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::ILM</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::IPS12010</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::ITC503</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::MagnetSupply</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::Multimeter</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::SR830</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::Source</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::TRMC2</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::TemperatureControl::TLK43</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::Yokogawa7651</remote-id>
+		<remote-id type="cpan-module">Lab::Instrument::YokogawaGS200</remote-id>
+		<remote-id type="cpan-module">Lab::Measurement</remote-id>
+		<remote-id type="cpan-module">Lab::Measurement::Ladediagramm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lchown/metadata.xml b/dev-perl/Lchown/metadata.xml
index 19cd28aa087c..1955106e0e96 100644
--- a/dev-perl/Lchown/metadata.xml
+++ b/dev-perl/Lchown/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
   <email>jlec@gentoo.org</email>
-</maintainer>
-<herd>perl</herd>
+  </maintainer>
+  <herd>perl</herd>
   <upstream>
-    <remote-id type="cpan">Lchown</remote-id>
+  <remote-id type="cpan">Lchown</remote-id>
+  <remote-id type="cpan-module">Lchown</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lexical-Persistence/metadata.xml b/dev-perl/Lexical-Persistence/metadata.xml
index 7c03e02b3133..26abfc20ac56 100644
--- a/dev-perl/Lexical-Persistence/metadata.xml
+++ b/dev-perl/Lexical-Persistence/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Lexical-Persistence</remote-id>
+    <remote-id type="cpan-module">Lexical::Persistence</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-EN-Inflect/metadata.xml b/dev-perl/Lingua-EN-Inflect/metadata.xml
index a3a420826dae..194460dbe836 100644
--- a/dev-perl/Lingua-EN-Inflect/metadata.xml
+++ b/dev-perl/Lingua-EN-Inflect/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-EN-Inflect</remote-id>
+    <remote-id type="cpan-module">Lingua::EN::Inflect</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-EN-NameParse/metadata.xml b/dev-perl/Lingua-EN-NameParse/metadata.xml
index 4e0def92b75e..ebdbbf806355 100644
--- a/dev-perl/Lingua-EN-NameParse/metadata.xml
+++ b/dev-perl/Lingua-EN-NameParse/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-EN-NameParse</remote-id>
+    <remote-id type="cpan-module">Lingua::EN::NameParse</remote-id>
+    <remote-id type="cpan-module">Lingua::EN::NameParse::Grammar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml b/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
index c8e54c61a96e..9f6e0c5e951f 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-EN-Numbers-Ordinate</remote-id>
+    <remote-id type="cpan-module">Lingua::EN::Numbers::Ordinate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-PT-Stemmer/metadata.xml b/dev-perl/Lingua-PT-Stemmer/metadata.xml
index 0d4317c9c576..d199b0249fab 100644
--- a/dev-perl/Lingua-PT-Stemmer/metadata.xml
+++ b/dev-perl/Lingua-PT-Stemmer/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-PT-Stemmer</remote-id>
+    <remote-id type="cpan-module">Lingua::GL::Stemmer</remote-id>
+    <remote-id type="cpan-module">Lingua::PT::Stemmer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Preferred/metadata.xml b/dev-perl/Lingua-Preferred/metadata.xml
index 12413c8a0540..1f928ebcb118 100644
--- a/dev-perl/Lingua-Preferred/metadata.xml
+++ b/dev-perl/Lingua-Preferred/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Preferred</remote-id>
+    <remote-id type="cpan-module">Lingua::Preferred</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Stem-Fr/metadata.xml b/dev-perl/Lingua-Stem-Fr/metadata.xml
index 5b39098c6e5b..63cbbcbb5237 100644
--- a/dev-perl/Lingua-Stem-Fr/metadata.xml
+++ b/dev-perl/Lingua-Stem-Fr/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Fr</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Fr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Stem-It/metadata.xml b/dev-perl/Lingua-Stem-It/metadata.xml
index 43efbddb0e3b..8c1897933ef5 100644
--- a/dev-perl/Lingua-Stem-It/metadata.xml
+++ b/dev-perl/Lingua-Stem-It/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-It</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::It</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Stem-Ru/metadata.xml b/dev-perl/Lingua-Stem-Ru/metadata.xml
index a41640c5a7b8..20ec1f5c54bc 100644
--- a/dev-perl/Lingua-Stem-Ru/metadata.xml
+++ b/dev-perl/Lingua-Stem-Ru/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Ru</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Ru</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml b/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
index fcc39bdae4b1..44e1b2c129cc 100644
--- a/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
+++ b/dev-perl/Lingua-Stem-Snowball-Da/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Stem-Snowball-Da</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Snowball::Da</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lingua-Stem/metadata.xml b/dev-perl/Lingua-Stem/metadata.xml
index 75edb38bdafc..e1e070b2c0e9 100644
--- a/dev-perl/Lingua-Stem/metadata.xml
+++ b/dev-perl/Lingua-Stem/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lingua-Stem</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::AutoLoader</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Da</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::De</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::En</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::EnBroken</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Gl</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::No</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Pt</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Sv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Linux-Inotify2/metadata.xml b/dev-perl/Linux-Inotify2/metadata.xml
index c20a84ca33da..5453c8b55cac 100644
--- a/dev-perl/Linux-Inotify2/metadata.xml
+++ b/dev-perl/Linux-Inotify2/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Linux-Inotify2</remote-id>
+    <remote-id type="cpan-module">Linux::Inotify2</remote-id>
+    <remote-id type="cpan-module">Linux::Inotify2::Event</remote-id>
+    <remote-id type="cpan-module">Linux::Inotify2::Watch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Linux-Pid/metadata.xml b/dev-perl/Linux-Pid/metadata.xml
index 03ed519f7e5c..dadb58b767ca 100644
--- a/dev-perl/Linux-Pid/metadata.xml
+++ b/dev-perl/Linux-Pid/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Linux-Pid</remote-id>
+		<remote-id type="cpan-module">Linux::Pid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Linux-Smaps/metadata.xml b/dev-perl/Linux-Smaps/metadata.xml
index 3afa537b1f83..02bc427e1f72 100644
--- a/dev-perl/Linux-Smaps/metadata.xml
+++ b/dev-perl/Linux-Smaps/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Linux-Smaps</remote-id>
+    <remote-id type="cpan-module">Linux::Smaps</remote-id>
+    <remote-id type="cpan-module">Linux::Smaps::VMA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lirc-Client/metadata.xml b/dev-perl/Lirc-Client/metadata.xml
index 8deae5857799..70df497571b3 100644
--- a/dev-perl/Lirc-Client/metadata.xml
+++ b/dev-perl/Lirc-Client/metadata.xml
@@ -5,5 +5,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Lirc-Client</remote-id>
+    <remote-id type="cpan-module">Lirc::Client</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/List-AllUtils/metadata.xml b/dev-perl/List-AllUtils/metadata.xml
index 413ef4c5118c..b2adbd6c1080 100644
--- a/dev-perl/List-AllUtils/metadata.xml
+++ b/dev-perl/List-AllUtils/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">List-AllUtils</remote-id>
+    <remote-id type="cpan-module">List::AllUtils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/List-MoreUtils/metadata.xml b/dev-perl/List-MoreUtils/metadata.xml
index d6d7436bf930..39ba20d2822d 100644
--- a/dev-perl/List-MoreUtils/metadata.xml
+++ b/dev-perl/List-MoreUtils/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">List-MoreUtils</remote-id>
+    <remote-id type="cpan-module">List::MoreUtils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/List-UtilsBy/metadata.xml b/dev-perl/List-UtilsBy/metadata.xml
index 9d2f3a9593e8..8addc1399668 100644
--- a/dev-perl/List-UtilsBy/metadata.xml
+++ b/dev-perl/List-UtilsBy/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">List-UtilsBy</remote-id>
+    <remote-id type="cpan-module">List::UtilsBy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Locale-Msgfmt/metadata.xml b/dev-perl/Locale-Msgfmt/metadata.xml
index 22577e83ade2..9ba58c5c0a6b 100644
--- a/dev-perl/Locale-Msgfmt/metadata.xml
+++ b/dev-perl/Locale-Msgfmt/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-Msgfmt</remote-id>
+    <remote-id type="cpan-module">Locale::Msgfmt</remote-id>
+    <remote-id type="cpan-module">Locale::Msgfmt::Utils</remote-id>
+    <remote-id type="cpan-module">Locale::Msgfmt::mo</remote-id>
+    <remote-id type="cpan-module">Locale::Msgfmt::po</remote-id>
+    <remote-id type="cpan-module">Module::Install::Msgfmt</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Locale-PO/metadata.xml b/dev-perl/Locale-PO/metadata.xml
index 1fa1c373bc17..3feab6eb09b1 100644
--- a/dev-perl/Locale-PO/metadata.xml
+++ b/dev-perl/Locale-PO/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-PO</remote-id>
+    <remote-id type="cpan-module">Locale::PO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Locale-gettext/metadata.xml b/dev-perl/Locale-gettext/metadata.xml
index 7c5dda59ebf8..e7805924ec21 100644
--- a/dev-perl/Locale-gettext/metadata.xml
+++ b/dev-perl/Locale-gettext/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">gettext</remote-id>
+    <remote-id type="cpan-module">Locale::gettext</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/LockFile-Simple/metadata.xml b/dev-perl/LockFile-Simple/metadata.xml
index a5be03700527..1f2c628628e6 100644
--- a/dev-perl/LockFile-Simple/metadata.xml
+++ b/dev-perl/LockFile-Simple/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">LockFile-Simple</remote-id>
+    <remote-id type="cpan-module">LockFile::Lock</remote-id>
+    <remote-id type="cpan-module">LockFile::Lock::Simple</remote-id>
+    <remote-id type="cpan-module">LockFile::Manager</remote-id>
+    <remote-id type="cpan-module">LockFile::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Log-Agent/metadata.xml b/dev-perl/Log-Agent/metadata.xml
index 3230c043064d..b25bc1c41203 100644
--- a/dev-perl/Log-Agent/metadata.xml
+++ b/dev-perl/Log-Agent/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Log-Agent</remote-id>
+    <remote-id type="cpan-module">Log::Agent</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Channel</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Channel::File</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Channel::Handle</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Channel::Syslog</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Datum</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Default</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::File</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Fork</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Mail</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Silent</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Driver::Syslog</remote-id>
+    <remote-id type="cpan-module">Log::Agent::File::Native</remote-id>
+    <remote-id type="cpan-module">Log::Agent::File_Pool</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Formatting</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Message</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Prefixer</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Priorities</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Stamping</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag::Callback</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag::Caller</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag::Priority</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag::String</remote-id>
+    <remote-id type="cpan-module">Log::Agent::Tag_List</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Log-Any/metadata.xml b/dev-perl/Log-Any/metadata.xml
index 281e09cb0051..148f76af9b29 100644
--- a/dev-perl/Log-Any/metadata.xml
+++ b/dev-perl/Log-Any/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Log-Any</remote-id>
+    <remote-id type="cpan-module">Log::Any</remote-id>
+    <remote-id type="cpan-module">Log::Any::Adapter</remote-id>
+    <remote-id type="cpan-module">Log::Any::Adapter::Null</remote-id>
+    <remote-id type="cpan-module">Log::Any::Adapter::Test</remote-id>
+    <remote-id type="cpan-module">Log::Any::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Log-Log4perl/metadata.xml b/dev-perl/Log-Log4perl/metadata.xml
index 3da33b7cb701..9279eb28c617 100644
--- a/dev-perl/Log-Log4perl/metadata.xml
+++ b/dev-perl/Log-Log4perl/metadata.xml
@@ -4,5 +4,54 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Log-Log4perl</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::Buffer</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::DBI</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::File</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::Limit</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::RRDs</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::Screen</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::ScreenColoredLevels</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::Socket</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::String</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::Synchronized</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::TestArrayBuffer</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::TestBuffer</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Appender::TestFileCreeper</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Catalyst</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Config</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Config::BaseConfigurator</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Config::DOMConfigurator</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Config::PropertyConfigurator</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Config::Watch</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::DateFormat</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Filter</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Filter::Boolean</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Filter::LevelMatch</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Filter::LevelRange</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Filter::StringMatch</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::InternalDebug</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::ConsoleAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::FileAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::JDBCAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::NTEventLogAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::RollingFileAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::SyslogAppender</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::JavaMap::TestBuffer</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Layout</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Layout::NoopLayout</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Layout::PatternLayout</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Layout::PatternLayout::Multiline</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Layout::SimpleLayout</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Level</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Logger</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::MDC</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::NDC</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Resurrector</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Util</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Util::Semaphore</remote-id>
+    <remote-id type="cpan-module">Log::Log4perl::Util::TimeTracker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0.ebuild
new file mode 100644
index 000000000000..75d0a9b07552
--- /dev/null
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0.ebuild,v 1.1 2012/06/23 18:39:07 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=EDAVIS
+MODULE_VERSION=1.4
+inherit perl-module
+
+DESCRIPTION="Logging/debugging aid"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/HTML-FromText-1.004"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Log-TraceMessages/metadata.xml b/dev-perl/Log-TraceMessages/metadata.xml
index 38f3a937b2ab..e15ce2291240 100644
--- a/dev-perl/Log-TraceMessages/metadata.xml
+++ b/dev-perl/Log-TraceMessages/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Log-TraceMessages</remote-id>
+    <remote-id type="cpan-module">Log::TraceMessages</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lucene/metadata.xml b/dev-perl/Lucene/metadata.xml
index 544c02eb94c9..11508888eaaf 100644
--- a/dev-perl/Lucene/metadata.xml
+++ b/dev-perl/Lucene/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Lucene</remote-id>
+    <remote-id type="cpan-module">Lucene</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MARC-Charset/metadata.xml b/dev-perl/MARC-Charset/metadata.xml
index c9ab26234257..06dd4012b932 100644
--- a/dev-perl/MARC-Charset/metadata.xml
+++ b/dev-perl/MARC-Charset/metadata.xml
@@ -8,5 +8,10 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-Charset</remote-id>
+    <remote-id type="cpan-module">MARC::Charset</remote-id>
+    <remote-id type="cpan-module">MARC::Charset::Code</remote-id>
+    <remote-id type="cpan-module">MARC::Charset::Compiler</remote-id>
+    <remote-id type="cpan-module">MARC::Charset::Constants</remote-id>
+    <remote-id type="cpan-module">MARC::Charset::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MARC-Record/metadata.xml b/dev-perl/MARC-Record/metadata.xml
index a916d3487bd5..976efc669817 100644
--- a/dev-perl/MARC-Record/metadata.xml
+++ b/dev-perl/MARC-Record/metadata.xml
@@ -8,5 +8,12 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-Record</remote-id>
+    <remote-id type="cpan-module">MARC::Batch</remote-id>
+    <remote-id type="cpan-module">MARC::Field</remote-id>
+    <remote-id type="cpan-module">MARC::File</remote-id>
+    <remote-id type="cpan-module">MARC::File::Encode</remote-id>
+    <remote-id type="cpan-module">MARC::File::MicroLIF</remote-id>
+    <remote-id type="cpan-module">MARC::File::USMARC</remote-id>
+    <remote-id type="cpan-module">MARC::Record</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MARC-XML/metadata.xml b/dev-perl/MARC-XML/metadata.xml
index f705193c7e73..22540ddb128f 100644
--- a/dev-perl/MARC-XML/metadata.xml
+++ b/dev-perl/MARC-XML/metadata.xml
@@ -8,5 +8,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MARC-XML</remote-id>
+    <remote-id type="cpan-module">MARC::File::SAX</remote-id>
+    <remote-id type="cpan-module">MARC::File::XML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MD5/metadata.xml b/dev-perl/MD5/metadata.xml
index 102ecbc081ea..e1ac3b6f2c0d 100644
--- a/dev-perl/MD5/metadata.xml
+++ b/dev-perl/MD5/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MD5</remote-id>
+    <remote-id type="cpan-module">MD5</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MIME-Charset/metadata.xml b/dev-perl/MIME-Charset/metadata.xml
index 5ebea841252e..87eec2242476 100644
--- a/dev-perl/MIME-Charset/metadata.xml
+++ b/dev-perl/MIME-Charset/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MIME-Charset</remote-id>
+    <remote-id type="cpan-module">MIME::Charset</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MIME-EncWords/metadata.xml b/dev-perl/MIME-EncWords/metadata.xml
index e94de9fd9c7f..cf46ca88badd 100644
--- a/dev-perl/MIME-EncWords/metadata.xml
+++ b/dev-perl/MIME-EncWords/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MIME-EncWords</remote-id>
+    <remote-id type="cpan-module">Encode::MIME::EncWords</remote-id>
+    <remote-id type="cpan-module">MIME::EncWords</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MIME-Lite/metadata.xml b/dev-perl/MIME-Lite/metadata.xml
index ecee4c48236d..ef99fcc4d303 100644
--- a/dev-perl/MIME-Lite/metadata.xml
+++ b/dev-perl/MIME-Lite/metadata.xml
@@ -4,5 +4,11 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">MIME-Lite</remote-id>
+		<remote-id type="cpan-module">MIME::Lite</remote-id>
+		<remote-id type="cpan-module">MIME::Lite::IO_Handle</remote-id>
+		<remote-id type="cpan-module">MIME::Lite::IO_Scalar</remote-id>
+		<remote-id type="cpan-module">MIME::Lite::IO_ScalarArray</remote-id>
+		<remote-id type="cpan-module">MIME::Lite::SMTP</remote-id>
+		<remote-id type="cpan-module">MailTool</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/MIME-tools/metadata.xml b/dev-perl/MIME-tools/metadata.xml
index e3fc80a183dc..ca4ac1b996cd 100644
--- a/dev-perl/MIME-tools/metadata.xml
+++ b/dev-perl/MIME-tools/metadata.xml
@@ -4,5 +4,35 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">MIME-tools</remote-id>
+		<remote-id type="cpan-module">MIME::Body</remote-id>
+		<remote-id type="cpan-module">MIME::Body::File</remote-id>
+		<remote-id type="cpan-module">MIME::Body::InCore</remote-id>
+		<remote-id type="cpan-module">MIME::Body::Scalar</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::Base64</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::BinHex</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::Binary</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::Gzip64</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::NBit</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::QuotedPrint</remote-id>
+		<remote-id type="cpan-module">MIME::Decoder::UU</remote-id>
+		<remote-id type="cpan-module">MIME::Entity</remote-id>
+		<remote-id type="cpan-module">MIME::Field::ConTraEnc</remote-id>
+		<remote-id type="cpan-module">MIME::Field::ContDisp</remote-id>
+		<remote-id type="cpan-module">MIME::Field::ContType</remote-id>
+		<remote-id type="cpan-module">MIME::Field::ParamVal</remote-id>
+		<remote-id type="cpan-module">MIME::Head</remote-id>
+		<remote-id type="cpan-module">MIME::Parser</remote-id>
+		<remote-id type="cpan-module">MIME::Parser::FileInto</remote-id>
+		<remote-id type="cpan-module">MIME::Parser::FileUnder</remote-id>
+		<remote-id type="cpan-module">MIME::Parser::Filer</remote-id>
+		<remote-id type="cpan-module">MIME::Parser::Reader</remote-id>
+		<remote-id type="cpan-module">MIME::Parser::Results</remote-id>
+		<remote-id type="cpan-module">MIME::Tools</remote-id>
+		<remote-id type="cpan-module">MIME::WordDecoder</remote-id>
+		<remote-id type="cpan-module">MIME::WordDecoder::ISO_8859</remote-id>
+		<remote-id type="cpan-module">MIME::WordDecoder::US_ASCII</remote-id>
+		<remote-id type="cpan-module">MIME::WordDecoder::UTF_8</remote-id>
+		<remote-id type="cpan-module">MIME::Words</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/MLDBM-Sync/metadata.xml b/dev-perl/MLDBM-Sync/metadata.xml
index 95cfb94a55d4..aa143c670e37 100644
--- a/dev-perl/MLDBM-Sync/metadata.xml
+++ b/dev-perl/MLDBM-Sync/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MLDBM-Sync</remote-id>
+    <remote-id type="cpan-module">MLDBM::Sync</remote-id>
+    <remote-id type="cpan-module">MLDBM::Sync::SDBM_File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MLDBM/metadata.xml b/dev-perl/MLDBM/metadata.xml
index 15397efc2eb3..49f082315ffc 100644
--- a/dev-perl/MLDBM/metadata.xml
+++ b/dev-perl/MLDBM/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MLDBM</remote-id>
+    <remote-id type="cpan-module">MLDBM</remote-id>
+    <remote-id type="cpan-module">MLDBM::Serializer</remote-id>
+    <remote-id type="cpan-module">MLDBM::Serializer::Data::Dumper</remote-id>
+    <remote-id type="cpan-module">MLDBM::Serializer::FreezeThaw</remote-id>
+    <remote-id type="cpan-module">MLDBM::Serializer::Storable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MP3-Info/metadata.xml b/dev-perl/MP3-Info/metadata.xml
index d6fad37ecc58..81c5914d95b0 100644
--- a/dev-perl/MP3-Info/metadata.xml
+++ b/dev-perl/MP3-Info/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MP3-Info</remote-id>
+    <remote-id type="cpan-module">MP3::Info</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MP3-Tag/metadata.xml b/dev-perl/MP3-Tag/metadata.xml
index 31fc85b02494..a972af2cd483 100644
--- a/dev-perl/MP3-Tag/metadata.xml
+++ b/dev-perl/MP3-Tag/metadata.xml
@@ -5,5 +5,21 @@
   <herd>sound</herd>
   <upstream>
     <remote-id type="cpan">MP3-Tag</remote-id>
+    <remote-id type="cpan-module">Encode::transliterate_win1251</remote-id>
+    <remote-id type="cpan-module">MP3::Tag</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::CDDB_File</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::Cue</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::File</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::ID3v1</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::ID3v2</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::ImageExifTool</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::ImageSize</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::Implemenation</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::Inf</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::LastResort</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::ParseData</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::__hasparent</remote-id>
+    <remote-id type="cpan-module">MP3::Tag::__proxy</remote-id>
+    <remote-id type="cpan-module">Normalize::Text::Music_Fields</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MRO-Compat/metadata.xml b/dev-perl/MRO-Compat/metadata.xml
index fc4b1f53681c..6ceb53b836c8 100644
--- a/dev-perl/MRO-Compat/metadata.xml
+++ b/dev-perl/MRO-Compat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MRO-Compat</remote-id>
+    <remote-id type="cpan-module">MRO::Compat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mac-Pasteboard/metadata.xml b/dev-perl/Mac-Pasteboard/metadata.xml
index b898f0166b6f..e3889681f0d8 100644
--- a/dev-perl/Mac-Pasteboard/metadata.xml
+++ b/dev-perl/Mac-Pasteboard/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Mac-Pasteboard</remote-id>
+    <remote-id type="cpan-module">Mac::Pasteboard</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Audit/metadata.xml b/dev-perl/Mail-Audit/metadata.xml
index cb25ea112de0..6eeb0e32d231 100644
--- a/dev-perl/Mail-Audit/metadata.xml
+++ b/dev-perl/Mail-Audit/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-Audit</remote-id>
+    <remote-id type="cpan-module">Mail::Audit</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::KillDups</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::MAPS</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::MailInternet</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::MimeEntity</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::Util::Tempdir</remote-id>
+    <remote-id type="cpan-module">Mail::Audit::Vacation</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Box/metadata.xml b/dev-perl/Mail-Box/metadata.xml
index 48a70b13196f..022238590229 100644
--- a/dev-perl/Mail-Box/metadata.xml
+++ b/dev-perl/Mail-Box/metadata.xml
@@ -4,5 +4,143 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Mail-Box</remote-id>
+		<remote-id type="cpan-module">Mail::Box</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Collection</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Dbx</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Dbx::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Dir</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Dir::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::FastScalar</remote-id>
+		<remote-id type="cpan-module">Mail::Box::File</remote-id>
+		<remote-id type="cpan-module">Mail::Box::File::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::IMAP4</remote-id>
+		<remote-id type="cpan-module">Mail::Box::IMAP4::Head</remote-id>
+		<remote-id type="cpan-module">Mail::Box::IMAP4::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Identity</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::DotLock</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::FcntlLock</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::Flock</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::Multi</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::Mutt</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::NFS</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Locker::POSIX</remote-id>
+		<remote-id type="cpan-module">Mail::Box::MH</remote-id>
+		<remote-id type="cpan-module">Mail::Box::MH::Index</remote-id>
+		<remote-id type="cpan-module">Mail::Box::MH::Labels</remote-id>
+		<remote-id type="cpan-module">Mail::Box::MH::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Maildir</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Maildir::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Manage::User</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Manager</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Mbox</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Mbox::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Message::Destructed</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Net</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Net::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::POP3</remote-id>
+		<remote-id type="cpan-module">Mail::Box::POP3::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Box::POP3s</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Parser</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Parser::Perl</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Search</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Search::Grep</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Search::SpamAssassin</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Thread::Manager</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Thread::Node</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Tie</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Tie::ARRAY</remote-id>
+		<remote-id type="cpan-module">Mail::Box::Tie::HASH</remote-id>
+		<remote-id type="cpan-module">Mail::Message</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::Delayed</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::File</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::Lines</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::Multipart</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::Nested</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Body::String</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::EmailSimple</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::Html</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::HtmlFormatPS</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::HtmlFormatText</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::MailInternet</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::MimeEntity</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Convert::TextAutoformat</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Dummy</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::AddrGroup</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Address</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Addresses</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Attribute</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Date</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Fast</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Flex</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Full</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Structured</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::URIs</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Field::Unstructured</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::Complete</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::Delayed</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::FieldGroup</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::ListGroup</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::Partial</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::ResentGroup</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::SpamGroup</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Head::Subset</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Part</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Replace::MailHeader</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Replace::MailInternet</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc::Base64</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc::Binary</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc::EightBit</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc::QuotedPrint</remote-id>
+		<remote-id type="cpan-module">Mail::Message::TransferEnc::SevenBit</remote-id>
+		<remote-id type="cpan-module">Mail::Message::Wrapper::SpamAssassin</remote-id>
+		<remote-id type="cpan-module">Mail::Reporter</remote-id>
+		<remote-id type="cpan-module">Mail::Server</remote-id>
+		<remote-id type="cpan-module">Mail::Server::IMAP4</remote-id>
+		<remote-id type="cpan-module">Mail::Server::IMAP4::Fetch</remote-id>
+		<remote-id type="cpan-module">Mail::Server::IMAP4::List</remote-id>
+		<remote-id type="cpan-module">Mail::Server::IMAP4::Search</remote-id>
+		<remote-id type="cpan-module">Mail::Transport</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Exim</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::IMAP4</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Mailx</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::POP3</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Qmail</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Receive</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::SMTP</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Send</remote-id>
+		<remote-id type="cpan-module">Mail::Transport::Sendmail</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::01platform::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::02dist::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::10reporter::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::11field::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::12head::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::13body::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::14fieldu::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::20pparser::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::30encode::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::31fgroups::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::40mbox::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::41mh::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::42maildir::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::43pop3::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::44imap::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::45dbx::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::50message::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::51folder::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::52manager::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::53threads::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::54search::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::55locking::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::60imap::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::80msgconv::Definition</remote-id>
+		<remote-id type="cpan-module">MailBox::Test::81bodyconv::Definition</remote-id>
+		<remote-id type="cpan-module">Tools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Builder-Simple/metadata.xml b/dev-perl/Mail-Builder-Simple/metadata.xml
index 83d3f0ccb832..cbfbbd291cdb 100644
--- a/dev-perl/Mail-Builder-Simple/metadata.xml
+++ b/dev-perl/Mail-Builder-Simple/metadata.xml
@@ -8,5 +8,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-Builder-Simple</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Simple</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Simple::HTML::Template</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Simple::Scalar</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Simple::TT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Builder/metadata.xml b/dev-perl/Mail-Builder/metadata.xml
index ca7dda9db805..407c4d8cb80c 100644
--- a/dev-perl/Mail-Builder/metadata.xml
+++ b/dev-perl/Mail-Builder/metadata.xml
@@ -8,5 +8,16 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-Builder</remote-id>
+    <remote-id type="cpan-module">Mail::Builder</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Address</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Attachment</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Attachment::Data</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Attachment::File</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Image</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Image::Data</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Image::File</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::List</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::Role::File</remote-id>
+    <remote-id type="cpan-module">Mail::Builder::TypeConstraints</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-ClamAV/metadata.xml b/dev-perl/Mail-ClamAV/metadata.xml
index f98dd9244e20..4d7a4c98178f 100644
--- a/dev-perl/Mail-ClamAV/metadata.xml
+++ b/dev-perl/Mail-ClamAV/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-ClamAV</remote-id>
+    <remote-id type="cpan-module">Mail::ClamAV</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-DKIM/metadata.xml b/dev-perl/Mail-DKIM/metadata.xml
index d353474dd115..fcf756df9b0c 100644
--- a/dev-perl/Mail-DKIM/metadata.xml
+++ b/dev-perl/Mail-DKIM/metadata.xml
@@ -4,5 +4,35 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-DKIM</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Algorithm::Base</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Algorithm::dk_rsa_sha1</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Algorithm::rsa_sha1</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Algorithm::rsa_sha256</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::AuthorDomainPolicy</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::Base</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::DkCommon</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::DkimCommon</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::dk_nofws</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::dk_simple</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::nowsp</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::relaxed</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Canonicalization::simple</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Common</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::DNS</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::DkPolicy</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::DkSignature</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::DkimPolicy</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Key</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::KeyValueList</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::MessageParser</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Policy</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::PrivateKey</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::PublicKey</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Signature</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Signer</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::SignerPolicy</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::TextWrap</remote-id>
+    <remote-id type="cpan-module">Mail::DKIM::Verifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-DomainKeys/metadata.xml b/dev-perl/Mail-DomainKeys/metadata.xml
index d70a1d653925..271ce435aca7 100644
--- a/dev-perl/Mail-DomainKeys/metadata.xml
+++ b/dev-perl/Mail-DomainKeys/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-DomainKeys</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Header</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Key</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Key::Private</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Key::Public</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Message</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Policy</remote-id>
+    <remote-id type="cpan-module">Mail::DomainKeys::Signature</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-IMAPClient/metadata.xml b/dev-perl/Mail-IMAPClient/metadata.xml
index d08352b8bbac..0141a301dd2d 100644
--- a/dev-perl/Mail-IMAPClient/metadata.xml
+++ b/dev-perl/Mail-IMAPClient/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-IMAPClient</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::BodyStructure</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::BodyStructure::Address</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::BodyStructure::Envelope</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::BodyStructure::Parse</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::BodyStructure::Part</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::MessageSet</remote-id>
+    <remote-id type="cpan-module">Mail::IMAPClient::Thread</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Mail::IMAPClient::Thread</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-ListDetector/metadata.xml b/dev-perl/Mail-ListDetector/metadata.xml
index f46cfeaaae03..4bbe3a82924b 100644
--- a/dev-perl/Mail-ListDetector/metadata.xml
+++ b/dev-perl/Mail-ListDetector/metadata.xml
@@ -4,5 +4,28 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-ListDetector</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::AutoShare</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Base</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::CommuniGate</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::CommuniGatePro</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Ecartis</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Ezmlm</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Fml</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::GoogleGroups</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::LetterRip</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::ListSTAR</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Listar</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Listbox</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Listserv</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Lyris</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Mailman</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Majordomo</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Onelist</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::RFC2369</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::RFC2919</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Smartlist</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::Detector::Yahoogroups</remote-id>
+    <remote-id type="cpan-module">Mail::ListDetector::List</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Mbox-MessageParser/metadata.xml b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
index 54e6eab802e5..e45031fd880c 100644
--- a/dev-perl/Mail-Mbox-MessageParser/metadata.xml
+++ b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-Mbox-MessageParser</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser::Cache</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser::Config</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser::Grep</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser::MetaInfo</remote-id>
+    <remote-id type="cpan-module">Mail::Mbox::MessageParser::Perl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-POP3Client/metadata.xml b/dev-perl/Mail-POP3Client/metadata.xml
index 967fe233a4a1..c73bcfcd9d6a 100644
--- a/dev-perl/Mail-POP3Client/metadata.xml
+++ b/dev-perl/Mail-POP3Client/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-POP3Client</remote-id>
+    <remote-id type="cpan-module">Mail::POP3Client</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Procmail/metadata.xml b/dev-perl/Mail-Procmail/metadata.xml
index f47759e65b3a..8d4ac6621785 100644
--- a/dev-perl/Mail-Procmail/metadata.xml
+++ b/dev-perl/Mail-Procmail/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-Procmail</remote-id>
+    <remote-id type="cpan-module">Mail::Procmail</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-SPF-Query/metadata.xml b/dev-perl/Mail-SPF-Query/metadata.xml
index c84281d8611a..651b3e181ca0 100644
--- a/dev-perl/Mail-SPF-Query/metadata.xml
+++ b/dev-perl/Mail-SPF-Query/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-SPF-Query</remote-id>
+    <remote-id type="cpan-module">DirectiveSet</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Query</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-SPF/metadata.xml b/dev-perl/Mail-SPF/metadata.xml
index a4befdf43636..94a6f789ad7a 100644
--- a/dev-perl/Mail-SPF/metadata.xml
+++ b/dev-perl/Mail-SPF/metadata.xml
@@ -8,5 +8,75 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SPF</remote-id>
+    <remote-id type="cpan-module">Mail::SPF</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Base</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EAbstractClass</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EClassMethod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EDNSError</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EDNSTimeout</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EDuplicateGlobalMod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInstanceMethod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidMacro</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidMacroString</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidMech</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidMechQualifier</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidMod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidOptionValue</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidRecordVersion</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidScope</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EInvalidTerm</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EJunkInRecord</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EJunkInTerm</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EMacroExpansionCtxRequired</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ENoAcceptableRecord</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ENoUnparsedText</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ENothingToParse</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EOptionRequired</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EProcessingLimitExceeded</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EReadOnlyValue</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ERecordSelectionError</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ERedundantAcceptableRecords</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ESyntaxError</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ETermDomainSpecExpected</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ETermIPv4AddressExpected</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ETermIPv4PrefixLengthExpected</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ETermIPv6AddressExpected</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::ETermIPv6PrefixLengthExpected</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::EUnexpectedTermObject</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Exception</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::GlobalMod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::MacroString</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::A</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::All</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::Exists</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::IP4</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::IP6</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::Include</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::MX</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mech::PTR</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mod::Exp</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Mod::Redirect</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::PositionalMod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Record</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Request</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::Error</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::Fail</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::Neutral</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::NeutralByDefault</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::None</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::Pass</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::PermError</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::SoftFail</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Result::TempError</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::SenderIPAddrMech</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Server</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Term</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::UnknownMod</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::Util</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::v1::Record</remote-id>
+    <remote-id type="cpan-module">Mail::SPF::v2::Record</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-SRS/metadata.xml b/dev-perl/Mail-SRS/metadata.xml
index fe60f372b909..6eefb0f38b73 100644
--- a/dev-perl/Mail-SRS/metadata.xml
+++ b/dev-perl/Mail-SRS/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-SRS</remote-id>
+    <remote-id type="cpan-module">Mail::SRS</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::DB</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::Daemon</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::Guarded</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::Reversable</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::Reversible</remote-id>
+    <remote-id type="cpan-module">Mail::SRS::Shortcut</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Sender/metadata.xml b/dev-perl/Mail-Sender/metadata.xml
index 6ac24671248f..b744ec1104ef 100644
--- a/dev-perl/Mail-Sender/metadata.xml
+++ b/dev-perl/Mail-Sender/metadata.xml
@@ -10,5 +10,8 @@
 	</longdescription>
   <upstream>
     <remote-id type="cpan">Mail-Sender</remote-id>
+    <remote-id type="cpan-module">Mail::Sender</remote-id>
+    <remote-id type="cpan-module">Mail::Sender::DBIO</remote-id>
+    <remote-id type="cpan-module">Mail::Sender::IO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-Sendmail/metadata.xml b/dev-perl/Mail-Sendmail/metadata.xml
index 2cf18d57bf7d..02f4cdd76ea3 100644
--- a/dev-perl/Mail-Sendmail/metadata.xml
+++ b/dev-perl/Mail-Sendmail/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mail-Sendmail</remote-id>
+    <remote-id type="cpan-module">Mail::Sendmail</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
index 2ed73f930d0a..78d565fb8370 100644
--- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
+++ b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Mail-SpamAssassin-Plugin-GoogleSafeBrowsing</remote-id>
+    <remote-id type="cpan-module">Mail::SpamAssassin::Plugin::GoogleSafeBrowsing</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MailTools/metadata.xml b/dev-perl/MailTools/metadata.xml
index 7bd7b277a02b..be3fd7af5e05 100644
--- a/dev-perl/MailTools/metadata.xml
+++ b/dev-perl/MailTools/metadata.xml
@@ -4,5 +4,26 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MailTools</remote-id>
+    <remote-id type="cpan-module">Mail::Address</remote-id>
+    <remote-id type="cpan-module">Mail::Cap</remote-id>
+    <remote-id type="cpan-module">Mail::Field</remote-id>
+    <remote-id type="cpan-module">Mail::Field::AddrList</remote-id>
+    <remote-id type="cpan-module">Mail::Field::Date</remote-id>
+    <remote-id type="cpan-module">Mail::Field::Generic</remote-id>
+    <remote-id type="cpan-module">Mail::Filter</remote-id>
+    <remote-id type="cpan-module">Mail::Header</remote-id>
+    <remote-id type="cpan-module">Mail::Internet</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::qmail</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::rfc822</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::sendmail</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::smtp</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::smtp::pipe</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::smtps</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::smtps::pipe</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::testfile</remote-id>
+    <remote-id type="cpan-module">Mail::Mailer::testfile::pipe</remote-id>
+    <remote-id type="cpan-module">Mail::Send</remote-id>
+    <remote-id type="cpan-module">Mail::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Base36/metadata.xml b/dev-perl/Math-Base36/metadata.xml
index c6472314674f..5c7a70502852 100644
--- a/dev-perl/Math-Base36/metadata.xml
+++ b/dev-perl/Math-Base36/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-Base36</remote-id>
+    <remote-id type="cpan-module">Math::Base36</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Bezier/metadata.xml b/dev-perl/Math-Bezier/metadata.xml
index dba76382b7df..7acdf440c63e 100644
--- a/dev-perl/Math-Bezier/metadata.xml
+++ b/dev-perl/Math-Bezier/metadata.xml
@@ -5,5 +5,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-Bezier</remote-id>
+    <remote-id type="cpan-module">Math::Bezier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-BigInt-GMP/metadata.xml b/dev-perl/Math-BigInt-GMP/metadata.xml
index 9386ce7c8e93..9f0d12382698 100644
--- a/dev-perl/Math-BigInt-GMP/metadata.xml
+++ b/dev-perl/Math-BigInt-GMP/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-BigInt-GMP</remote-id>
+    <remote-id type="cpan-module">Math::BigInt::GMP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Calc-Units/metadata.xml b/dev-perl/Math-Calc-Units/metadata.xml
index d0717366d538..b1fa4cce338f 100644
--- a/dev-perl/Math-Calc-Units/metadata.xml
+++ b/dev-perl/Math-Calc-Units/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-Calc-Units</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Compute</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Base</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Base2Metric</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Byte</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Combo</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Date</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Distance</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Metric</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Multi</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Convert::Time</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Grammar</remote-id>
+    <remote-id type="cpan-module">Math::Calc::Units::Rank</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Driver</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Derivative/metadata.xml b/dev-perl/Math-Derivative/metadata.xml
index a4af615fbeb8..7072b1101ea3 100644
--- a/dev-perl/Math-Derivative/metadata.xml
+++ b/dev-perl/Math-Derivative/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Derivative</remote-id>
+    <remote-id type="cpan-module">Math::Derivative</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-GMP/metadata.xml b/dev-perl/Math-GMP/metadata.xml
index 8181117fcebe..fef1355ce8de 100644
--- a/dev-perl/Math-GMP/metadata.xml
+++ b/dev-perl/Math-GMP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-GMP</remote-id>
+    <remote-id type="cpan-module">Math::GMP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random-ISAAC-XS/metadata.xml b/dev-perl/Math-Random-ISAAC-XS/metadata.xml
index f9d9b2d54d5a..74d08c6752bb 100644
--- a/dev-perl/Math-Random-ISAAC-XS/metadata.xml
+++ b/dev-perl/Math-Random-ISAAC-XS/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Math-Random-ISAAC-XS</remote-id>
+		<remote-id type="cpan-module">Math::Random::ISAAC::XS</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random-ISAAC/metadata.xml b/dev-perl/Math-Random-ISAAC/metadata.xml
index b6c3b076b115..003e491550eb 100644
--- a/dev-perl/Math-Random-ISAAC/metadata.xml
+++ b/dev-perl/Math-Random-ISAAC/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Math-Random-ISAAC</remote-id>
+		<remote-id type="cpan-module">Math::Random::ISAAC</remote-id>
+		<remote-id type="cpan-module">Math::Random::ISAAC::PP</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random-MT/metadata.xml b/dev-perl/Math-Random-MT/metadata.xml
index 3699cc977289..3dbdf04c273f 100644
--- a/dev-perl/Math-Random-MT/metadata.xml
+++ b/dev-perl/Math-Random-MT/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-Random-MT</remote-id>
+    <remote-id type="cpan-module">Math::Random::MT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random-Secure/metadata.xml b/dev-perl/Math-Random-Secure/metadata.xml
index 1e21b764676a..3413dafbf358 100644
--- a/dev-perl/Math-Random-Secure/metadata.xml
+++ b/dev-perl/Math-Random-Secure/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Math-Random-Secure</remote-id>
+		<remote-id type="cpan-module">Math::Random::Secure</remote-id>
+		<remote-id type="cpan-module">Math::Random::Secure::RNG</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Random/metadata.xml b/dev-perl/Math-Random/metadata.xml
index c0af7097f8c0..3e1f24e005ed 100644
--- a/dev-perl/Math-Random/metadata.xml
+++ b/dev-perl/Math-Random/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Random</remote-id>
+    <remote-id type="cpan-module">Math::Random</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Round/metadata.xml b/dev-perl/Math-Round/metadata.xml
index 017adecf7485..27fc810f0923 100644
--- a/dev-perl/Math-Round/metadata.xml
+++ b/dev-perl/Math-Round/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Round</remote-id>
+    <remote-id type="cpan-module">Math::Round</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Spline/metadata.xml b/dev-perl/Math-Spline/metadata.xml
index 7d949532d3ff..78a97ec6e88f 100644
--- a/dev-perl/Math-Spline/metadata.xml
+++ b/dev-perl/Math-Spline/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Spline</remote-id>
+    <remote-id type="cpan-module">Math::Spline</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-Vec/metadata.xml b/dev-perl/Math-Vec/metadata.xml
index 238b1be98469..26fa6501e5cb 100644
--- a/dev-perl/Math-Vec/metadata.xml
+++ b/dev-perl/Math-Vec/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Math-Vec</remote-id>
+    <remote-id type="cpan-module">Math::Vec</remote-id>
+    <remote-id type="cpan-module">Math::Vec::Support</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Math-VecStat/metadata.xml b/dev-perl/Math-VecStat/metadata.xml
index 49687db73e83..1efaa484d251 100644
--- a/dev-perl/Math-VecStat/metadata.xml
+++ b/dev-perl/Math-VecStat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-VecStat</remote-id>
+    <remote-id type="cpan-module">Math::VecStat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Modem-Vgetty/metadata.xml b/dev-perl/Modem-Vgetty/metadata.xml
index 9ffa547c035a..c9e3c8c5512a 100644
--- a/dev-perl/Modem-Vgetty/metadata.xml
+++ b/dev-perl/Modem-Vgetty/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Modem-Vgetty</remote-id>
+    <remote-id type="cpan-module">Modem::Vgetty</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Find/metadata.xml b/dev-perl/Module-Find/metadata.xml
index fabd1fd28f48..7d220e088f45 100644
--- a/dev-perl/Module-Find/metadata.xml
+++ b/dev-perl/Module-Find/metadata.xml
@@ -7,5 +7,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Find</remote-id>
+    <remote-id type="cpan-module">Module::Find</remote-id>
+    <remote-id type="cpan-module">ModuleFindTest</remote-id>
+    <remote-id type="cpan-module">ModuleFindTest::SubMod</remote-id>
+    <remote-id type="cpan-module">ModuleFindTest::SubMod::SubSubMod</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Implementation/metadata.xml b/dev-perl/Module-Implementation/metadata.xml
index 2310c78f9df0..ab7142b99e3e 100644
--- a/dev-perl/Module-Implementation/metadata.xml
+++ b/dev-perl/Module-Implementation/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Implementation</remote-id>
+    <remote-id type="cpan-module">Module::Implementation</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Install/metadata.xml b/dev-perl/Module-Install/metadata.xml
index 1825f1233a99..880d345508bd 100644
--- a/dev-perl/Module-Install/metadata.xml
+++ b/dev-perl/Module-Install/metadata.xml
@@ -7,5 +7,41 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Module-Install</remote-id>
+    <remote-id type="cpan-module">Module::AutoInstall</remote-id>
+    <remote-id type="cpan-module">Module::Install</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Bundle</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Compiler</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Find</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Include</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Makefile</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Manifest</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::Metadata</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::ScanDeps</remote-id>
+    <remote-id type="cpan-module">Module::Install::Admin::WriteAll</remote-id>
+    <remote-id type="cpan-module">Module::Install::AutoInstall</remote-id>
+    <remote-id type="cpan-module">Module::Install::Base</remote-id>
+    <remote-id type="cpan-module">Module::Install::Base::FakeAdmin</remote-id>
+    <remote-id type="cpan-module">Module::Install::Bundle</remote-id>
+    <remote-id type="cpan-module">Module::Install::Can</remote-id>
+    <remote-id type="cpan-module">Module::Install::Compiler</remote-id>
+    <remote-id type="cpan-module">Module::Install::DSL</remote-id>
+    <remote-id type="cpan-module">Module::Install::Deprecated</remote-id>
+    <remote-id type="cpan-module">Module::Install::External</remote-id>
+    <remote-id type="cpan-module">Module::Install::Fetch</remote-id>
+    <remote-id type="cpan-module">Module::Install::Include</remote-id>
+    <remote-id type="cpan-module">Module::Install::Inline</remote-id>
+    <remote-id type="cpan-module">Module::Install::MakeMaker</remote-id>
+    <remote-id type="cpan-module">Module::Install::Makefile</remote-id>
+    <remote-id type="cpan-module">Module::Install::Metadata</remote-id>
+    <remote-id type="cpan-module">Module::Install::PAR</remote-id>
+    <remote-id type="cpan-module">Module::Install::Run</remote-id>
+    <remote-id type="cpan-module">Module::Install::Scripts</remote-id>
+    <remote-id type="cpan-module">Module::Install::Share</remote-id>
+    <remote-id type="cpan-module">Module::Install::Win32</remote-id>
+    <remote-id type="cpan-module">Module::Install::With</remote-id>
+    <remote-id type="cpan-module">Module::Install::WriteAll</remote-id>
+    <remote-id type="cpan-module">inc::Module::Install</remote-id>
+    <remote-id type="cpan-module">inc::Module::Install::DSL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Locate/metadata.xml b/dev-perl/Module-Locate/metadata.xml
index 5160efb26537..fcb14addcd1c 100644
--- a/dev-perl/Module-Locate/metadata.xml
+++ b/dev-perl/Module-Locate/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Module-Locate</remote-id>
+        <remote-id type="cpan-module">Module::Locate</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Manifest/metadata.xml b/dev-perl/Module-Manifest/metadata.xml
index 66f8f4ba6d90..b7fbcac7e779 100644
--- a/dev-perl/Module-Manifest/metadata.xml
+++ b/dev-perl/Module-Manifest/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Module-Manifest</remote-id>
+		<remote-id type="cpan-module">Module::Manifest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Refresh/metadata.xml b/dev-perl/Module-Refresh/metadata.xml
index 78fd6d6c9e80..22d6d98186e1 100644
--- a/dev-perl/Module-Refresh/metadata.xml
+++ b/dev-perl/Module-Refresh/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Refresh</remote-id>
+    <remote-id type="cpan-module">Module::Refresh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Runtime/metadata.xml b/dev-perl/Module-Runtime/metadata.xml
index e2c166419b5b..335785b16068 100644
--- a/dev-perl/Module-Runtime/metadata.xml
+++ b/dev-perl/Module-Runtime/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Module-Runtime</remote-id>
+        <remote-id type="cpan-module">Module::Runtime</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-ScanDeps/metadata.xml b/dev-perl/Module-ScanDeps/metadata.xml
index b7b1ff8e92b1..7f3062bd6a4d 100644
--- a/dev-perl/Module-ScanDeps/metadata.xml
+++ b/dev-perl/Module-ScanDeps/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Module-ScanDeps</remote-id>
+    <remote-id type="cpan-module">Module::ScanDeps</remote-id>
+    <remote-id type="cpan-module">Module::ScanDeps::Cache</remote-id>
+    <remote-id type="cpan-module">Module::ScanDeps::DataFeed</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Signature/metadata.xml b/dev-perl/Module-Signature/metadata.xml
index 385737d54bb8..14d7cdabbcb2 100644
--- a/dev-perl/Module-Signature/metadata.xml
+++ b/dev-perl/Module-Signature/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Signature</remote-id>
+    <remote-id type="cpan-module">Module::Signature</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Starter/metadata.xml b/dev-perl/Module-Starter/metadata.xml
index 535afa91ec15..e53679795fef 100644
--- a/dev-perl/Module-Starter/metadata.xml
+++ b/dev-perl/Module-Starter/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Starter</remote-id>
+    <remote-id type="cpan-module">Module::Starter</remote-id>
+    <remote-id type="cpan-module">Module::Starter::App</remote-id>
+    <remote-id type="cpan-module">Module::Starter::BuilderSet</remote-id>
+    <remote-id type="cpan-module">Module::Starter::Plugin::Template</remote-id>
+    <remote-id type="cpan-module">Module::Starter::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Util/metadata.xml b/dev-perl/Module-Util/metadata.xml
index 3de3445665d6..d8a9e4de9d35 100644
--- a/dev-perl/Module-Util/metadata.xml
+++ b/dev-perl/Module-Util/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Module-Util</remote-id>
+		<remote-id type="cpan-module">Module::Util</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Module-Versions-Report/metadata.xml b/dev-perl/Module-Versions-Report/metadata.xml
index f559b12af60f..5af27ee7fe96 100644
--- a/dev-perl/Module-Versions-Report/metadata.xml
+++ b/dev-perl/Module-Versions-Report/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Versions-Report</remote-id>
+    <remote-id type="cpan-module">Module::Versions::Report</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MogileFS-Client-Async/metadata.xml b/dev-perl/MogileFS-Client-Async/metadata.xml
index 981d9771563d..e01f54181dab 100644
--- a/dev-perl/MogileFS-Client-Async/metadata.xml
+++ b/dev-perl/MogileFS-Client-Async/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Client-Async</remote-id>
+    <remote-id type="cpan-module">MogileFS::Client::Async</remote-id>
+    <remote-id type="cpan-module">MogileFS::Client::Callback</remote-id>
+    <remote-id type="cpan-module">MogileFS::Client::CallbackFile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MogileFS-Client/metadata.xml b/dev-perl/MogileFS-Client/metadata.xml
index 077eaa6ec55e..b2d9785b50cb 100644
--- a/dev-perl/MogileFS-Client/metadata.xml
+++ b/dev-perl/MogileFS-Client/metadata.xml
@@ -8,5 +8,10 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Client</remote-id>
+    <remote-id type="cpan-module">MogileFS::Admin</remote-id>
+    <remote-id type="cpan-module">MogileFS::Backend</remote-id>
+    <remote-id type="cpan-module">MogileFS::Client</remote-id>
+    <remote-id type="cpan-module">MogileFS::ClientHTTPFile</remote-id>
+    <remote-id type="cpan-module">MogileFS::NewHTTPFile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MogileFS-Network/metadata.xml b/dev-perl/MogileFS-Network/metadata.xml
index 9034bdbc3137..476f0490203e 100644
--- a/dev-perl/MogileFS-Network/metadata.xml
+++ b/dev-perl/MogileFS-Network/metadata.xml
@@ -8,5 +8,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Network</remote-id>
+    <remote-id type="cpan-module">MogileFS::Network</remote-id>
+    <remote-id type="cpan-module">MogileFS::Plugin::ZoneLocal</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationPolicy::HostsPerNetwork</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationPolicy::MultipleNetworks</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MogileFS-Utils/metadata.xml b/dev-perl/MogileFS-Utils/metadata.xml
index 7f21aee4a037..3f4cb1674943 100644
--- a/dev-perl/MogileFS-Utils/metadata.xml
+++ b/dev-perl/MogileFS-Utils/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Utils</remote-id>
+    <remote-id type="cpan-module">MogileFS::Utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mon/metadata.xml b/dev-perl/Mon/metadata.xml
index 5ac9399641eb..ee1c6c121827 100644
--- a/dev-perl/Mon/metadata.xml
+++ b/dev-perl/Mon/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mon</remote-id>
+    <remote-id type="cpan-module">Mon::Client</remote-id>
+    <remote-id type="cpan-module">Mon::Protocol</remote-id>
+    <remote-id type="cpan-module">Mon::SNMP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Moo/metadata.xml b/dev-perl/Moo/metadata.xml
index 7d7a1a219938..c570f0ad7a43 100644
--- a/dev-perl/Moo/metadata.xml
+++ b/dev-perl/Moo/metadata.xml
@@ -4,5 +4,22 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Moo</remote-id>
+		<remote-id type="cpan-module">Method::Generate::Accessor</remote-id>
+		<remote-id type="cpan-module">Method::Generate::BuildAll</remote-id>
+		<remote-id type="cpan-module">Method::Generate::Constructor</remote-id>
+		<remote-id type="cpan-module">Method::Generate::DemolishAll</remote-id>
+		<remote-id type="cpan-module">Method::Inliner</remote-id>
+		<remote-id type="cpan-module">Moo</remote-id>
+		<remote-id type="cpan-module">Moo::HandleMoose</remote-id>
+		<remote-id type="cpan-module">Moo::HandleMoose::FakeConstructor</remote-id>
+		<remote-id type="cpan-module">Moo::HandleMoose::FakeMetaClass</remote-id>
+		<remote-id type="cpan-module">Moo::Object</remote-id>
+		<remote-id type="cpan-module">Moo::Role</remote-id>
+		<remote-id type="cpan-module">Moo::_Utils</remote-id>
+		<remote-id type="cpan-module">Moo::_mro</remote-id>
+		<remote-id type="cpan-module">Moo::sification</remote-id>
+		<remote-id type="cpan-module">Sub::Defer</remote-id>
+		<remote-id type="cpan-module">Sub::Quote</remote-id>
+		<remote-id type="cpan-module">oo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Moose/metadata.xml b/dev-perl/Moose/metadata.xml
index baae9ebc4303..8cd0920bb85a 100644
--- a/dev-perl/Moose/metadata.xml
+++ b/dev-perl/Moose/metadata.xml
@@ -4,5 +4,89 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Moose</remote-id>
+    <remote-id type="cpan-module">Class::MOP</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Attribute</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Class</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Class::Immutable::Trait</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Deprecated</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Instance</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Accessor</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Constructor</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Generated</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Inlined</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Meta</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Overload</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Method::Wrapped</remote-id>
+    <remote-id type="cpan-module">Class::MOP::MiniTrait</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Mixin</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Mixin::AttributeCore</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Mixin::HasAttributes</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Mixin::HasMethods</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Module</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Object</remote-id>
+    <remote-id type="cpan-module">Class::MOP::Package</remote-id>
+    <remote-id type="cpan-module">Moose</remote-id>
+    <remote-id type="cpan-module">Moose::Cookbook::Legacy::Debugging_BaseClassReplacement</remote-id>
+    <remote-id type="cpan-module">Moose::Cookbook::Meta::Labeled_AttributeMetaclass</remote-id>
+    <remote-id type="cpan-module">Moose::Deprecated</remote-id>
+    <remote-id type="cpan-module">Moose::Error::Confess</remote-id>
+    <remote-id type="cpan-module">Moose::Error::Croak</remote-id>
+    <remote-id type="cpan-module">Moose::Error::Default</remote-id>
+    <remote-id type="cpan-module">Moose::Exporter</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Custom::Moose</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Array</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Bool</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Code</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Counter</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Hash</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::Number</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Attribute::Native::Trait::String</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Class</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Class::Immutable::Trait</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Instance</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Accessor</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Augmented</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Constructor</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Delegation</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Destructor</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Meta</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Method::Overridden</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Mixin::AttributeCore</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Object::Trait</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Application</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Application::RoleSummation</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Application::ToClass</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Application::ToInstance</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Application::ToRole</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Attribute</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Composite</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Method</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Method::Conflicting</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::Role::Method::Required</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeCoercion</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeCoercion::Union</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Class</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::DuckType</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Enum</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Parameterizable</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Parameterized</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Registry</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Role</remote-id>
+    <remote-id type="cpan-module">Moose::Meta::TypeConstraint::Union</remote-id>
+    <remote-id type="cpan-module">Moose::Object</remote-id>
+    <remote-id type="cpan-module">Moose::Role</remote-id>
+    <remote-id type="cpan-module">Moose::Util</remote-id>
+    <remote-id type="cpan-module">Moose::Util::MetaRole</remote-id>
+    <remote-id type="cpan-module">Moose::Util::TypeConstraints</remote-id>
+    <remote-id type="cpan-module">Test::Moose</remote-id>
+    <remote-id type="cpan-module">metaclass</remote-id>
+    <remote-id type="cpan-module">oose</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Aliases/metadata.xml b/dev-perl/MooseX-Aliases/metadata.xml
index 24ee9fa43b72..7bd01010476c 100644
--- a/dev-perl/MooseX-Aliases/metadata.xml
+++ b/dev-perl/MooseX-Aliases/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
+        <herd>perl</herd>
         <upstream>
                 <remote-id type="cpan">MooseX-Aliases</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Attribute</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Class</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Constructor</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Method</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Role</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Role::ApplicationToClass</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Role::ApplicationToRole</remote-id>
+                <remote-id type="cpan-module">MooseX::Aliases::Meta::Trait::Role::Composite</remote-id>
         </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-AttributeHelpers/metadata.xml b/dev-perl/MooseX-AttributeHelpers/metadata.xml
index a888e5571ff9..0ea8052f933d 100644
--- a/dev-perl/MooseX-AttributeHelpers/metadata.xml
+++ b/dev-perl/MooseX-AttributeHelpers/metadata.xml
@@ -4,5 +4,36 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-AttributeHelpers</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Bool</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Collection::Array</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Collection::Bag</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Collection::Hash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Collection::ImmutableHash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Collection::List</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Counter</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Meta::Method::Curried</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Meta::Method::Provided</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::Array</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::Bag</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::Bool</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::Counter</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::Hash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::ImmutableHash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::List</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::MethodProvider::String</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Number</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::String</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Base</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Bool</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection::Array</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection::Bag</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection::Hash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection::ImmutableHash</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Collection::List</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Counter</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::Number</remote-id>
+    <remote-id type="cpan-module">MooseX::AttributeHelpers::Trait::String</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-ClassAttribute/metadata.xml b/dev-perl/MooseX-ClassAttribute/metadata.xml
index b00b79d5fcb6..1c030ed33d18 100644
--- a/dev-perl/MooseX-ClassAttribute/metadata.xml
+++ b/dev-perl/MooseX-ClassAttribute/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-ClassAttribute</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Meta::Role::Attribute</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Application</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Application::ToClass</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Application::ToRole</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Attribute</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Class</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Mixin::HasClassAttributes</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Role</remote-id>
+    <remote-id type="cpan-module">MooseX::ClassAttribute::Trait::Role::Composite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Getopt/metadata.xml b/dev-perl/MooseX-Getopt/metadata.xml
index 49b30790066c..5deaca3d2b37 100644
--- a/dev-perl/MooseX-Getopt/metadata.xml
+++ b/dev-perl/MooseX-Getopt/metadata.xml
@@ -7,5 +7,16 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Getopt</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Basic</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Dashes</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::GLD</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Meta::Attribute</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Meta::Attribute::NoGetopt</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Meta::Attribute::Trait</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Meta::Attribute::Trait::NoGetopt</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::OptionTypeMap</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::ProcessedArgv</remote-id>
+    <remote-id type="cpan-module">MooseX::Getopt::Strict</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-GlobRef/metadata.xml b/dev-perl/MooseX-GlobRef/metadata.xml
index 7cc9683b42ec..9785d880b916 100644
--- a/dev-perl/MooseX-GlobRef/metadata.xml
+++ b/dev-perl/MooseX-GlobRef/metadata.xml
@@ -7,5 +7,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-GlobRef</remote-id>
+    <remote-id type="cpan-module">MooseX::GlobRef</remote-id>
+    <remote-id type="cpan-module">MooseX::GlobRef::Object</remote-id>
+    <remote-id type="cpan-module">MooseX::GlobRef::Role::Meta::Instance</remote-id>
+    <remote-id type="cpan-module">MooseX::GlobRef::Role::Object</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-MultiInitArg/metadata.xml b/dev-perl/MooseX-MultiInitArg/metadata.xml
index 825d22e6e880..ad2db452deb8 100644
--- a/dev-perl/MooseX-MultiInitArg/metadata.xml
+++ b/dev-perl/MooseX-MultiInitArg/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-MultiInitArg</remote-id>
+    <remote-id type="cpan-module">MooseX::MultiInitArg</remote-id>
+    <remote-id type="cpan-module">MooseX::MultiInitArg::Attribute</remote-id>
+    <remote-id type="cpan-module">MooseX::MultiInitArg::Trait</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Object-Pluggable/metadata.xml b/dev-perl/MooseX-Object-Pluggable/metadata.xml
index 958d7096b09a..53abd0780916 100644
--- a/dev-perl/MooseX-Object-Pluggable/metadata.xml
+++ b/dev-perl/MooseX-Object-Pluggable/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MooseX-Object-Pluggable</remote-id>
+    <remote-id type="cpan-module">MooseX::Object::Pluggable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Role-Parameterized/metadata.xml b/dev-perl/MooseX-Role-Parameterized/metadata.xml
index 0c49c7039f77..10ede33abd9a 100644
--- a/dev-perl/MooseX-Role-Parameterized/metadata.xml
+++ b/dev-perl/MooseX-Role-Parameterized/metadata.xml
@@ -4,5 +4,10 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">MooseX-Role-Parameterized</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Parameterized</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Parameterized::Meta::Role::Parameterizable</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Parameterized::Meta::Role::Parameterized</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Parameterized::Meta::Trait::Parameterized</remote-id>
+        <remote-id type="cpan-module">MooseX::Role::Parameterized::Parameters</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-StrictConstructor/metadata.xml b/dev-perl/MooseX-StrictConstructor/metadata.xml
index 93930c417c3a..173f3802e081 100644
--- a/dev-perl/MooseX-StrictConstructor/metadata.xml
+++ b/dev-perl/MooseX-StrictConstructor/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-StrictConstructor</remote-id>
+    <remote-id type="cpan-module">MooseX::StrictConstructor</remote-id>
+    <remote-id type="cpan-module">MooseX::StrictConstructor::Trait::Class</remote-id>
+    <remote-id type="cpan-module">MooseX::StrictConstructor::Trait::Method::Constructor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml b/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
index a63527cb5da5..b690b548f298 100644
--- a/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime-ButMaintained/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime-ButMaintained</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::DateTime::ButMaintained</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml b/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
index e112491e248a..49eb5e1ad490 100644
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime-MoreCoercions</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::DateTime::MoreCoercions</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-DateTime/metadata.xml b/dev-perl/MooseX-Types-DateTime/metadata.xml
index f4ca5b8684f6..f5166f90bc4e 100644
--- a/dev-perl/MooseX-Types-DateTime/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTime/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTime</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::DateTime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-DateTimeX/metadata.xml b/dev-perl/MooseX-Types-DateTimeX/metadata.xml
index 9aed4bd3b2ee..c9e59b12d038 100644
--- a/dev-perl/MooseX-Types-DateTimeX/metadata.xml
+++ b/dev-perl/MooseX-Types-DateTimeX/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-DateTimeX</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::DateTimeX</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-JSON/metadata.xml b/dev-perl/MooseX-Types-JSON/metadata.xml
index 866fbf71f187..ece5b245e729 100644
--- a/dev-perl/MooseX-Types-JSON/metadata.xml
+++ b/dev-perl/MooseX-Types-JSON/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-JSON</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::JSON</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types-Path-Class/metadata.xml b/dev-perl/MooseX-Types-Path-Class/metadata.xml
index b5fd2e6ac5f4..35a22dc1c8e8 100644
--- a/dev-perl/MooseX-Types-Path-Class/metadata.xml
+++ b/dev-perl/MooseX-Types-Path-Class/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types-Path-Class</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Path::Class</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MooseX-Types/metadata.xml b/dev-perl/MooseX-Types/metadata.xml
index c2e313e1c1d8..5ad460099964 100644
--- a/dev-perl/MooseX-Types/metadata.xml
+++ b/dev-perl/MooseX-Types/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MooseX-Types</remote-id>
+    <remote-id type="cpan-module">MooseX::Types</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Base</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::CheckedUtilExports</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Combine</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Moose</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::TypeDecorator</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::UndefinedType</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Util</remote-id>
+    <remote-id type="cpan-module">MooseX::Types::Wrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Mouse/metadata.xml b/dev-perl/Mouse/metadata.xml
index d093be952c27..ed6d8f776041 100644
--- a/dev-perl/Mouse/metadata.xml
+++ b/dev-perl/Mouse/metadata.xml
@@ -4,5 +4,33 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Mouse</remote-id>
+    <remote-id type="cpan-module">Mouse</remote-id>
+    <remote-id type="cpan-module">Mouse::Exporter</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Attribute</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Class</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Method</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Method::Accessor</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Method::Constructor</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Method::Delegation</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Method::Destructor</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Module</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Role</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Role::Application</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Role::Application::RoleSummation</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Role::Composite</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::Role::Method</remote-id>
+    <remote-id type="cpan-module">Mouse::Meta::TypeConstraint</remote-id>
+    <remote-id type="cpan-module">Mouse::Object</remote-id>
+    <remote-id type="cpan-module">Mouse::PurePerl</remote-id>
+    <remote-id type="cpan-module">Mouse::Role</remote-id>
+    <remote-id type="cpan-module">Mouse::Spec</remote-id>
+    <remote-id type="cpan-module">Mouse::TypeRegistry</remote-id>
+    <remote-id type="cpan-module">Mouse::Util</remote-id>
+    <remote-id type="cpan-module">Mouse::Util::MetaRole</remote-id>
+    <remote-id type="cpan-module">Mouse::Util::TypeConstraints</remote-id>
+    <remote-id type="cpan-module">Squirrel</remote-id>
+    <remote-id type="cpan-module">Squirrel::Role</remote-id>
+    <remote-id type="cpan-module">Test::Mouse</remote-id>
+    <remote-id type="cpan-module">ouse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MusicBrainz-DiscID/Manifest b/dev-perl/MusicBrainz-DiscID/Manifest
index 3be9e9d2e12d..b712bcf58a4d 100644
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@@ -1 +1,2 @@
 DIST MusicBrainz-DiscID-0.03.tar.gz 5343 RMD160 06ddcdf08dc27bc8860541aca121f86e39cfcded SHA1 ac64ffcd1e7807ca646e82f43e9a421d1e9d544e SHA256 5002f92fd8f074bccf924752ef171fa11ea2431a634ff60e520a5c3fb080573a
+DIST MusicBrainz-DiscID-0.30.0-patch.tar.bz2 412 RMD160 a1c30eecf2398626fdd6bfa34efc851674611ab0 SHA1 8537b9e47cf8a0a92f2ba0d6892ea8d0192f73dc SHA256 df9f1027a62f070b5b489d71fee2ab928bdf514aaa818608eb0e563700e60bfa
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.03.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0.ebuild
similarity index 71%
rename from dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.03.ebuild
rename to dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0.ebuild
index c8e1bc4099d3..f874e735f07a 100644
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.03.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.03.ebuild,v 1.5 2012/06/18 19:05:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0.ebuild,v 1.1 2012/06/24 18:41:16 tove Exp $
 
 EAPI=4
 
 MODULE_AUTHOR=NJH
+MODULE_VERSION=0.03
 inherit perl-module
 
 DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
+SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${P}-patch.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,9 +23,14 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-Pod
 		virtual/perl-Test-Simple
-		)"
+	)
+"
 
 SRC_TEST="do"
+EPATCH_SUFFIX=patch
+PATCHES=(
+	"${WORKDIR}"/${MY_PN:-${PN}}-patch
+)
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/MusicBrainz-DiscID/metadata.xml b/dev-perl/MusicBrainz-DiscID/metadata.xml
index 2b280bb2483c..a40ce4720dfa 100644
--- a/dev-perl/MusicBrainz-DiscID/metadata.xml
+++ b/dev-perl/MusicBrainz-DiscID/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>perl</herd>
 <herd>sound</herd>
+<upstream>
+<remote-id type="cpan">MusicBrainz-DiscID</remote-id>
+<remote-id type="cpan-module">MusicBrainz::DiscID</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Nagios-Plugin/metadata.xml b/dev-perl/Nagios-Plugin/metadata.xml
index f12f9836c4ad..de1e4dcbd948 100644
--- a/dev-perl/Nagios-Plugin/metadata.xml
+++ b/dev-perl/Nagios-Plugin/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Nagios-Plugin</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Config</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::ExitResult</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Functions</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Getopt</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Performance</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Range</remote-id>
+    <remote-id type="cpan-module">Nagios::Plugin::Threshold</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Amazon-S3/metadata.xml b/dev-perl/Net-Amazon-S3/metadata.xml
index 0769472715c3..6a4e5e03acba 100644
--- a/dev-perl/Net-Amazon-S3/metadata.xml
+++ b/dev-perl/Net-Amazon-S3/metadata.xml
@@ -4,5 +4,24 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Amazon-S3</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Bucket</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Client</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Client::Bucket</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Client::Object</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::HTTPRequest</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::CreateBucket</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::DeleteBucket</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::DeleteObject</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::GetBucketAccessControl</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::GetBucketLocationConstraint</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::GetObject</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::GetObjectAccessControl</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::ListAllMyBuckets</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::ListBucket</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::PutObject</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::SetBucketAccessControl</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::S3::Request::SetObjectAccessControl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Amazon/metadata.xml b/dev-perl/Net-Amazon/metadata.xml
index c11d5a2115a6..65f8d659f968 100644
--- a/dev-perl/Net-Amazon/metadata.xml
+++ b/dev-perl/Net-Amazon/metadata.xml
@@ -4,5 +4,428 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Amazon</remote-id>
+    <remote-id type="cpan-module">Net::Amazon</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Attribute::Review</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Attribute::ReviewSet</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::Book</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::CE</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::DigitalMusicTrack</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Property::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::ASIN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::All</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Exchange</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::ISBN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Keyword</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Seller</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Similar</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Request::UPC</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::ASIN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::All</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Exchange</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::ISBN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Keyword</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Seller</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Similar</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Response::UPC</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Result::Seller</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Result::Seller::Listing</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::ForeignBooks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::SoftwareVideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::ca::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Apparel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Automotive</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Availability</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Baby</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Beauty</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::DeliveryMethod</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::ForeignBooks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Format</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::HealthPersonalCare</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::HomeGarden</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::ISPUPostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Jewelry</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Kitchen</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MPAARating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Magazines</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::MusicTracks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::OfficeProducts</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Orchestra</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::OutdoorLiving</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::PCHardware</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Performer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Photo</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::PostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::SoftwareVideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::SportingGoods</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::State</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Tools</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Toys</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::de::Watches</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Availability</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Baby</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Beauty</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::DeliveryMethod</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::ForeignBooks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Format</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::HealthPersonalCare</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::ISPUPostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Jewelry</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Kitchen</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Magazines</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::MusicTracks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::OfficeProducts</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Orchestra</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Performer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::PostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::SoftwareVideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::State</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::fr::Watches</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Apparel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Availability</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Baby</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Beauty</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::DeliveryMethod</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::ForeignBooks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Format</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Grocery</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::HealthPersonalCare</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Hobbies</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::ISPUPostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Jewelry</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Kitchen</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Magazines</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::MusicTracks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Orchestra</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Performer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::PostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::SportingGoods</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::State</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Toys</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::jp::Watches</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Apparel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Availability</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Baby</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Beauty</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::DeliveryMethod</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::EAN</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Format</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::HealthPersonalCare</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::HomeGarden</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::ISPUPostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Jewelry</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Kitchen</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Magazines</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::MusicTracks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::OfficeProducts</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Orchestra</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::OutdoorLiving</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Performer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::PostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Shoes</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::SoftwareVideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::State</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Toys</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::uk::Watches</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Actor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Apparel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Artist</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::AudienceRating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Author</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Automotive</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Availability</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Baby</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Beauty</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Blended</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Books</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Brand</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::BrowseNode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::City</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Classical</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Composer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Condition</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Conductor</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Count</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::DVD</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Director</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Electronics</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Format</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::GourmetFood</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::HealthPersonalCare</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::HomeGarden</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Industrial</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::ItemPage</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Jewelry</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Keywords</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::KindleStore</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Kitchen</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MP3Downloads</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MPAARating</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Magazines</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Manufacturer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MaximumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MerchantId</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Merchants</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MinimumPrice</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Miscellaneous</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Music</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MusicLabel</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MusicTracks</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::MusicalInstruments</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Neighborhood</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::OfficeProducts</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Orchestra</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::OutdoorLiving</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::PCHardware</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Performer</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::PetSupplies</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Photo</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::PostalCode</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Power</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Publisher</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Shoes</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::SilverMerchants</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Software</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Sort</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::SportingGoods</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::State</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::TextStream</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Title</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Tools</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Toys</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::UPC</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::UnboxVideo</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::VHS</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Video</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::VideoGames</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Watches</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::Wireless</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::ItemSearch::us::WirelessAccessories</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::BrowseNodeLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CartAdd</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CartClear</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CartCreate</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CartGet</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CartModify</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CustomerContentLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::CustomerContentSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::Help</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::ItemLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::ItemSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::ListLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::ListSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::SellerListingLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::SellerListingSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::SellerLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::SimilarityLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::TagLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::TransactionLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::VehiclePartLookup</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::VehiclePartSearch</remote-id>
+    <remote-id type="cpan-module">Net::Amazon::Validate::Type::VehicleSearch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-CIDR-Lite/metadata.xml b/dev-perl/Net-CIDR-Lite/metadata.xml
index bd667b4a0aea..2f5ee7eb3195 100644
--- a/dev-perl/Net-CIDR-Lite/metadata.xml
+++ b/dev-perl/Net-CIDR-Lite/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-CIDR-Lite</remote-id>
+    <remote-id type="cpan-module">Net::CIDR::Lite</remote-id>
+    <remote-id type="cpan-module">Net::CIDR::Lite::Span</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-CIDR/metadata.xml b/dev-perl/Net-CIDR/metadata.xml
index 932eb12f5426..30dd41d4d171 100644
--- a/dev-perl/Net-CIDR/metadata.xml
+++ b/dev-perl/Net-CIDR/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-CIDR</remote-id>
+    <remote-id type="cpan-module">Net::CIDR</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-CUPS/metadata.xml b/dev-perl/Net-CUPS/metadata.xml
index 74f22bac74d3..b9c823bd8ff0 100644
--- a/dev-perl/Net-CUPS/metadata.xml
+++ b/dev-perl/Net-CUPS/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-CUPS</remote-id>
+    <remote-id type="cpan-module">Net::CUPS</remote-id>
+    <remote-id type="cpan-module">Net::CUPS::Destination</remote-id>
+    <remote-id type="cpan-module">Net::CUPS::IPP</remote-id>
+    <remote-id type="cpan-module">Net::CUPS::PPD</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-DBus/metadata.xml b/dev-perl/Net-DBus/metadata.xml
index b30f5c074a4d..f9cded3c0ea3 100644
--- a/dev-perl/Net-DBus/metadata.xml
+++ b/dev-perl/Net-DBus/metadata.xml
@@ -4,5 +4,34 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-DBus</remote-id>
+    <remote-id type="cpan-module">Net::DBus</remote-id>
+    <remote-id type="cpan-module">Net::DBus::ASyncReply</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Annotation</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Bus</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Connection</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Introspector</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Iterator</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Message</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Message::Error</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Message::MethodCall</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Message::MethodReturn</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Message::Signal</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::PendingCall</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Server</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Value</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Binding::Watch</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Callback</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Dumper</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Error</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Exporter</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Object</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Reactor</remote-id>
+    <remote-id type="cpan-module">Net::DBus::RemoteObject</remote-id>
+    <remote-id type="cpan-module">Net::DBus::RemoteService</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Service</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Test::MockConnection</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Test::MockIterator</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Test::MockMessage</remote-id>
+    <remote-id type="cpan-module">Net::DBus::Test::MockObject</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-DNS-Async/metadata.xml b/dev-perl/Net-DNS-Async/metadata.xml
index 7470da006f2a..9e1a11f6cfcb 100644
--- a/dev-perl/Net-DNS-Async/metadata.xml
+++ b/dev-perl/Net-DNS-Async/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DNS-Async</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Async</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml b/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
index 953255a9f6ac..a7d081105ba4 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
+++ b/dev-perl/Net-DNS-Resolver-Programmable/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-DNS-Resolver-Programmable</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Programmable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-DNS/metadata.xml b/dev-perl/Net-DNS/metadata.xml
index 210ff3c46b11..11565724047b 100644
--- a/dev-perl/Net-DNS/metadata.xml
+++ b/dev-perl/Net-DNS/metadata.xml
@@ -4,5 +4,66 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-DNS</remote-id>
+    <remote-id type="cpan-module">Net::DNS</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Domain</remote-id>
+    <remote-id type="cpan-module">Net::DNS::DomainName</remote-id>
+    <remote-id type="cpan-module">Net::DNS::DomainName1035</remote-id>
+    <remote-id type="cpan-module">Net::DNS::DomainName2535</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Header</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Mailbox</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Mailbox1035</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Mailbox2535</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Nameserver</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Packet</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Question</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::A</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::AAAA</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::AFSDB</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::APL</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::APL::ApItem</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::CERT</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::CNAME</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::DHCID</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::DNAME</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::EID</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::HINFO</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::HIP</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::IPSECKEY</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::ISDN</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::KX</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::LOC</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::MB</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::MG</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::MINFO</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::MR</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::MX</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::NAPTR</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::NIMLOC</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::NS</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::NSAP</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::NULL</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::OPT</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::PTR</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::PX</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::RP</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::RT</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::SOA</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::SPF</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::SRV</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::SSHFP</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::TKEY</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::TSIG</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::TXT</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::Unknown</remote-id>
+    <remote-id type="cpan-module">Net::DNS::RR::X25</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Base</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Cygwin</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Recurse</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::UNIX</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Resolver::Win32</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Text</remote-id>
+    <remote-id type="cpan-module">Net::DNS::Update</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Daemon/metadata.xml b/dev-perl/Net-Daemon/metadata.xml
index 40ba208dc39d..83dbeb6b633c 100644
--- a/dev-perl/Net-Daemon/metadata.xml
+++ b/dev-perl/Net-Daemon/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Daemon</remote-id>
+    <remote-id type="cpan-module">Net::Daemon</remote-id>
+    <remote-id type="cpan-module">Net::Daemon::Log</remote-id>
+    <remote-id type="cpan-module">Net::Daemon::Test</remote-id>
+    <remote-id type="cpan-module">Net::Daemon::Test::Fork</remote-id>
+    <remote-id type="cpan-module">Net::Daemon::Test::Win32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Domain-TLD/metadata.xml b/dev-perl/Net-Domain-TLD/metadata.xml
index 1b751b6508d5..b3f0c02bb0d3 100644
--- a/dev-perl/Net-Domain-TLD/metadata.xml
+++ b/dev-perl/Net-Domain-TLD/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Domain-TLD</remote-id>
+    <remote-id type="cpan-module">Net::Domain::TLD</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-FreeDB/metadata.xml b/dev-perl/Net-FreeDB/metadata.xml
index 9778b6796c0d..ab0404d6e9af 100644
--- a/dev-perl/Net-FreeDB/metadata.xml
+++ b/dev-perl/Net-FreeDB/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-FreeDB</remote-id>
+    <remote-id type="cpan-module">Net::FreeDB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
index 47194f9b21ca..72c937f66b79 100644
--- a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
+++ b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Google-SafeBrowsing-UpdateRequest</remote-id>
+    <remote-id type="cpan-module">Net::Google::SafeBrowsing::UpdateRequest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-HTTP/metadata.xml b/dev-perl/Net-HTTP/metadata.xml
index 89fd6ef02918..df015fe2b75c 100644
--- a/dev-perl/Net-HTTP/metadata.xml
+++ b/dev-perl/Net-HTTP/metadata.xml
@@ -4,5 +4,9 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Net-HTTP</remote-id>
+		<remote-id type="cpan-module">Net::HTTP</remote-id>
+		<remote-id type="cpan-module">Net::HTTP::Methods</remote-id>
+		<remote-id type="cpan-module">Net::HTTP::NB</remote-id>
+		<remote-id type="cpan-module">Net::HTTPS</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-IMAP-Simple-SSL/metadata.xml b/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
index d3faeea90cf4..57f94a0ae3f3 100644
--- a/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
+++ b/dev-perl/Net-IMAP-Simple-SSL/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-IMAP-Simple-SSL</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Simple::SSL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-IMAP-Simple/metadata.xml b/dev-perl/Net-IMAP-Simple/metadata.xml
index 03d5ac98f312..3345c86ace9c 100644
--- a/dev-perl/Net-IMAP-Simple/metadata.xml
+++ b/dev-perl/Net-IMAP-Simple/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-IMAP-Simple</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Simple</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Simple::PipeSocket</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::SimpleX</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::SimpleX::Body</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::SimpleX::BodySummary</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::SimpleX::NIL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-IP/metadata.xml b/dev-perl/Net-IP/metadata.xml
index 43fb2efacd0d..3c0082b303a5 100644
--- a/dev-perl/Net-IP/metadata.xml
+++ b/dev-perl/Net-IP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-IP</remote-id>
+    <remote-id type="cpan-module">Net::IP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-IRC/metadata.xml b/dev-perl/Net-IRC/metadata.xml
index 0ecd83fa6ad0..b682e5972d0a 100644
--- a/dev-perl/Net-IRC/metadata.xml
+++ b/dev-perl/Net-IRC/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-IRC</remote-id>
+    <remote-id type="cpan-module">Net::IRC</remote-id>
+    <remote-id type="cpan-module">Net::IRC::Connection</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC::Accept</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC::CHAT</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC::Connection</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC::GET</remote-id>
+    <remote-id type="cpan-module">Net::IRC::DCC::SEND</remote-id>
+    <remote-id type="cpan-module">Net::IRC::Event</remote-id>
+    <remote-id type="cpan-module">Net::IRC::EventQueue</remote-id>
+    <remote-id type="cpan-module">Net::IRC::EventQueue::Entry</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Ident/metadata.xml b/dev-perl/Net-Ident/metadata.xml
index 11e141987c32..07283811627e 100644
--- a/dev-perl/Net-Ident/metadata.xml
+++ b/dev-perl/Net-Ident/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Ident</remote-id>
+    <remote-id type="cpan-module">Net::Ident</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Jabber/metadata.xml b/dev-perl/Net-Jabber/metadata.xml
index 0e9b7ca70392..0254180e9435 100644
--- a/dev-perl/Net-Jabber/metadata.xml
+++ b/dev-perl/Net-Jabber/metadata.xml
@@ -4,5 +4,24 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Jabber</remote-id>
+    <remote-id type="cpan-module">Net::Jabber</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Client</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Component</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Data</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Debug</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Dialback</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Dialback::Result</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Dialback::Verify</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::IQ</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::JID</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Key</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Log</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Message</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Namespaces</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Presence</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Protocol</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Server</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::Stanza</remote-id>
+    <remote-id type="cpan-module">Net::Jabber::XDB</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-LDAPapi/metadata.xml b/dev-perl/Net-LDAPapi/metadata.xml
index 83e15ffdb971..af2fb93e808e 100644
--- a/dev-perl/Net-LDAPapi/metadata.xml
+++ b/dev-perl/Net-LDAPapi/metadata.xml
@@ -9,5 +9,6 @@
   <upstream>
     <remote-id type="sourceforge">net-ldapapi</remote-id>
     <remote-id type="cpan">Net-LDAPapi</remote-id>
+    <remote-id type="cpan-module">Net::LDAPapi</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-LibIDN/metadata.xml b/dev-perl/Net-LibIDN/metadata.xml
index 9d5bcc1c132d..b852d06792a5 100644
--- a/dev-perl/Net-LibIDN/metadata.xml
+++ b/dev-perl/Net-LibIDN/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-LibIDN</remote-id>
+    <remote-id type="cpan-module">Net::LibIDN</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Netmask/metadata.xml b/dev-perl/Net-Netmask/metadata.xml
index 12014071c58a..74b22cef7899 100644
--- a/dev-perl/Net-Netmask/metadata.xml
+++ b/dev-perl/Net-Netmask/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Netmask</remote-id>
+    <remote-id type="cpan-module">Net::Netmask</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-OAuth/metadata.xml b/dev-perl/Net-OAuth/metadata.xml
index 136b3c2d82f5..cdd31e9b7fe0 100644
--- a/dev-perl/Net-OAuth/metadata.xml
+++ b/dev-perl/Net-OAuth/metadata.xml
@@ -4,5 +4,29 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-OAuth</remote-id>
+    <remote-id type="cpan-module">Net::OAuth</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::AccessToken</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::AccessTokenRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::AccessTokenResponse</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::Client</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::ConsumerRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::Message</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::ProtectedResourceRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::Request</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::RequestTokenRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::RequestTokenResponse</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::Response</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::SignatureMethod::HMAC_SHA1</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::SignatureMethod::HMAC_SHA256</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::SignatureMethod::PLAINTEXT</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::SignatureMethod::RSA_SHA1</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::UserAuthRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::UserAuthResponse</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::V1_0A::AccessTokenRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::V1_0A::RequestTokenRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::V1_0A::RequestTokenResponse</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::V1_0A::UserAuthResponse</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::XauthAccessTokenRequest</remote-id>
+    <remote-id type="cpan-module">Net::OAuth::YahooAccessTokenRefreshRequest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-OpenID-Consumer/metadata.xml b/dev-perl/Net-OpenID-Consumer/metadata.xml
index 815b493e0f12..334d6da17850 100644
--- a/dev-perl/Net-OpenID-Consumer/metadata.xml
+++ b/dev-perl/Net-OpenID-Consumer/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-OpenID-Consumer</remote-id>
+    <remote-id type="cpan-module">Net::OpenID::Association</remote-id>
+    <remote-id type="cpan-module">Net::OpenID::ClaimedIdentity</remote-id>
+    <remote-id type="cpan-module">Net::OpenID::Consumer</remote-id>
+    <remote-id type="cpan-module">Net::OpenID::VerifiedIdentity</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Patricia/metadata.xml b/dev-perl/Net-Patricia/metadata.xml
index af776bd538d0..0e917f20c2bf 100644
--- a/dev-perl/Net-Patricia/metadata.xml
+++ b/dev-perl/Net-Patricia/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Patricia</remote-id>
+    <remote-id type="cpan-module">Net::Patricia</remote-id>
+    <remote-id type="cpan-module">Net::Patricia::AF_INET</remote-id>
+    <remote-id type="cpan-module">Net::Patricia::AF_INET6</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Pcap/metadata.xml b/dev-perl/Net-Pcap/metadata.xml
index b494fa18cfd9..09ad0ec59c3b 100644
--- a/dev-perl/Net-Pcap/metadata.xml
+++ b/dev-perl/Net-Pcap/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Pcap</remote-id>
+    <remote-id type="cpan-module">Net::Pcap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-PcapUtils/metadata.xml b/dev-perl/Net-PcapUtils/metadata.xml
index 0128b665e6fa..00b23e91b654 100644
--- a/dev-perl/Net-PcapUtils/metadata.xml
+++ b/dev-perl/Net-PcapUtils/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-PcapUtils</remote-id>
+    <remote-id type="cpan-module">Net::PcapUtils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-RBLClient/metadata.xml b/dev-perl/Net-RBLClient/metadata.xml
index 85f601beb3dc..3f166efd9ad9 100644
--- a/dev-perl/Net-RBLClient/metadata.xml
+++ b/dev-perl/Net-RBLClient/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-RBLClient</remote-id>
+    <remote-id type="cpan-module">Net::RBLClient</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-RawIP/metadata.xml b/dev-perl/Net-RawIP/metadata.xml
index 5198735224b9..02e7b40fc9bb 100644
--- a/dev-perl/Net-RawIP/metadata.xml
+++ b/dev-perl/Net-RawIP/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-RawIP</remote-id>
+    <remote-id type="cpan-module">Net::RawIP</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::ethhdr</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::generichdr</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::icmphdr</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::iphdr</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::opt</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::tcphdr</remote-id>
+    <remote-id type="cpan-module">Net::RawIP::udphdr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-SMTP-SSL/metadata.xml b/dev-perl/Net-SMTP-SSL/metadata.xml
index 2e84bd50b86b..36d79d5f7c14 100644
--- a/dev-perl/Net-SMTP-SSL/metadata.xml
+++ b/dev-perl/Net-SMTP-SSL/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-SMTP-SSL</remote-id>
+    <remote-id type="cpan-module">Net::SMTP::SSL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-SMTP-TLS/metadata.xml b/dev-perl/Net-SMTP-TLS/metadata.xml
index b944599a0c4c..28aeffb5dadd 100644
--- a/dev-perl/Net-SMTP-TLS/metadata.xml
+++ b/dev-perl/Net-SMTP-TLS/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <herd>perl</herd>
   <upstream>
-	  <remote-id type="cpan">Net-SMTP-TLS</remote-id>
+    <remote-id type="cpan">Net-SMTP-TLS</remote-id>
+    <remote-id type="cpan-module">Net::SMTP::TLS</remote-id>
   </upstream>
 </pkgmetadata>
-
diff --git a/dev-perl/Net-SNMP/metadata.xml b/dev-perl/Net-SNMP/metadata.xml
index 87cf97a76a00..6b4327416c05 100644
--- a/dev-perl/Net-SNMP/metadata.xml
+++ b/dev-perl/Net-SNMP/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SNMP</remote-id>
+    <remote-id type="cpan-module">Net::SNMP</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Dispatcher</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Message</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::MessageProcessing</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::PDU</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Security</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Security::Community</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Security::USM</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv4</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv4::TCP</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv4::UDP</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv6</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv6::TCP</remote-id>
+    <remote-id type="cpan-module">Net::SNMP::Transport::IPv6::UDP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-SNPP/metadata.xml b/dev-perl/Net-SNPP/metadata.xml
index c6eca17ed3dd..6bd58065f457 100644
--- a/dev-perl/Net-SNPP/metadata.xml
+++ b/dev-perl/Net-SNPP/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SNPP</remote-id>
+    <remote-id type="cpan-module">Net::SNPP</remote-id>
+    <remote-id type="cpan-module">Net::SNPP::HylaFAX</remote-id>
+    <remote-id type="cpan-module">Net::SNPP::Server</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml b/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
index 356f036a64fa..18eb0be0d225 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SSH-AuthorizedKeysFile</remote-id>
+    <remote-id type="cpan-module">Net::SSH::AuthorizedKey</remote-id>
+    <remote-id type="cpan-module">Net::SSH::AuthorizedKey::Base</remote-id>
+    <remote-id type="cpan-module">Net::SSH::AuthorizedKey::SSH1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::AuthorizedKey::SSH2</remote-id>
+    <remote-id type="cpan-module">Net::SSH::AuthorizedKeysFile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-SSLeay/metadata.xml b/dev-perl/Net-SSLeay/metadata.xml
index a5b23c0013c3..42960496c61c 100644
--- a/dev-perl/Net-SSLeay/metadata.xml
+++ b/dev-perl/Net-SSLeay/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SSLeay</remote-id>
+    <remote-id type="cpan-module">Net::SSLeay</remote-id>
+    <remote-id type="cpan-module">Net::SSLeay::Handle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Server-Coro/metadata.xml b/dev-perl/Net-Server-Coro/metadata.xml
index 2fb17c569b3d..cd919028c58b 100644
--- a/dev-perl/Net-Server-Coro/metadata.xml
+++ b/dev-perl/Net-Server-Coro/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Server-Coro</remote-id>
+    <remote-id type="cpan-module">Net::Server::Coro</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::Coro</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::Coro::FH</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Server-Mail/metadata.xml b/dev-perl/Net-Server-Mail/metadata.xml
index 345bf5f26301..148869095784 100644
--- a/dev-perl/Net-Server-Mail/metadata.xml
+++ b/dev-perl/Net-Server-Mail/metadata.xml
@@ -4,5 +4,13 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Net-Server-Mail</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::ESMTP</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::ESMTP::8BITMIME</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::ESMTP::Extension</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::ESMTP::PIPELINING</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::ESMTP::XFORWARD</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::LMTP</remote-id>
+		<remote-id type="cpan-module">Net::Server::Mail::SMTP</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Telnet-Cisco/metadata.xml b/dev-perl/Net-Telnet-Cisco/metadata.xml
index 03ec5d76adb6..9ce9b82c7d99 100644
--- a/dev-perl/Net-Telnet-Cisco/metadata.xml
+++ b/dev-perl/Net-Telnet-Cisco/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Telnet-Cisco</remote-id>
+    <remote-id type="cpan-module">Net::Telnet::Cisco</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Telnet/metadata.xml b/dev-perl/Net-Telnet/metadata.xml
index 27ecb63a78a8..65e79d5f58e1 100644
--- a/dev-perl/Net-Telnet/metadata.xml
+++ b/dev-perl/Net-Telnet/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Telnet</remote-id>
+    <remote-id type="cpan-module">Net::Telnet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Twitter/metadata.xml b/dev-perl/Net-Twitter/metadata.xml
index 6a831eb94c77..83301c79d35c 100644
--- a/dev-perl/Net-Twitter/metadata.xml
+++ b/dev-perl/Net-Twitter/metadata.xml
@@ -4,5 +4,27 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Twitter</remote-id>
+    <remote-id type="cpan-module">Net::Identica</remote-id>
+    <remote-id type="cpan-module">Net::Twitter</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::API</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Core</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Error</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Meta::Method</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::OAuth</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::Lists</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::REST</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::Search</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::Search::Trends</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::TwitterVision</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::API::Upload</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::AutoCursor</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::InflateObjects</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::Legacy</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::OAuth</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::RateLimit</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::RetryOnError</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::SimulateCursors</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Role::WrapError</remote-id>
+    <remote-id type="cpan-module">Net::Twitter::Search</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-UPnP/metadata.xml b/dev-perl/Net-UPnP/metadata.xml
index 1f235e3d1210..c95dca8ec581 100644
--- a/dev-perl/Net-UPnP/metadata.xml
+++ b/dev-perl/Net-UPnP/metadata.xml
@@ -4,5 +4,19 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-UPnP</remote-id>
+    <remote-id type="cpan-module">Net::UPnP</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::AV::Container</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::AV::Content</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::AV::Item</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::AV::MediaRenderer</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::AV::MediaServer</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::ActionResponse</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::ControlPoint</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::Device</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::GW::Gateway</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::HTTP</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::HTTPResponse</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::QueryResponse</remote-id>
+    <remote-id type="cpan-module">Net::UPnP::Service</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-XMPP/metadata.xml b/dev-perl/Net-XMPP/metadata.xml
index 9f9c412c2aaf..6b331c63038e 100644
--- a/dev-perl/Net-XMPP/metadata.xml
+++ b/dev-perl/Net-XMPP/metadata.xml
@@ -5,5 +5,18 @@
   <longdescription>Net::XMPP is a collection of Perl modules that provide a Perl Developer access to the XMPP protocol.</longdescription>
   <upstream>
     <remote-id type="cpan">Net-XMPP</remote-id>
+    <remote-id type="cpan-module">Net::XMPP</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Client</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Connection</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Debug</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::IQ</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::JID</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Message</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Namespaces</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Presence</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::PrivacyLists</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Protocol</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Roster</remote-id>
+    <remote-id type="cpan-module">Net::XMPP::Stanza</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Z3950-ZOOM/metadata.xml b/dev-perl/Net-Z3950-ZOOM/metadata.xml
index e1504d38cd69..ba63af738e32 100644
--- a/dev-perl/Net-Z3950-ZOOM/metadata.xml
+++ b/dev-perl/Net-Z3950-ZOOM/metadata.xml
@@ -8,5 +8,27 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Z3950-ZOOM</remote-id>
+    <remote-id type="cpan-module">Net::Z3950</remote-id>
+    <remote-id type="cpan-module">Net::Z3950::Connection</remote-id>
+    <remote-id type="cpan-module">Net::Z3950::Manager</remote-id>
+    <remote-id type="cpan-module">Net::Z3950::Op</remote-id>
+    <remote-id type="cpan-module">Net::Z3950::ZOOM</remote-id>
+    <remote-id type="cpan-module">ZOOM</remote-id>
+    <remote-id type="cpan-module">ZOOM::CCL::Error</remote-id>
+    <remote-id type="cpan-module">ZOOM::Connection</remote-id>
+    <remote-id type="cpan-module">ZOOM::Error</remote-id>
+    <remote-id type="cpan-module">ZOOM::Event</remote-id>
+    <remote-id type="cpan-module">ZOOM::Exception</remote-id>
+    <remote-id type="cpan-module">ZOOM::Log</remote-id>
+    <remote-id type="cpan-module">ZOOM::Options</remote-id>
+    <remote-id type="cpan-module">ZOOM::Package</remote-id>
+    <remote-id type="cpan-module">ZOOM::Query</remote-id>
+    <remote-id type="cpan-module">ZOOM::Query::CCL2RPN</remote-id>
+    <remote-id type="cpan-module">ZOOM::Query::CQL</remote-id>
+    <remote-id type="cpan-module">ZOOM::Query::CQL2RPN</remote-id>
+    <remote-id type="cpan-module">ZOOM::Query::PQF</remote-id>
+    <remote-id type="cpan-module">ZOOM::Record</remote-id>
+    <remote-id type="cpan-module">ZOOM::ResultSet</remote-id>
+    <remote-id type="cpan-module">ZOOM::ScanSet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/NetAddr-IP/metadata.xml b/dev-perl/NetAddr-IP/metadata.xml
index bec8fec1e4d2..baf98ce4c7ea 100644
--- a/dev-perl/NetAddr-IP/metadata.xml
+++ b/dev-perl/NetAddr-IP/metadata.xml
@@ -8,5 +8,12 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">NetAddr-IP</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::InetBase</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::Lite</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::Util</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::UtilPP</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::UtilPolluted</remote-id>
+    <remote-id type="cpan-module">NetAddr::IP::Util_IS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/NetPacket/metadata.xml b/dev-perl/NetPacket/metadata.xml
index 76913a2ff705..8331404a849a 100644
--- a/dev-perl/NetPacket/metadata.xml
+++ b/dev-perl/NetPacket/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">NetPacket</remote-id>
+    <remote-id type="cpan-module">NetPacket</remote-id>
+    <remote-id type="cpan-module">NetPacket::ARP</remote-id>
+    <remote-id type="cpan-module">NetPacket::Ethernet</remote-id>
+    <remote-id type="cpan-module">NetPacket::ICMP</remote-id>
+    <remote-id type="cpan-module">NetPacket::IGMP</remote-id>
+    <remote-id type="cpan-module">NetPacket::IP</remote-id>
+    <remote-id type="cpan-module">NetPacket::TCP</remote-id>
+    <remote-id type="cpan-module">NetPacket::UDP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/NetxAP/metadata.xml b/dev-perl/NetxAP/metadata.xml
index 250edda8687f..9762908080f9 100644
--- a/dev-perl/NetxAP/metadata.xml
+++ b/dev-perl/NetxAP/metadata.xml
@@ -4,5 +4,37 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">NetxAP</remote-id>
+    <remote-id type="cpan-module">Net::IMAP</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Acl</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Addr</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Bad</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::BodyStructure</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Bodypart</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Bye</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Capability</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Cond</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Envelope</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Exists</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Expunge</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Fetch</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::FetchData</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Flags</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::List</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Listrights</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Lsub</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Multipart</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Myrights</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Namespace</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::No</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Ok</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Quota</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Quotaroot</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Recent</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Response</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Search</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::Status</remote-id>
+    <remote-id type="cpan-module">Net::IMAP::UntaggedResponse</remote-id>
+    <remote-id type="cpan-module">Net::xAP</remote-id>
+    <remote-id type="cpan-module">Net::xAP::Response</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/News-Newsrc/metadata.xml b/dev-perl/News-Newsrc/metadata.xml
index 2f0208b41b96..9bf5fa54fcff 100644
--- a/dev-perl/News-Newsrc/metadata.xml
+++ b/dev-perl/News-Newsrc/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">News-Newsrc</remote-id>
+    <remote-id type="cpan-module">News::Newsrc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Nmap-Parser/metadata.xml b/dev-perl/Nmap-Parser/metadata.xml
index fc4362c68f70..be22f134a6e3 100644
--- a/dev-perl/Nmap-Parser/metadata.xml
+++ b/dev-perl/Nmap-Parser/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Nmap-Parser</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser::Host</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser::Host::OS</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser::Host::Service</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser::Host::TraceHop</remote-id>
+    <remote-id type="cpan-module">Nmap::Parser::Session</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Number-Compare/metadata.xml b/dev-perl/Number-Compare/metadata.xml
index 1ee27c012f60..18b0ee9d94fe 100644
--- a/dev-perl/Number-Compare/metadata.xml
+++ b/dev-perl/Number-Compare/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Number-Compare</remote-id>
+    <remote-id type="cpan-module">Number::Compare</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Number-Format/metadata.xml b/dev-perl/Number-Format/metadata.xml
index f750232dde58..14d4d7882042 100644
--- a/dev-perl/Number-Format/metadata.xml
+++ b/dev-perl/Number-Format/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Number-Format</remote-id>
+    <remote-id type="cpan-module">Number::Format</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/OLE-StorageLite/metadata.xml b/dev-perl/OLE-StorageLite/metadata.xml
index d694ad65207d..c80ee84c7261 100644
--- a/dev-perl/OLE-StorageLite/metadata.xml
+++ b/dev-perl/OLE-StorageLite/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">OLE-Storage_Lite</remote-id>
+    <remote-id type="cpan-module">OLE::Storage_Lite</remote-id>
+    <remote-id type="cpan-module">OLE::Storage_Lite::PPS</remote-id>
+    <remote-id type="cpan-module">OLE::Storage_Lite::PPS::Dir</remote-id>
+    <remote-id type="cpan-module">OLE::Storage_Lite::PPS::File</remote-id>
+    <remote-id type="cpan-module">OLE::Storage_Lite::PPS::Root</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ORLite-Migrate/metadata.xml b/dev-perl/ORLite-Migrate/metadata.xml
index b696c3e64d42..e0f4bda3a961 100644
--- a/dev-perl/ORLite-Migrate/metadata.xml
+++ b/dev-perl/ORLite-Migrate/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ORLite-Migrate</remote-id>
+    <remote-id type="cpan-module">ORLite::Migrate</remote-id>
+    <remote-id type="cpan-module">ORLite::Migrate::Patch</remote-id>
+    <remote-id type="cpan-module">ORLite::Migrate::Timeline</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ORLite/metadata.xml b/dev-perl/ORLite/metadata.xml
index ea049295c87a..da969787eee4 100644
--- a/dev-perl/ORLite/metadata.xml
+++ b/dev-perl/ORLite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ORLite</remote-id>
+    <remote-id type="cpan-module">ORLite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Object-Enum/metadata.xml b/dev-perl/Object-Enum/metadata.xml
index 001ba33240ba..583608bc1656 100644
--- a/dev-perl/Object-Enum/metadata.xml
+++ b/dev-perl/Object-Enum/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Object-Enum</remote-id>
+    <remote-id type="cpan-module">Object::Enum</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Object-Realize-Later/metadata.xml b/dev-perl/Object-Realize-Later/metadata.xml
index 41249e9ea6c0..2278d7e459c8 100644
--- a/dev-perl/Object-Realize-Later/metadata.xml
+++ b/dev-perl/Object-Realize-Later/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Object-Realize-Later</remote-id>
+    <remote-id type="cpan-module">Object::Realize::Later</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml b/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
index 773cc2eccec7..48b91733a5fb 100644
--- a/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
+++ b/dev-perl/Ogg-Vorbis-Header-PurePerl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Ogg-Vorbis-Header-PurePerl</remote-id>
+    <remote-id type="cpan-module">Ogg::Vorbis::Header::PurePerl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Olson-Abbreviations/metadata.xml b/dev-perl/Olson-Abbreviations/metadata.xml
index bbbad5d11270..615b13636f79 100644
--- a/dev-perl/Olson-Abbreviations/metadata.xml
+++ b/dev-perl/Olson-Abbreviations/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Olson-Abbreviations</remote-id>
+    <remote-id type="cpan-module">Olson::Abbreviations</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/OpenGL/metadata.xml b/dev-perl/OpenGL/metadata.xml
index 44f1713debed..51d5a0502876 100644
--- a/dev-perl/OpenGL/metadata.xml
+++ b/dev-perl/OpenGL/metadata.xml
@@ -12,5 +12,6 @@
 </longdescription>
 <upstream>
   <remote-id type="cpan">OpenGL</remote-id>
+  <remote-id type="cpan-module">OpenGL</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PAR-Dist/metadata.xml b/dev-perl/PAR-Dist/metadata.xml
index 2ed598a17b2a..0e96f12ce270 100644
--- a/dev-perl/PAR-Dist/metadata.xml
+++ b/dev-perl/PAR-Dist/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PAR-Dist</remote-id>
+    <remote-id type="cpan-module">PAR::Dist</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PAR/metadata.xml b/dev-perl/PAR/metadata.xml
index 631ae792a13b..922c0e2a0132 100644
--- a/dev-perl/PAR/metadata.xml
+++ b/dev-perl/PAR/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PAR</remote-id>
+    <remote-id type="cpan-module">PAR</remote-id>
+    <remote-id type="cpan-module">PAR::Heavy</remote-id>
+    <remote-id type="cpan-module">PAR::SetupProgname</remote-id>
+    <remote-id type="cpan-module">PAR::SetupTemp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PBS-Client/metadata.xml b/dev-perl/PBS-Client/metadata.xml
index b81771b5df2d..5fd65cd873c2 100644
--- a/dev-perl/PBS-Client/metadata.xml
+++ b/dev-perl/PBS-Client/metadata.xml
@@ -9,5 +9,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">PBS-Client</remote-id>
+    <remote-id type="cpan-module">PBS::Client</remote-id>
+    <remote-id type="cpan-module">PBS::Client::Job</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PDF-API2/metadata.xml b/dev-perl/PDF-API2/metadata.xml
index 10c9fc552eec..7ad2639464d8 100644
--- a/dev-perl/PDF-API2/metadata.xml
+++ b/dev-perl/PDF-API2/metadata.xml
@@ -4,5 +4,108 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PDF-API2</remote-id>
+    <remote-id type="cpan-module">PDF::API2</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Annotation</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::ASCII85Decode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::ASCIIHexDecode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Array</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Bool</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Dict</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::File</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Filter</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::FlateDecode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::LZWDecode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Literal</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Name</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Null</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Number</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Objind</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Page</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Pages</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::RunLengthDecode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::String</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Basic::PDF::Utils</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Content</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Content::Text</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Lite</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Matrix</remote-id>
+    <remote-id type="cpan-module">PDF::API2::NamedDestination</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Outline</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Outlines</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Page</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::BaseFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::CIDFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::CIDFont::CJKFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::CIDFont::TrueType</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::CIDFont::TrueType::FontFile</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::DeviceN</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::Indexed</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::Indexed::ACTFile</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::Indexed::Hue</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::Indexed::WebColor</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ColorSpace::Separation</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Colors</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::ExtGState</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::BdFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::bankgothic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::courier</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::courierbold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::courierboldoblique</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::courieroblique</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::georgia</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::georgiabold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::georgiabolditalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::georgiaitalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::helvetica</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::helveticabold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::helveticaboldoblique</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::helveticaoblique</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::symbol</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::timesbold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::timesbolditalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::timesitalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::timesroman</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::trebuchet</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::trebuchetbold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::trebuchetbolditalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::trebuchetitalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::verdana</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::verdanabold</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::verdanabolditalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::verdanaitalic</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::webdings</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::wingdings</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::CoreFont::zapfdingbats</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::Postscript</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Font::SynFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Glyphs</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::PaperSizes</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Pattern</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::Shading</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::UniFont</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode::codabar</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode::code128</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode::code3of9</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode::ean13</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::BarCode::int2of5</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Form::Hybrid</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::GD</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::GIF</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::JPEG</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::PNG</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::PNM</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::TIFF</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Resource::XObject::Image::Tiff::File</remote-id>
+    <remote-id type="cpan-module">PDF::API2::UniWrap</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Util</remote-id>
+    <remote-id type="cpan-module">PDF::API2::Win32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PDF-Create/metadata.xml b/dev-perl/PDF-Create/metadata.xml
index 1f25e9537dd4..b22b8f285767 100644
--- a/dev-perl/PDF-Create/metadata.xml
+++ b/dev-perl/PDF-Create/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PDF-Create</remote-id>
+    <remote-id type="cpan-module">PDF::Create</remote-id>
+    <remote-id type="cpan-module">PDF::Create::Outline</remote-id>
+    <remote-id type="cpan-module">PDF::Create::Page</remote-id>
+    <remote-id type="cpan-module">PDF::Image::GIF</remote-id>
+    <remote-id type="cpan-module">PDF::Image::JPEG</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PDL/metadata.xml b/dev-perl/PDL/metadata.xml
index d86946c2e268..119d0dcf711f 100644
--- a/dev-perl/PDL/metadata.xml
+++ b/dev-perl/PDL/metadata.xml
@@ -23,5 +23,190 @@
 </use>
 <upstream>
   <remote-id type="cpan">PDL</remote-id>
+  <remote-id type="cpan-module">C::StructObj</remote-id>
+  <remote-id type="cpan-module">C::StructType</remote-id>
+  <remote-id type="cpan-module">C::Type</remote-id>
+  <remote-id type="cpan-module">C::Var</remote-id>
+  <remote-id type="cpan-module">Inline::MakePdlppInstallable</remote-id>
+  <remote-id type="cpan-module">Inline::Pdlpp</remote-id>
+  <remote-id type="cpan-module">NullHandle</remote-id>
+  <remote-id type="cpan-module">PDL</remote-id>
+  <remote-id type="cpan-module">PDL::Basic</remote-id>
+  <remote-id type="cpan-module">PDL::Bench</remote-id>
+  <remote-id type="cpan-module">PDL::CallExt</remote-id>
+  <remote-id type="cpan-module">PDL::Char</remote-id>
+  <remote-id type="cpan-module">PDL::Constants</remote-id>
+  <remote-id type="cpan-module">PDL::Core::Dev</remote-id>
+  <remote-id type="cpan-module">PDL::Dbg</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::Cartography_demo</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::General</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::PGPLOT_OO_demo</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::PGPLOT_demo</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::Routines</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::Transform_demo</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::TriD1</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::TriD2</remote-id>
+  <remote-id type="cpan-module">PDL::Demos::TriDGallery</remote-id>
+  <remote-id type="cpan-module">PDL::DiskCache</remote-id>
+  <remote-id type="cpan-module">PDL::Doc</remote-id>
+  <remote-id type="cpan-module">PDL::Doc::Perldl</remote-id>
+  <remote-id type="cpan-module">PDL::Exporter</remote-id>
+  <remote-id type="cpan-module">PDL::Filter::Gaussian</remote-id>
+  <remote-id type="cpan-module">PDL::Filter::LinPred</remote-id>
+  <remote-id type="cpan-module">PDL::Filter::LinSmooth</remote-id>
+  <remote-id type="cpan-module">PDL::Filter::Linear</remote-id>
+  <remote-id type="cpan-module">PDL::Filter::SavGol</remote-id>
+  <remote-id type="cpan-module">PDL::Fit::LM</remote-id>
+  <remote-id type="cpan-module">PDL::Fit::Linfit</remote-id>
+  <remote-id type="cpan-module">PDL::Fit::Polynomial</remote-id>
+  <remote-id type="cpan-module">PDL::Func</remote-id>
+  <remote-id type="cpan-module">PDL::GraphEvolver</remote-id>
+  <remote-id type="cpan-module">PDL::GraphEvolverOLD</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics2D</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::LUT</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::Limits</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::Limits::DSet</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::OpenGL::OO</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::OpenGL::Perl::OpenGL</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::PGPLOT</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::PGPLOT::Window</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::PGPLOTOptions</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::State</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ArcBall</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ArcBowl</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ArcCone</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Basic</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::BoundingBox</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ButtonControl</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ContourPolygonize</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Contours</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Control3D</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::CylindricalEquidistantAxes</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Description</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::EuclidAxes</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::EventHandler</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::GL::Window</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::GObject</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::GObject_Lattice</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::GPObject</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::GoBoard</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Graph</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Image</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Labels</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Lattice</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::LineStrip</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Lines</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::LinesFOOOLD</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Logo</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Material</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::MathGraph</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Mesh</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::OOGL</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Object</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::OneTransformation</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Points</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::PolarStereoAxes</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Polygonize</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::QuaterController</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Quaternion</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::SCLattice</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::SLattice</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::SLattice_S</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::STrigrid</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::STrigrid_S</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Scale</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ScaleController</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::SimpleController</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::SimpleScaler</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Spheres</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::StupidPolygonize</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Surface</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Transformation</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Translation</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::VRML</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::VRML::Parameter</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::VRML::URL</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::VRMLObject</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::ViewPort</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::TriD::Window</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::VRML</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::VRML::Protos</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::VRMLNode</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::VRMLPdlNode</remote-id>
+  <remote-id type="cpan-module">PDL::Graphics::VRMLProto</remote-id>
+  <remote-id type="cpan-module">PDL::IO::Dicom</remote-id>
+  <remote-id type="cpan-module">PDL::IO::Dumper</remote-id>
+  <remote-id type="cpan-module">PDL::IO::FITS</remote-id>
+  <remote-id type="cpan-module">PDL::IO::FastRaw</remote-id>
+  <remote-id type="cpan-module">PDL::IO::FlexRaw</remote-id>
+  <remote-id type="cpan-module">PDL::IO::HDF</remote-id>
+  <remote-id type="cpan-module">PDL::IO::Pic</remote-id>
+  <remote-id type="cpan-module">PDL::Interpolate</remote-id>
+  <remote-id type="cpan-module">PDL::Interpolate::Slatec</remote-id>
+  <remote-id type="cpan-module">PDL::Lite</remote-id>
+  <remote-id type="cpan-module">PDL::LiteF</remote-id>
+  <remote-id type="cpan-module">PDL::Lvalue</remote-id>
+  <remote-id type="cpan-module">PDL::Matrix</remote-id>
+  <remote-id type="cpan-module">PDL::MyInlineMod</remote-id>
+  <remote-id type="cpan-module">PDL::NiceSlice</remote-id>
+  <remote-id type="cpan-module">PDL::Opt::Simplex</remote-id>
+  <remote-id type="cpan-module">PDL::Options</remote-id>
+  <remote-id type="cpan-module">PDL::PP</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Access</remote-id>
+  <remote-id type="cpan-module">PDL::PP::BackCodeThreadLoop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::BadAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::BadSwitch</remote-id>
+  <remote-id type="cpan-module">PDL::PP::BadVarAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Block</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Code</remote-id>
+  <remote-id type="cpan-module">PDL::PP::ComplexThreadLoop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::GenericLoop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::GentypeAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Ind</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Loop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::MacroAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::NaNSupport</remote-id>
+  <remote-id type="cpan-module">PDL::PP::OtherAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PDLStateBadAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PPBadAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PdlAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PdlDimsObj</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PdlParObj</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PhysPointerAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::PointerAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::ReSizeAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::InsertName</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::MakeComp</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Returns</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Returns::EmptyString</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Returns::NULL</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Returns::One</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Returns::Zero</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Substitute</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Rule::Substitute::Usual</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Signature</remote-id>
+  <remote-id type="cpan-module">PDL::PP::SimpleThreadLoop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::SizeAccess</remote-id>
+  <remote-id type="cpan-module">PDL::PP::ThreadLoop</remote-id>
+  <remote-id type="cpan-module">PDL::PP::TypeConv</remote-id>
+  <remote-id type="cpan-module">PDL::PP::Types</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Plugin::CleanErrors</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Plugin::NiceSlice</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Plugin::PDLCommands</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Plugin::PrintControl</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Profile::Perldl2</remote-id>
+  <remote-id type="cpan-module">PDL::Perldl2::Script</remote-id>
+  <remote-id type="cpan-module">PDL::Pod::Parser</remote-id>
+  <remote-id type="cpan-module">PDL::Pod::Select</remote-id>
+  <remote-id type="cpan-module">PDL::Pod::Usage</remote-id>
+  <remote-id type="cpan-module">PDL::PodParser</remote-id>
+  <remote-id type="cpan-module">PDL::Reduce</remote-id>
+  <remote-id type="cpan-module">PDL::Transform::Cartography</remote-id>
+  <remote-id type="cpan-module">StrHandle</remote-id>
+  <remote-id type="cpan-module">SymTab</remote-id>
+  <remote-id type="cpan-module">Win32::DDE::Netscape</remote-id>
+  <remote-id type="cpan-module">XS</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PGPLOT/metadata.xml b/dev-perl/PGPLOT/metadata.xml
index 97554ead378f..1424466eeaf4 100644
--- a/dev-perl/PGPLOT/metadata.xml
+++ b/dev-perl/PGPLOT/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PGPLOT</remote-id>
+    <remote-id type="cpan-module">PGPLOT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PHP-Serialization/metadata.xml b/dev-perl/PHP-Serialization/metadata.xml
index d647d16cf25a..a17a18553a7d 100644
--- a/dev-perl/PHP-Serialization/metadata.xml
+++ b/dev-perl/PHP-Serialization/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PHP-Serialization</remote-id>
+    <remote-id type="cpan-module">PHP::Serialization</remote-id>
+    <remote-id type="cpan-module">PHP::Serialization::Object</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-API-Peek/metadata.xml b/dev-perl/POE-API-Peek/metadata.xml
index 35d896214cf8..02f12d03c88f 100644
--- a/dev-perl/POE-API-Peek/metadata.xml
+++ b/dev-perl/POE-API-Peek/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-API-Peek</remote-id>
+    <remote-id type="cpan-module">POE::API::Peek</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-Component-IKC/metadata.xml b/dev-perl/POE-Component-IKC/metadata.xml
index 80611270d758..917c9dbfc54d 100644
--- a/dev-perl/POE-Component-IKC/metadata.xml
+++ b/dev-perl/POE-Component-IKC/metadata.xml
@@ -7,5 +7,19 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Component-IKC</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Channel</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Client</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::ClientLite</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Freezer</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::LocalKernel</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Protocol</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Proxy</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Responder</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Responder::Object</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Responder::Thunk</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Server</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Specifier</remote-id>
+    <remote-id type="cpan-module">POE::Component::IKC::Timing</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-Component-PreforkDispatch/metadata.xml b/dev-perl/POE-Component-PreforkDispatch/metadata.xml
index 7200e8d6ce4b..4f91b142070e 100644
--- a/dev-perl/POE-Component-PreforkDispatch/metadata.xml
+++ b/dev-perl/POE-Component-PreforkDispatch/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Component-PreforkDispatch</remote-id>
+    <remote-id type="cpan-module">POE::Component::PreforkDispatch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-Test-Loops/metadata.xml b/dev-perl/POE-Test-Loops/metadata.xml
index 5cf26f57a473..c6428f5edf2f 100644
--- a/dev-perl/POE-Test-Loops/metadata.xml
+++ b/dev-perl/POE-Test-Loops/metadata.xml
@@ -8,5 +8,22 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-Test-Loops</remote-id>
+    <remote-id type="cpan-module">DynamicStates</remote-id>
+    <remote-id type="cpan-module">FibClient</remote-id>
+    <remote-id type="cpan-module">FibServer</remote-id>
+    <remote-id type="cpan-module">MappedObject</remote-id>
+    <remote-id type="cpan-module">MappedPackage</remote-id>
+    <remote-id type="cpan-module">MockDriver</remote-id>
+    <remote-id type="cpan-module">My::LineFilter</remote-id>
+    <remote-id type="cpan-module">MyObject</remote-id>
+    <remote-id type="cpan-module">Operator</remote-id>
+    <remote-id type="cpan-module">POE::Kernel</remote-id>
+    <remote-id type="cpan-module">POE::MySession</remote-id>
+    <remote-id type="cpan-module">POE::Test::DondeEstan</remote-id>
+    <remote-id type="cpan-module">POE::Test::Loops</remote-id>
+    <remote-id type="cpan-module">PoeTestWorker</remote-id>
+    <remote-id type="cpan-module">Switch</remote-id>
+    <remote-id type="cpan-module">UnmappedObject</remote-id>
+    <remote-id type="cpan-module">UnmappedPackage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-XS-Loop-EPoll/metadata.xml b/dev-perl/POE-XS-Loop-EPoll/metadata.xml
index 770e67e482f6..121913163450 100644
--- a/dev-perl/POE-XS-Loop-EPoll/metadata.xml
+++ b/dev-perl/POE-XS-Loop-EPoll/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Loop-EPoll</remote-id>
+    <remote-id type="cpan-module">POE::XS::Loop::EPoll</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-XS-Loop-Poll/metadata.xml b/dev-perl/POE-XS-Loop-Poll/metadata.xml
index 1f08125371a7..5caf24b67ba4 100644
--- a/dev-perl/POE-XS-Loop-Poll/metadata.xml
+++ b/dev-perl/POE-XS-Loop-Poll/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Loop-Poll</remote-id>
+    <remote-id type="cpan-module">POE::XS::Loop::Poll</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE-XS-Queue-Array/metadata.xml b/dev-perl/POE-XS-Queue-Array/metadata.xml
index 24be2db31881..2bf885286239 100644
--- a/dev-perl/POE-XS-Queue-Array/metadata.xml
+++ b/dev-perl/POE-XS-Queue-Array/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">POE-XS-Queue-Array</remote-id>
+    <remote-id type="cpan-module">POE::XS::Queue::Array</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/POE/metadata.xml b/dev-perl/POE/metadata.xml
index b16cff1da76a..fd8df7677861 100644
--- a/dev-perl/POE/metadata.xml
+++ b/dev-perl/POE/metadata.xml
@@ -4,5 +4,51 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">POE</remote-id>
+    <remote-id type="cpan-module">POE</remote-id>
+    <remote-id type="cpan-module">POE::Component</remote-id>
+    <remote-id type="cpan-module">POE::Component::Client::TCP</remote-id>
+    <remote-id type="cpan-module">POE::Component::Server::TCP</remote-id>
+    <remote-id type="cpan-module">POE::Driver</remote-id>
+    <remote-id type="cpan-module">POE::Driver::SysRW</remote-id>
+    <remote-id type="cpan-module">POE::Filter</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Block</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Grep</remote-id>
+    <remote-id type="cpan-module">POE::Filter::HTTPD</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Line</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Map</remote-id>
+    <remote-id type="cpan-module">POE::Filter::RecordBlock</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Reference</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Stackable</remote-id>
+    <remote-id type="cpan-module">POE::Filter::Stream</remote-id>
+    <remote-id type="cpan-module">POE::Kernel</remote-id>
+    <remote-id type="cpan-module">POE::Loop</remote-id>
+    <remote-id type="cpan-module">POE::Loop::IO_Poll</remote-id>
+    <remote-id type="cpan-module">POE::Loop::PerlSignals</remote-id>
+    <remote-id type="cpan-module">POE::Loop::Select</remote-id>
+    <remote-id type="cpan-module">POE::NFA</remote-id>
+    <remote-id type="cpan-module">POE::Pipe</remote-id>
+    <remote-id type="cpan-module">POE::Pipe::OneWay</remote-id>
+    <remote-id type="cpan-module">POE::Pipe::TwoWay</remote-id>
+    <remote-id type="cpan-module">POE::Queue</remote-id>
+    <remote-id type="cpan-module">POE::Queue::Array</remote-id>
+    <remote-id type="cpan-module">POE::Resource</remote-id>
+    <remote-id type="cpan-module">POE::Resource::Aliases</remote-id>
+    <remote-id type="cpan-module">POE::Resource::Events</remote-id>
+    <remote-id type="cpan-module">POE::Resource::Extrefs</remote-id>
+    <remote-id type="cpan-module">POE::Resource::FileHandles</remote-id>
+    <remote-id type="cpan-module">POE::Resource::SIDs</remote-id>
+    <remote-id type="cpan-module">POE::Resource::Sessions</remote-id>
+    <remote-id type="cpan-module">POE::Resource::Signals</remote-id>
+    <remote-id type="cpan-module">POE::Resources</remote-id>
+    <remote-id type="cpan-module">POE::Session</remote-id>
+    <remote-id type="cpan-module">POE::Wheel</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::Curses</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::FollowTail</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::ListenAccept</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::ReadLine</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::ReadLine::Keymap</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::ReadWrite</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::Run</remote-id>
+    <remote-id type="cpan-module">POE::Wheel::SocketFactory</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PPI/metadata.xml b/dev-perl/PPI/metadata.xml
index 6970dc0f03d8..627f2b47345b 100644
--- a/dev-perl/PPI/metadata.xml
+++ b/dev-perl/PPI/metadata.xml
@@ -4,5 +4,99 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PPI</remote-id>
+    <remote-id type="cpan-module">PPI</remote-id>
+    <remote-id type="cpan-module">PPI::Cache</remote-id>
+    <remote-id type="cpan-module">PPI::Document</remote-id>
+    <remote-id type="cpan-module">PPI::Document::File</remote-id>
+    <remote-id type="cpan-module">PPI::Document::Fragment</remote-id>
+    <remote-id type="cpan-module">PPI::Document::Normalized</remote-id>
+    <remote-id type="cpan-module">PPI::Dumper</remote-id>
+    <remote-id type="cpan-module">PPI::Element</remote-id>
+    <remote-id type="cpan-module">PPI::Exception</remote-id>
+    <remote-id type="cpan-module">PPI::Exception::ParserRejection</remote-id>
+    <remote-id type="cpan-module">PPI::Exception::ParserTimeout</remote-id>
+    <remote-id type="cpan-module">PPI::Find</remote-id>
+    <remote-id type="cpan-module">PPI::Lexer</remote-id>
+    <remote-id type="cpan-module">PPI::Node</remote-id>
+    <remote-id type="cpan-module">PPI::Normal</remote-id>
+    <remote-id type="cpan-module">PPI::Normal::Standard</remote-id>
+    <remote-id type="cpan-module">PPI::Statement</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Break</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Compound</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Data</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::End</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Expression</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Given</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Include</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Include::Perl6</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Null</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Package</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Scheduled</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Sub</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Unknown</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::UnmatchedBrace</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::Variable</remote-id>
+    <remote-id type="cpan-module">PPI::Statement::When</remote-id>
+    <remote-id type="cpan-module">PPI::Structure</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Block</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Condition</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Constructor</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::For</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Given</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::List</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Subscript</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::Unknown</remote-id>
+    <remote-id type="cpan-module">PPI::Structure::When</remote-id>
+    <remote-id type="cpan-module">PPI::Token</remote-id>
+    <remote-id type="cpan-module">PPI::Token::ArrayIndex</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Attribute</remote-id>
+    <remote-id type="cpan-module">PPI::Token::BOM</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Cast</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Comment</remote-id>
+    <remote-id type="cpan-module">PPI::Token::DashedWord</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Data</remote-id>
+    <remote-id type="cpan-module">PPI::Token::End</remote-id>
+    <remote-id type="cpan-module">PPI::Token::HereDoc</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Label</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Magic</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Binary</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Exp</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Float</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Hex</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Octal</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Number::Version</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Operator</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Pod</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Prototype</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Quote</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Quote::Double</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Quote::Interpolate</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Quote::Literal</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Quote::Single</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike::Backtick</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike::Command</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike::Readline</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike::Regexp</remote-id>
+    <remote-id type="cpan-module">PPI::Token::QuoteLike::Words</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Regexp</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Regexp::Match</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Regexp::Substitute</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Regexp::Transliterate</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Separator</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Structure</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Symbol</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Unknown</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Whitespace</remote-id>
+    <remote-id type="cpan-module">PPI::Token::Word</remote-id>
+    <remote-id type="cpan-module">PPI::Token::_QuoteEngine</remote-id>
+    <remote-id type="cpan-module">PPI::Token::_QuoteEngine::Full</remote-id>
+    <remote-id type="cpan-module">PPI::Token::_QuoteEngine::Simple</remote-id>
+    <remote-id type="cpan-module">PPI::Tokenizer</remote-id>
+    <remote-id type="cpan-module">PPI::Transform</remote-id>
+    <remote-id type="cpan-module">PPI::Transform::UpdateCopyright</remote-id>
+    <remote-id type="cpan-module">PPI::Util</remote-id>
+    <remote-id type="cpan-module">PPI::XSAccessor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PPIx-EditorTools/metadata.xml b/dev-perl/PPIx-EditorTools/metadata.xml
index f560468f82fa..61cb72cde726 100644
--- a/dev-perl/PPIx-EditorTools/metadata.xml
+++ b/dev-perl/PPIx-EditorTools/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PPIx-EditorTools</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::FindUnmatchedBrace</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::FindVariableDeclaration</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::IntroduceTemporaryVariable</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::Lexer</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::Outline</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::RenamePackage</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::RenamePackageFromPath</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::RenameVariable</remote-id>
+    <remote-id type="cpan-module">PPIx::EditorTools::ReturnObject</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PPIx-Regexp/metadata.xml b/dev-perl/PPIx-Regexp/metadata.xml
index 8bd9cfd6c2e3..b9c9183ee9c6 100644
--- a/dev-perl/PPIx-Regexp/metadata.xml
+++ b/dev-perl/PPIx-Regexp/metadata.xml
@@ -4,5 +4,63 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PPIx-Regexp</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Constant</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Dumper</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Element</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Lexer</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Node</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Node::Range</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Assertion</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::BranchReset</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Capture</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::CharClass</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Code</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Main</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Modifier</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::NamedCapture</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Quantifier</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Regexp</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Replacement</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Subexpression</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Switch</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Structure::Unknown</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Support</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Assertion</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Backreference</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Backtrack</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::CharClass</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::CharClass::POSIX</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::CharClass::POSIX::Unknown</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::CharClass::Simple</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Code</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Comment</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Condition</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Control</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Delimiter</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Greediness</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::Assertion</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::BranchReset</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::Code</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::Modifier</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::NamedCapture</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::Subexpression</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::GroupType::Switch</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Interpolation</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Literal</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Modifier</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Operator</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Quantifier</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Recursion</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Reference</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Structure</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Unknown</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Unmatched</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Token::Whitespace</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Tokenizer</remote-id>
+    <remote-id type="cpan-module">PPIx::Regexp::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PPIx-Utilities/metadata.xml b/dev-perl/PPIx-Utilities/metadata.xml
index 1a01599d83a1..fb59146ea463 100644
--- a/dev-perl/PPIx-Utilities/metadata.xml
+++ b/dev-perl/PPIx-Utilities/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PPIx-Utilities</remote-id>
+    <remote-id type="cpan-module">PPIx::Utilities</remote-id>
+    <remote-id type="cpan-module">PPIx::Utilities::Exception::Bug</remote-id>
+    <remote-id type="cpan-module">PPIx::Utilities::Node</remote-id>
+    <remote-id type="cpan-module">PPIx::Utilities::Statement</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Package-DeprecationManager/metadata.xml b/dev-perl/Package-DeprecationManager/metadata.xml
index 6de91a7ea8ae..06efa761bffa 100644
--- a/dev-perl/Package-DeprecationManager/metadata.xml
+++ b/dev-perl/Package-DeprecationManager/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Package-DeprecationManager</remote-id>
+    <remote-id type="cpan-module">Package::DeprecationManager</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Package-Stash-XS/metadata.xml b/dev-perl/Package-Stash-XS/metadata.xml
index d456ba2d5190..63dfddfeb966 100644
--- a/dev-perl/Package-Stash-XS/metadata.xml
+++ b/dev-perl/Package-Stash-XS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Package-Stash-XS</remote-id>
+    <remote-id type="cpan-module">Package::Stash::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Package-Stash/metadata.xml b/dev-perl/Package-Stash/metadata.xml
index d6c0db7eef35..48461dc56cbb 100644
--- a/dev-perl/Package-Stash/metadata.xml
+++ b/dev-perl/Package-Stash/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Package-Stash</remote-id>
+    <remote-id type="cpan-module">Package::Stash</remote-id>
+    <remote-id type="cpan-module">Package::Stash::PP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PadWalker/metadata.xml b/dev-perl/PadWalker/metadata.xml
index ae1ac9cf0116..48b618fb4f94 100644
--- a/dev-perl/PadWalker/metadata.xml
+++ b/dev-perl/PadWalker/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PadWalker</remote-id>
+    <remote-id type="cpan-module">PadWalker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pango/metadata.xml b/dev-perl/Pango/metadata.xml
index 71fcae9b0eb3..1f8694134a39 100644
--- a/dev-perl/Pango/metadata.xml
+++ b/dev-perl/Pango/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pango</remote-id>
+    <remote-id type="cpan-module">Pango</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Panotools-Script/metadata.xml b/dev-perl/Panotools-Script/metadata.xml
index 257dc762b178..5acc23760f5d 100644
--- a/dev-perl/Panotools-Script/metadata.xml
+++ b/dev-perl/Panotools-Script/metadata.xml
@@ -9,5 +9,24 @@
   </use>
   <upstream>
     <remote-id type="cpan">Panotools-Script</remote-id>
+    <remote-id type="cpan-module">Panotools::Makefile</remote-id>
+    <remote-id type="cpan-module">Panotools::Makefile::Comment</remote-id>
+    <remote-id type="cpan-module">Panotools::Makefile::Rule</remote-id>
+    <remote-id type="cpan-module">Panotools::Makefile::Utils</remote-id>
+    <remote-id type="cpan-module">Panotools::Makefile::Variable</remote-id>
+    <remote-id type="cpan-module">Panotools::Matrix</remote-id>
+    <remote-id type="cpan-module">Panotools::Photos</remote-id>
+    <remote-id type="cpan-module">Panotools::Script</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Control</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::ControlMorph</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Image</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::ImageMetadata</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Mask</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Mode</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Option</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Output</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Panorama</remote-id>
+    <remote-id type="cpan-module">Panotools::Script::Line::Variable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ParaDNS/metadata.xml b/dev-perl/ParaDNS/metadata.xml
index a6bc17456974..d8e0894880a9 100644
--- a/dev-perl/ParaDNS/metadata.xml
+++ b/dev-perl/ParaDNS/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ParaDNS</remote-id>
+    <remote-id type="cpan-module">ParaDNS</remote-id>
+    <remote-id type="cpan-module">ParaDNS::Resolver</remote-id>
+    <remote-id type="cpan-module">ParaDNS::Resolver::Query</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parallel-ForkManager/metadata.xml b/dev-perl/Parallel-ForkManager/metadata.xml
index 9ae0e3b909f5..c02239edb6c4 100644
--- a/dev-perl/Parallel-ForkManager/metadata.xml
+++ b/dev-perl/Parallel-ForkManager/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parallel-ForkManager</remote-id>
+    <remote-id type="cpan-module">Parallel::ForkManager</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parallel-Prefork/metadata.xml b/dev-perl/Parallel-Prefork/metadata.xml
index 45ac4e5dcfbf..219d365a4fcb 100644
--- a/dev-perl/Parallel-Prefork/metadata.xml
+++ b/dev-perl/Parallel-Prefork/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parallel-Prefork</remote-id>
+    <remote-id type="cpan-module">Parallel::Prefork</remote-id>
+    <remote-id type="cpan-module">Parallel::Prefork::SpareWorkers</remote-id>
+    <remote-id type="cpan-module">Parallel::Prefork::SpareWorkers::Scoreboard</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Params-Classify/metadata.xml b/dev-perl/Params-Classify/metadata.xml
index 972a673e198d..9d536a4fe0fb 100644
--- a/dev-perl/Params-Classify/metadata.xml
+++ b/dev-perl/Params-Classify/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Params-Classify</remote-id>
+        <remote-id type="cpan-module">Params::Classify</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Params-Util/metadata.xml b/dev-perl/Params-Util/metadata.xml
index 45df34f4759a..983e05c2a9ac 100644
--- a/dev-perl/Params-Util/metadata.xml
+++ b/dev-perl/Params-Util/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Params-Util</remote-id>
+    <remote-id type="cpan-module">Params::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Params-Validate/metadata.xml b/dev-perl/Params-Validate/metadata.xml
index b3b5f67af989..1325b9add2da 100644
--- a/dev-perl/Params-Validate/metadata.xml
+++ b/dev-perl/Params-Validate/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Params-Validate</remote-id>
+    <remote-id type="cpan-module">Attribute::Params::Validate</remote-id>
+    <remote-id type="cpan-module">Params::Validate</remote-id>
+    <remote-id type="cpan-module">Params::Validate::Constants</remote-id>
+    <remote-id type="cpan-module">Params::Validate::PP</remote-id>
+    <remote-id type="cpan-module">Params::Validate::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parse-ErrorString-Perl/metadata.xml b/dev-perl/Parse-ErrorString-Perl/metadata.xml
index 405c48f46a55..89715d46a7a1 100644
--- a/dev-perl/Parse-ErrorString-Perl/metadata.xml
+++ b/dev-perl/Parse-ErrorString-Perl/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parse-ErrorString-Perl</remote-id>
+    <remote-id type="cpan-module">Parse::ErrorString::Perl</remote-id>
+    <remote-id type="cpan-module">Parse::ErrorString::Perl::ErrorItem</remote-id>
+    <remote-id type="cpan-module">Parse::ErrorString::Perl::StackItem</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parse-ExuberantCTags/metadata.xml b/dev-perl/Parse-ExuberantCTags/metadata.xml
index b3063320b369..58819590ea76 100644
--- a/dev-perl/Parse-ExuberantCTags/metadata.xml
+++ b/dev-perl/Parse-ExuberantCTags/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parse-ExuberantCTags</remote-id>
+    <remote-id type="cpan-module">Parse::ExuberantCTags</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parse-RecDescent/metadata.xml b/dev-perl/Parse-RecDescent/metadata.xml
index b005cfb412d9..d48552cf87e0 100644
--- a/dev-perl/Parse-RecDescent/metadata.xml
+++ b/dev-perl/Parse-RecDescent/metadata.xml
@@ -4,5 +4,23 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parse-RecDescent</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Action</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::ColCounter</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Directive</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Error</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Expectation</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::InterpLit</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::LineCounter</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Literal</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::OffsetCounter</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Operator</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Production</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Repetition</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Result</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Rule</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Subrule</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::Token</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::UncondReject</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parse-Syslog/metadata.xml b/dev-perl/Parse-Syslog/metadata.xml
index 57af1c4138e6..260067269a61 100644
--- a/dev-perl/Parse-Syslog/metadata.xml
+++ b/dev-perl/Parse-Syslog/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parse-Syslog</remote-id>
+    <remote-id type="cpan-module">Parse::Syslog</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Parse-Yapp/metadata.xml b/dev-perl/Parse-Yapp/metadata.xml
index 5830620d86b7..0dfccacb21e2 100644
--- a/dev-perl/Parse-Yapp/metadata.xml
+++ b/dev-perl/Parse-Yapp/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Parse-Yapp</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Driver</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Grammar</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Lalr</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Options</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Output</remote-id>
+    <remote-id type="cpan-module">Parse::Yapp::Parse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Passwd-Linux/metadata.xml b/dev-perl/Passwd-Linux/metadata.xml
index 3822de776dd2..d84058c83ef7 100644
--- a/dev-perl/Passwd-Linux/metadata.xml
+++ b/dev-perl/Passwd-Linux/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Passwd-Linux</remote-id>
+    <remote-id type="cpan-module">Passwd::Linux</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PatchReader/metadata.xml b/dev-perl/PatchReader/metadata.xml
index 7876e62fede0..94fe8edcdf1a 100644
--- a/dev-perl/PatchReader/metadata.xml
+++ b/dev-perl/PatchReader/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PatchReader</remote-id>
+    <remote-id type="cpan-module">PatchReader</remote-id>
+    <remote-id type="cpan-module">PatchReader::AddCVSContext</remote-id>
+    <remote-id type="cpan-module">PatchReader::Base</remote-id>
+    <remote-id type="cpan-module">PatchReader::CVSClient</remote-id>
+    <remote-id type="cpan-module">PatchReader::DiffPrinter::raw</remote-id>
+    <remote-id type="cpan-module">PatchReader::DiffPrinter::template</remote-id>
+    <remote-id type="cpan-module">PatchReader::FilterPatch</remote-id>
+    <remote-id type="cpan-module">PatchReader::FixPatchRoot</remote-id>
+    <remote-id type="cpan-module">PatchReader::NarrowPatch</remote-id>
+    <remote-id type="cpan-module">PatchReader::PatchInfoGrabber</remote-id>
+    <remote-id type="cpan-module">PatchReader::Raw</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Path-Class/metadata.xml b/dev-perl/Path-Class/metadata.xml
index 339636f8a15d..83875e0fe861 100644
--- a/dev-perl/Path-Class/metadata.xml
+++ b/dev-perl/Path-Class/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Path-Class</remote-id>
+    <remote-id type="cpan-module">Path::Class</remote-id>
+    <remote-id type="cpan-module">Path::Class::Dir</remote-id>
+    <remote-id type="cpan-module">Path::Class::Entity</remote-id>
+    <remote-id type="cpan-module">Path::Class::File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Period/metadata.xml b/dev-perl/Period/metadata.xml
index 9cecb1ccf4e7..af3031e0ddc9 100644
--- a/dev-perl/Period/metadata.xml
+++ b/dev-perl/Period/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Period</remote-id>
+    <remote-id type="cpan-module">Time::Period</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Critic-Deprecated/metadata.xml b/dev-perl/Perl-Critic-Deprecated/metadata.xml
index 5770a8e8af85..56e0becab002 100644
--- a/dev-perl/Perl-Critic-Deprecated/metadata.xml
+++ b/dev-perl/Perl-Critic-Deprecated/metadata.xml
@@ -4,5 +4,9 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Deprecated</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Deprecated</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseSubs</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseVars</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Utils::PPIRegexp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Critic-Dynamic/metadata.xml b/dev-perl/Perl-Critic-Dynamic/metadata.xml
index 00ea929996cd..d7fcedc5b660 100644
--- a/dev-perl/Perl-Critic-Dynamic/metadata.xml
+++ b/dev-perl/Perl-Critic-Dynamic/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Dynamic</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Dynamic</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::DynamicPolicy</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Policy::Dynamic::ValidateAgainstSymbolTable</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Critic-Nits/metadata.xml b/dev-perl/Perl-Critic-Nits/metadata.xml
index e95b0195de01..2305683265a3 100644
--- a/dev-perl/Perl-Critic-Nits/metadata.xml
+++ b/dev-perl/Perl-Critic-Nits/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Nits</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Nits</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitAccessOfPrivateData</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
index 960741f3b2ec..c48b6daec64f 100644
--- a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
+++ b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Perl-Critic-Policy-Dynamic-NoIndirect</remote-id>
+		<remote-id type="cpan-module">Perl::Critic::Policy::Dynamic::NoIndirect</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Critic/metadata.xml b/dev-perl/Perl-Critic/metadata.xml
index a41dea236242..7f5e35998849 100644
--- a/dev-perl/Perl-Critic/metadata.xml
+++ b/dev-perl/Perl-Critic/metadata.xml
@@ -4,5 +4,198 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Perl-Critic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Annotation</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Command</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Config</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Document</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::AggregateConfiguration</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Generic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::NonExistentPolicy</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Global</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Global::ExtraParameter</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Global::ParameterValue</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Policy</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Policy::ExtraParameter</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Configuration::Option::Policy::ParameterValue</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Fatal</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Fatal::Generic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Fatal::Internal</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Fatal::PolicyDefinition</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::IO</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Exception::Parse</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::OptionsProcessor</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitBooleanGrep</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitComplexMappings</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitLvalueSubstr</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitReverseSortBlock</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitSleepViaSelect</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitStringyEval</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitStringySplit</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalCan</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalIsa</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidGrep</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidMap</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::RequireBlockGrep</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::RequireBlockMap</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::RequireGlobFunction</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::BuiltinFunctions::RequireSimpleSortBlock</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ClassHierarchies::ProhibitAutoloading</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ClassHierarchies::ProhibitExplicitISA</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ClassHierarchies::ProhibitOneArgBless</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::ProhibitHardTabs</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::ProhibitParensWithBuiltins</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::ProhibitQuotedWordLists</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::ProhibitTrailingWhitespace</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::RequireConsistentNewlines</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::RequireTidyCode</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::CodeLayout::RequireTrailingCommas</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitCStyleForLoops</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitCascadingIfElse</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitDeepNests</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitLabelsWithSpecialBlockNames</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitMutatingListFunctions</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitNegativeExpressionsInUnlessAndUntilConditions</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitPostfixControls</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitUnlessBlocks</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitUnreachableCode</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ControlStructures::ProhibitUntilBlocks</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Documentation::PodSpelling</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Documentation::RequirePackageMatchesPodName</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Documentation::RequirePodAtEnd</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Documentation::RequirePodLinksIncludeText</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Documentation::RequirePodSections</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ErrorHandling::RequireCarping</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ErrorHandling::RequireCheckingReturnValueOfEval</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitBacktickOperators</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitBarewordFileHandles</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitExplicitStdin</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitInteractiveTest</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitJoinedReadline</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitOneArgSelect</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitReadlineInForLoop</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::ProhibitTwoArgOpen</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireBracedFileHandleWithPrint</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireBriefOpen</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireCheckedClose</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireCheckedOpen</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireCheckedSyscalls</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::InputOutput::RequireEncodingWithUTF8Layer</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitFormats</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitTies</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitUnrestrictedNoCritic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::ProhibitUselessNoCritic</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Miscellanea::RequireRcsKeywords</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitAutomaticExportation</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitConditionalUseStatements</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitEvilModules</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitExcessMainComplexity</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::ProhibitMultiplePackages</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireBarewordIncludes</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireEndWithOne</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireExplicitPackage</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireFilenameMatchesPackage</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireNoMatchVarsWithUseEnglish</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Modules::RequireVersionVar</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::NamingConventions::Capitalization</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::NamingConventions::ProhibitAmbiguousNames</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Objects::ProhibitIndirectSyntax</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::References::ProhibitDoubleSigils</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitCaptureWithoutTest</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitComplexRegexes</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitEnumeratedClasses</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitEscapedMetacharacters</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitFixedStringMatches</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitSingleCharAlternation</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitUnusedCapture</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::ProhibitUnusualDelimiters</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::RequireBracesForMultiline</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::RequireDotMatchAnything</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::RequireExtendedFormatting</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::RegularExpressions::RequireLineBoundaryMatching</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitAmpersandSigils</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitBuiltinHomonyms</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitExcessComplexity</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitExplicitReturnUndef</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitManyArgs</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitNestedSubs</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitReturnSort</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitSubroutinePrototypes</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProhibitUnusedPrivateSubroutines</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::ProtectPrivateSubs</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::RequireArgUnpacking</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Subroutines::RequireFinalReturn</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::ProhibitNoWarnings</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::ProhibitProlongedStrictureOverride</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::RequireTestLabels</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::RequireUseStrict</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::TestingAndDebugging::RequireUseWarnings</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitCommaSeparatedStatements</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitComplexVersion</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitConstantPragma</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitEmptyQuotes</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitEscapedCharacters</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitImplicitNewlines</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitInterpolationOfLiterals</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitLeadingZeros</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitLongChainsOfMethodCalls</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitMagicNumbers</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitMismatchedOperators</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitMixedBooleanOperators</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitNoisyQuotes</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitQuotesAsQuotelikeOperatorDelimiters</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitSpecialLiteralHeredocTerminator</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::ProhibitVersionStrings</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::RequireConstantVersion</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::RequireInterpolationOfMetachars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::RequireNumberSeparators</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::RequireQuotedHeredocTerminator</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::ValuesAndExpressions::RequireUpperCaseHeredocTerminator</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitAugmentedAssignmentInDeclaration</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitConditionalDeclarations</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitEvilVariables</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitLocalVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitMatchVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitPackageVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitPerl4PackageNames</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitPunctuationVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitReusedNames</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProhibitUnusedVariables</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::ProtectPrivateVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::RequireInitializationForLocalVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::RequireLexicalLoopIterators</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::RequireLocalizedPunctuationVars</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Policy::Variables::RequireNegativeIndices</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyConfig</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyFactory</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyListing</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior::Boolean</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior::Enumeration</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior::Integer</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior::String</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::PolicyParameter::Behavior::StringList</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::ProfilePrototype</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Statistics</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::TestUtils</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Theme</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::ThemeListing</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::UserProfile</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::Constants</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::DataConversion</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::McCabe</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::POD</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::POD::ParseInteriorSequence</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::PPI</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Utils::Perl</remote-id>
+    <remote-id type="cpan-module">Perl::Critic::Violation</remote-id>
+    <remote-id type="cpan-module">Test::Perl::Critic::Policy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl-Tags/metadata.xml b/dev-perl/Perl-Tags/metadata.xml
index 952eb8c6099d..beffa4a402be 100644
--- a/dev-perl/Perl-Tags/metadata.xml
+++ b/dev-perl/Perl-Tags/metadata.xml
@@ -4,5 +4,19 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Perl-Tags</remote-id>
+        <remote-id type="cpan-module">Perl::Tags</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Naive</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Naive::Lib</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Naive::Spiffy</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::PPI</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Constant</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Field</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Label</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Package</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Recurse</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Stub</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Sub</remote-id>
+        <remote-id type="cpan-module">Perl::Tags::Tag::Var</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perl6-Junction/metadata.xml b/dev-perl/Perl6-Junction/metadata.xml
index 74c0ae1c1bd2..480ffa4e999b 100644
--- a/dev-perl/Perl6-Junction/metadata.xml
+++ b/dev-perl/Perl6-Junction/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Perl6-Junction</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction::All</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction::Any</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction::Base</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction::None</remote-id>
+    <remote-id type="cpan-module">Perl6::Junction::One</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-Layers/metadata.xml b/dev-perl/PerlIO-Layers/metadata.xml
index e69a6456bf0b..27a64213c90a 100644
--- a/dev-perl/PerlIO-Layers/metadata.xml
+++ b/dev-perl/PerlIO-Layers/metadata.xml
@@ -5,5 +5,6 @@
 <herd>perl</herd>
 <upstream>
   <remote-id type="cpan">PerlIO-Layers</remote-id>
+  <remote-id type="cpan-module">PerlIO::Layers</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-eol/metadata.xml b/dev-perl/PerlIO-eol/metadata.xml
index f719d3a497c2..01efc66c0188 100644
--- a/dev-perl/PerlIO-eol/metadata.xml
+++ b/dev-perl/PerlIO-eol/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PerlIO-eol</remote-id>
+    <remote-id type="cpan-module">PerlIO::eol</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-gzip/metadata.xml b/dev-perl/PerlIO-gzip/metadata.xml
index 9ab498f0a9fd..29670eebc465 100644
--- a/dev-perl/PerlIO-gzip/metadata.xml
+++ b/dev-perl/PerlIO-gzip/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PerlIO-gzip</remote-id>
+    <remote-id type="cpan-module">PerlIO::gzip</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-via-dynamic/metadata.xml b/dev-perl/PerlIO-via-dynamic/metadata.xml
index 367fc2b4b5a1..23d78baf7519 100644
--- a/dev-perl/PerlIO-via-dynamic/metadata.xml
+++ b/dev-perl/PerlIO-via-dynamic/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PerlIO-via-dynamic</remote-id>
+    <remote-id type="cpan-module">PerlIO::via::dynamic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PerlIO-via-symlink/metadata.xml b/dev-perl/PerlIO-via-symlink/metadata.xml
index 0e36e901a1e9..e47305237eb2 100644
--- a/dev-perl/PerlIO-via-symlink/metadata.xml
+++ b/dev-perl/PerlIO-via-symlink/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PerlIO-via-symlink</remote-id>
+    <remote-id type="cpan-module">PerlIO::via::symlink</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml b/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
index bfaedca13f9d..55222e903fd8 100644
--- a/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
+++ b/dev-perl/Perlbal-XS-HTTPHeaders/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Perlbal-XS-HTTPHeaders</remote-id>
+    <remote-id type="cpan-module">Perlbal::XS::HTTPHeaders</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Perlbal/metadata.xml b/dev-perl/Perlbal/metadata.xml
index 1834129104a5..e368a4c4c2df 100644
--- a/dev-perl/Perlbal/metadata.xml
+++ b/dev-perl/Perlbal/metadata.xml
@@ -8,5 +8,56 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Perlbal</remote-id>
+    <remote-id type="cpan-module">PalImg</remote-id>
+    <remote-id type="cpan-module">PaletteModify</remote-id>
+    <remote-id type="cpan-module">Perlbal</remote-id>
+    <remote-id type="cpan-module">Perlbal::AIO</remote-id>
+    <remote-id type="cpan-module">Perlbal::BackendHTTP</remote-id>
+    <remote-id type="cpan-module">Perlbal::Cache</remote-id>
+    <remote-id type="cpan-module">Perlbal::ChunkedUploadState</remote-id>
+    <remote-id type="cpan-module">Perlbal::ClientHTTP</remote-id>
+    <remote-id type="cpan-module">Perlbal::ClientHTTPBase</remote-id>
+    <remote-id type="cpan-module">Perlbal::ClientManage</remote-id>
+    <remote-id type="cpan-module">Perlbal::ClientProxy</remote-id>
+    <remote-id type="cpan-module">Perlbal::CommandContext</remote-id>
+    <remote-id type="cpan-module">Perlbal::Fields</remote-id>
+    <remote-id type="cpan-module">Perlbal::HTTPHeaders</remote-id>
+    <remote-id type="cpan-module">Perlbal::ManageCommand</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::AccessControl</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::AutoRemoveLeadingDir</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Cgilike</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Cgilike::Request</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::EchoService</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::EchoService::Client</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::FlvStreaming</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Highpri</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Include</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::LazyCDN</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::MaxContentLength</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::NotModified</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Palimg</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Queues</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Redirect</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Stats</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Stats::Storage</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Throttle</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Throttle::Store</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Throttle::Store::Memcached</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Throttle::Store::Memory</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Vhosts</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::Vpaths</remote-id>
+    <remote-id type="cpan-module">Perlbal::Plugin::XFFExtras</remote-id>
+    <remote-id type="cpan-module">Perlbal::Pool</remote-id>
+    <remote-id type="cpan-module">Perlbal::ReproxyManager</remote-id>
+    <remote-id type="cpan-module">Perlbal::Service</remote-id>
+    <remote-id type="cpan-module">Perlbal::Socket</remote-id>
+    <remote-id type="cpan-module">Perlbal::SocketSSL</remote-id>
+    <remote-id type="cpan-module">Perlbal::SocketSSL2</remote-id>
+    <remote-id type="cpan-module">Perlbal::TCPListener</remote-id>
+    <remote-id type="cpan-module">Perlbal::Test</remote-id>
+    <remote-id type="cpan-module">Perlbal::Test::WebClient</remote-id>
+    <remote-id type="cpan-module">Perlbal::Test::WebServer</remote-id>
+    <remote-id type="cpan-module">Perlbal::UploadListener</remote-id>
+    <remote-id type="cpan-module">Perlbal::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PlRPC/metadata.xml b/dev-perl/PlRPC/metadata.xml
index 8a93e3768aed..1a59edd07e4e 100644
--- a/dev-perl/PlRPC/metadata.xml
+++ b/dev-perl/PlRPC/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PlRPC</remote-id>
+    <remote-id type="cpan-module">Bundle::PlRPC</remote-id>
+    <remote-id type="cpan-module">RPC::PlClient</remote-id>
+    <remote-id type="cpan-module">RPC::PlClient::Comm</remote-id>
+    <remote-id type="cpan-module">RPC::PlClient::Object</remote-id>
+    <remote-id type="cpan-module">RPC::PlServer</remote-id>
+    <remote-id type="cpan-module">RPC::PlServer::Comm</remote-id>
+    <remote-id type="cpan-module">RPC::PlServer::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Plucene/metadata.xml b/dev-perl/Plucene/metadata.xml
index 38612789526b..ac5208544539 100644
--- a/dev-perl/Plucene/metadata.xml
+++ b/dev-perl/Plucene/metadata.xml
@@ -4,5 +4,84 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Plucene</remote-id>
+    <remote-id type="cpan-module">Plucene</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::Analyzer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::CharTokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::LetterTokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::LowerCaseFilter</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::LowerCaseTokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::PorterStemFilter</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::SimpleAnalyzer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::Standard::StandardAnalyzer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::Standard::StandardTokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::StopAnalyzer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::StopFilter</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::Token</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::TokenFilter</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::Tokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::WhitespaceAnalyzer</remote-id>
+    <remote-id type="cpan-module">Plucene::Analysis::WhitespaceTokenizer</remote-id>
+    <remote-id type="cpan-module">Plucene::Bitvector</remote-id>
+    <remote-id type="cpan-module">Plucene::Document</remote-id>
+    <remote-id type="cpan-module">Plucene::Document::DateSerializer</remote-id>
+    <remote-id type="cpan-module">Plucene::Document::Field</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::DocumentWriter</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::FieldInfos</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::FieldsReader</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::FieldsWriter</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::Norm</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::Posting</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::Reader</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentInfo</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentInfos</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentMergeInfo</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentMerger</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentReader</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentTermDocs</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentTermEnum</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentTermPositions</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentsReader</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentsTermDocs</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentsTermEnum</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::SegmentsTermPositions</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::Term</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::TermInfo</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::TermInfosReader</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::TermInfosWriter</remote-id>
+    <remote-id type="cpan-module">Plucene::Index::Writer</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser::Phrase</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser::Prefix</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser::Subquery</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser::Term</remote-id>
+    <remote-id type="cpan-module">Plucene::QueryParser::TopLevel</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::BooleanClause</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::BooleanQuery</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::BooleanScorer</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::BucketCollector</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::BucketTable</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::DateFilter</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Filter</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::HitCollector</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::HitDoc</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Hits</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::IndexSearcher</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PhrasePositions</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PhraseQuery</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PhraseScorer</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PhraseScorer::Exact</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PhraseScorer::Sloppy</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::PrefixQuery</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Query</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Scorer</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Searcher</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::Similarity</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::TermQuery</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::TermScorer</remote-id>
+    <remote-id type="cpan-module">Plucene::Search::TopDocs</remote-id>
+    <remote-id type="cpan-module">Plucene::Store::InputStream</remote-id>
+    <remote-id type="cpan-module">Plucene::Store::OutputStream</remote-id>
+    <remote-id type="cpan-module">Plucene::TestCase</remote-id>
+    <remote-id type="cpan-module">Plucene::Utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pod-Abstract/metadata.xml b/dev-perl/Pod-Abstract/metadata.xml
index 6190646ea5a1..5dd361f898bf 100644
--- a/dev-perl/Pod-Abstract/metadata.xml
+++ b/dev-perl/Pod-Abstract/metadata.xml
@@ -4,5 +4,23 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-Abstract</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::BuildNode</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::add_podcmds</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::clear_podcmds</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::cut</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::find</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::number_sections</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::overlay</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::sort</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::summary</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::uncut</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Filter::unoverlay</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Node</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Parser</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Path</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Serial</remote-id>
+    <remote-id type="cpan-module">Pod::Abstract::Tree</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pod-Coverage/metadata.xml b/dev-perl/Pod-Coverage/metadata.xml
index 252d27c52b56..3567dffa018e 100644
--- a/dev-perl/Pod-Coverage/metadata.xml
+++ b/dev-perl/Pod-Coverage/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-Coverage</remote-id>
+    <remote-id type="cpan-module">Pod::Coverage</remote-id>
+    <remote-id type="cpan-module">Pod::Coverage::CountParents</remote-id>
+    <remote-id type="cpan-module">Pod::Coverage::ExportOnly</remote-id>
+    <remote-id type="cpan-module">Pod::Coverage::Extractor</remote-id>
+    <remote-id type="cpan-module">Pod::Coverage::Overloader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pod-POM/metadata.xml b/dev-perl/Pod-POM/metadata.xml
index 26241605147b..d2a6faf41379 100644
--- a/dev-perl/Pod-POM/metadata.xml
+++ b/dev-perl/Pod-POM/metadata.xml
@@ -4,5 +4,28 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-POM</remote-id>
+    <remote-id type="cpan-module">Pod::POM</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Constants</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Begin</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Code</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Content</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::For</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Head1</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Head2</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Head3</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Head4</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Item</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Over</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Pod</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Sequence</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Text</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Node::Verbatim</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Nodes</remote-id>
+    <remote-id type="cpan-module">Pod::POM::Test</remote-id>
+    <remote-id type="cpan-module">Pod::POM::View</remote-id>
+    <remote-id type="cpan-module">Pod::POM::View::HTML</remote-id>
+    <remote-id type="cpan-module">Pod::POM::View::Pod</remote-id>
+    <remote-id type="cpan-module">Pod::POM::View::Text</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pod-Readme/metadata.xml b/dev-perl/Pod-Readme/metadata.xml
index f5c569a0bdb6..8ba06d4dac44 100644
--- a/dev-perl/Pod-Readme/metadata.xml
+++ b/dev-perl/Pod-Readme/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Pod-Readme</remote-id>
+    <remote-id type="cpan-module">Pod::Readme</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Pod-Tests/metadata.xml b/dev-perl/Pod-Tests/metadata.xml
index 44d8398d8d4e..0c63bce07257 100644
--- a/dev-perl/Pod-Tests/metadata.xml
+++ b/dev-perl/Pod-Tests/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-Tests</remote-id>
+    <remote-id type="cpan-module">Pod::Tests</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PostScript-Simple/metadata.xml b/dev-perl/PostScript-Simple/metadata.xml
index 2b8928039737..9adb60d44d67 100644
--- a/dev-perl/PostScript-Simple/metadata.xml
+++ b/dev-perl/PostScript-Simple/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">PostScript-Simple</remote-id>
+    <remote-id type="cpan-module">PostScript::Simple</remote-id>
+    <remote-id type="cpan-module">PostScript::Simple::EPS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/PostScript/metadata.xml b/dev-perl/PostScript/metadata.xml
index 8972009b52ad..ea369f443192 100644
--- a/dev-perl/PostScript/metadata.xml
+++ b/dev-perl/PostScript/metadata.xml
@@ -9,5 +9,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">PostScript</remote-id>
+    <remote-id type="cpan-module">PostScript::Document</remote-id>
+    <remote-id type="cpan-module">PostScript::Elements</remote-id>
+    <remote-id type="cpan-module">PostScript::Metrics</remote-id>
+    <remote-id type="cpan-module">PostScript::TextBlock</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Probe-Perl/metadata.xml b/dev-perl/Probe-Perl/metadata.xml
index 9a0d04ee3620..0004601386a9 100644
--- a/dev-perl/Probe-Perl/metadata.xml
+++ b/dev-perl/Probe-Perl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Probe-Perl</remote-id>
+    <remote-id type="cpan-module">Probe::Perl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-Background/metadata.xml b/dev-perl/Proc-Background/metadata.xml
index d7a9e348cb57..e5e3ed0a4ad1 100644
--- a/dev-perl/Proc-Background/metadata.xml
+++ b/dev-perl/Proc-Background/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-Background</remote-id>
+    <remote-id type="cpan-module">Proc::Background</remote-id>
+    <remote-id type="cpan-module">Proc::Background::Unix</remote-id>
+    <remote-id type="cpan-module">Proc::Background::Win32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-Daemon/metadata.xml b/dev-perl/Proc-Daemon/metadata.xml
index bd9dcb034f4b..5f8518feb9e3 100644
--- a/dev-perl/Proc-Daemon/metadata.xml
+++ b/dev-perl/Proc-Daemon/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-Daemon</remote-id>
+    <remote-id type="cpan-module">Proc::Daemon</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-ProcessTable/metadata.xml b/dev-perl/Proc-ProcessTable/metadata.xml
index 8573f273f7c3..32744df0d6f2 100644
--- a/dev-perl/Proc-ProcessTable/metadata.xml
+++ b/dev-perl/Proc-ProcessTable/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-ProcessTable</remote-id>
+    <remote-id type="cpan-module">Proc::Killall</remote-id>
+    <remote-id type="cpan-module">Proc::Killfam</remote-id>
+    <remote-id type="cpan-module">Proc::ProcessTable</remote-id>
+    <remote-id type="cpan-module">Proc::ProcessTable::Process</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-Simple/metadata.xml b/dev-perl/Proc-Simple/metadata.xml
index e523f71ad21a..bba97ca325be 100644
--- a/dev-perl/Proc-Simple/metadata.xml
+++ b/dev-perl/Proc-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-Simple</remote-id>
+    <remote-id type="cpan-module">Proc::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-Wait3/metadata.xml b/dev-perl/Proc-Wait3/metadata.xml
index 91c334b7d588..99768676d767 100644
--- a/dev-perl/Proc-Wait3/metadata.xml
+++ b/dev-perl/Proc-Wait3/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-Wait3</remote-id>
+    <remote-id type="cpan-module">Proc::Wait3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Proc-WaitStat/metadata.xml b/dev-perl/Proc-WaitStat/metadata.xml
index a0593098ee17..088c05d589da 100644
--- a/dev-perl/Proc-WaitStat/metadata.xml
+++ b/dev-perl/Proc-WaitStat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Proc-WaitStat</remote-id>
+    <remote-id type="cpan-module">Proc::WaitStat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/RPC-XML/metadata.xml b/dev-perl/RPC-XML/metadata.xml
index 68d93cab82df..bdb6e6df34e1 100644
--- a/dev-perl/RPC-XML/metadata.xml
+++ b/dev-perl/RPC-XML/metadata.xml
@@ -4,5 +4,33 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">RPC-XML</remote-id>
+    <remote-id type="cpan-module">Apache::RPC::Server</remote-id>
+    <remote-id type="cpan-module">Apache::RPC::Status</remote-id>
+    <remote-id type="cpan-module">RPC::XML</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Client</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Function</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Method</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Parser</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Parser::XMLLibXML</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Parser::XMLParser</remote-id>
+    <remote-id type="cpan-module">RPC::XML::ParserFactory</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Procedure</remote-id>
+    <remote-id type="cpan-module">RPC::XML::Server</remote-id>
+    <remote-id type="cpan-module">RPC::XML::array</remote-id>
+    <remote-id type="cpan-module">RPC::XML::base64</remote-id>
+    <remote-id type="cpan-module">RPC::XML::boolean</remote-id>
+    <remote-id type="cpan-module">RPC::XML::datatype</remote-id>
+    <remote-id type="cpan-module">RPC::XML::datetime_iso8601</remote-id>
+    <remote-id type="cpan-module">RPC::XML::double</remote-id>
+    <remote-id type="cpan-module">RPC::XML::fault</remote-id>
+    <remote-id type="cpan-module">RPC::XML::i4</remote-id>
+    <remote-id type="cpan-module">RPC::XML::i8</remote-id>
+    <remote-id type="cpan-module">RPC::XML::int</remote-id>
+    <remote-id type="cpan-module">RPC::XML::nil</remote-id>
+    <remote-id type="cpan-module">RPC::XML::request</remote-id>
+    <remote-id type="cpan-module">RPC::XML::response</remote-id>
+    <remote-id type="cpan-module">RPC::XML::simple_type</remote-id>
+    <remote-id type="cpan-module">RPC::XML::string</remote-id>
+    <remote-id type="cpan-module">RPC::XML::struct</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/RRD-Simple/metadata.xml b/dev-perl/RRD-Simple/metadata.xml
index 2f56ff72dcb0..c0c2f26251f9 100644
--- a/dev-perl/RRD-Simple/metadata.xml
+++ b/dev-perl/RRD-Simple/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">RRD-Simple</remote-id>
+    <remote-id type="cpan-module">RRD::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/RTF-Writer/metadata.xml b/dev-perl/RTF-Writer/metadata.xml
index 01c1dca0ee19..09b19fa9743f 100644
--- a/dev-perl/RTF-Writer/metadata.xml
+++ b/dev-perl/RTF-Writer/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">RTF-Writer</remote-id>
+    <remote-id type="cpan-module">RTF::Writer</remote-id>
+    <remote-id type="cpan-module">RTF::Writer::TableRowDecl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Rcs/metadata.xml b/dev-perl/Rcs/metadata.xml
index 3c03afb251d1..99eaf3d004d5 100644
--- a/dev-perl/Rcs/metadata.xml
+++ b/dev-perl/Rcs/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Rcs</remote-id>
+    <remote-id type="cpan-module">Rcs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Readonly-XS/metadata.xml b/dev-perl/Readonly-XS/metadata.xml
index da95c00e746f..73249c213242 100644
--- a/dev-perl/Readonly-XS/metadata.xml
+++ b/dev-perl/Readonly-XS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Readonly-XS</remote-id>
+    <remote-id type="cpan-module">Readonly::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Readonly/metadata.xml b/dev-perl/Readonly/metadata.xml
index 5aba14364e79..6cf12c0d0a24 100644
--- a/dev-perl/Readonly/metadata.xml
+++ b/dev-perl/Readonly/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Readonly</remote-id>
+    <remote-id type="cpan-module">Readonly</remote-id>
+    <remote-id type="cpan-module">Readonly::Array</remote-id>
+    <remote-id type="cpan-module">Readonly::Hash</remote-id>
+    <remote-id type="cpan-module">Readonly::Scalar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Regexp-Common-net-CIDR/metadata.xml b/dev-perl/Regexp-Common-net-CIDR/metadata.xml
index fd21a5f738bf..0882e288d909 100644
--- a/dev-perl/Regexp-Common-net-CIDR/metadata.xml
+++ b/dev-perl/Regexp-Common-net-CIDR/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Regexp-Common-net-CIDR</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::net::CIDR</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Regexp-IPv6/metadata.xml b/dev-perl/Regexp-IPv6/metadata.xml
index 84280f61ae52..1df0935ac033 100644
--- a/dev-perl/Regexp-IPv6/metadata.xml
+++ b/dev-perl/Regexp-IPv6/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Regexp-IPv6</remote-id>
+    <remote-id type="cpan-module">Regexp::IPv6</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Regexp-Shellish/metadata.xml b/dev-perl/Regexp-Shellish/metadata.xml
index 9b86c8d2dc78..e28e482372df 100644
--- a/dev-perl/Regexp-Shellish/metadata.xml
+++ b/dev-perl/Regexp-Shellish/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Regexp-Shellish</remote-id>
+    <remote-id type="cpan-module">Regexp::Shellish</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Return-Value/metadata.xml b/dev-perl/Return-Value/metadata.xml
index e0efe709d4f4..1826fec2387a 100644
--- a/dev-perl/Return-Value/metadata.xml
+++ b/dev-perl/Return-Value/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Return-Value</remote-id>
+    <remote-id type="cpan-module">Return::Value</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Role-Tiny/metadata.xml b/dev-perl/Role-Tiny/metadata.xml
index 97b8646eda4e..3e397d43e175 100644
--- a/dev-perl/Role-Tiny/metadata.xml
+++ b/dev-perl/Role-Tiny/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Role-Tiny</remote-id>
+    <remote-id type="cpan-module">Role::Tiny</remote-id>
+    <remote-id type="cpan-module">Role::Tiny::With</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Router-Simple/metadata.xml b/dev-perl/Router-Simple/metadata.xml
index 7d5b90c6713c..a907b20f612a 100644
--- a/dev-perl/Router-Simple/metadata.xml
+++ b/dev-perl/Router-Simple/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Router-Simple</remote-id>
+    <remote-id type="cpan-module">Router::Simple</remote-id>
+    <remote-id type="cpan-module">Router::Simple::Declare</remote-id>
+    <remote-id type="cpan-module">Router::Simple::Route</remote-id>
+    <remote-id type="cpan-module">Router::Simple::SubMapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SDL/metadata.xml b/dev-perl/SDL/metadata.xml
index 34fa45f45f19..e111a312c10b 100644
--- a/dev-perl/SDL/metadata.xml
+++ b/dev-perl/SDL/metadata.xml
@@ -5,5 +5,86 @@
   <herd>games</herd>
   <upstream>
     <remote-id type="cpan">SDL</remote-id>
+    <remote-id type="cpan-module">Module::Build::SDL</remote-id>
+    <remote-id type="cpan-module">SDL</remote-id>
+    <remote-id type="cpan-module">SDL::Audio</remote-id>
+    <remote-id type="cpan-module">SDL::AudioCVT</remote-id>
+    <remote-id type="cpan-module">SDL::AudioSpec</remote-id>
+    <remote-id type="cpan-module">SDL::CD</remote-id>
+    <remote-id type="cpan-module">SDL::CDROM</remote-id>
+    <remote-id type="cpan-module">SDL::CDTrack</remote-id>
+    <remote-id type="cpan-module">SDL::Color</remote-id>
+    <remote-id type="cpan-module">SDL::Config</remote-id>
+    <remote-id type="cpan-module">SDL::Constants</remote-id>
+    <remote-id type="cpan-module">SDL::Cursor</remote-id>
+    <remote-id type="cpan-module">SDL::Event</remote-id>
+    <remote-id type="cpan-module">SDL::Events</remote-id>
+    <remote-id type="cpan-module">SDL::GFX</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::BlitFunc</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::FPSManager</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::Framerate</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::ImageFilter</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::Primitives</remote-id>
+    <remote-id type="cpan-module">SDL::GFX::Rotozoom</remote-id>
+    <remote-id type="cpan-module">SDL::Image</remote-id>
+    <remote-id type="cpan-module">SDL::Internal::Loader</remote-id>
+    <remote-id type="cpan-module">SDL::Joystick</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::Channels</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::Effects</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::Groups</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::MixChunk</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::MixMusic</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::Music</remote-id>
+    <remote-id type="cpan-module">SDL::Mixer::Samples</remote-id>
+    <remote-id type="cpan-module">SDL::Mouse</remote-id>
+    <remote-id type="cpan-module">SDL::MultiThread</remote-id>
+    <remote-id type="cpan-module">SDL::Net</remote-id>
+    <remote-id type="cpan-module">SDL::Net::IPaddress</remote-id>
+    <remote-id type="cpan-module">SDL::Net::TCP</remote-id>
+    <remote-id type="cpan-module">SDL::Net::UDP</remote-id>
+    <remote-id type="cpan-module">SDL::Overlay</remote-id>
+    <remote-id type="cpan-module">SDL::Palette</remote-id>
+    <remote-id type="cpan-module">SDL::Pango</remote-id>
+    <remote-id type="cpan-module">SDL::Pango::Context</remote-id>
+    <remote-id type="cpan-module">SDL::PixelFormat</remote-id>
+    <remote-id type="cpan-module">SDL::RWOps</remote-id>
+    <remote-id type="cpan-module">SDL::Rect</remote-id>
+    <remote-id type="cpan-module">SDL::SMPEG</remote-id>
+    <remote-id type="cpan-module">SDL::SMPEG::Info</remote-id>
+    <remote-id type="cpan-module">SDL::Surface</remote-id>
+    <remote-id type="cpan-module">SDL::TTF</remote-id>
+    <remote-id type="cpan-module">SDL::TTF::Font</remote-id>
+    <remote-id type="cpan-module">SDL::TTFont</remote-id>
+    <remote-id type="cpan-module">SDL::Time</remote-id>
+    <remote-id type="cpan-module">SDL::Tutorial</remote-id>
+    <remote-id type="cpan-module">SDL::Tutorial::Animation</remote-id>
+    <remote-id type="cpan-module">SDL::Tutorial::LunarLander</remote-id>
+    <remote-id type="cpan-module">SDL::Version</remote-id>
+    <remote-id type="cpan-module">SDL::Video</remote-id>
+    <remote-id type="cpan-module">SDL::VideoInfo</remote-id>
+    <remote-id type="cpan-module">SDL_perl</remote-id>
+    <remote-id type="cpan-module">SDLx::App</remote-id>
+    <remote-id type="cpan-module">SDLx::Controller</remote-id>
+    <remote-id type="cpan-module">SDLx::Controller::Interface</remote-id>
+    <remote-id type="cpan-module">SDLx::Controller::State</remote-id>
+    <remote-id type="cpan-module">SDLx::Controller::Timer</remote-id>
+    <remote-id type="cpan-module">SDLx::FPS</remote-id>
+    <remote-id type="cpan-module">SDLx::Layer</remote-id>
+    <remote-id type="cpan-module">SDLx::LayerManager</remote-id>
+    <remote-id type="cpan-module">SDLx::Music</remote-id>
+    <remote-id type="cpan-module">SDLx::Music::Data</remote-id>
+    <remote-id type="cpan-module">SDLx::Music::Default</remote-id>
+    <remote-id type="cpan-module">SDLx::Rect</remote-id>
+    <remote-id type="cpan-module">SDLx::SFont</remote-id>
+    <remote-id type="cpan-module">SDLx::Sound</remote-id>
+    <remote-id type="cpan-module">SDLx::Sprite</remote-id>
+    <remote-id type="cpan-module">SDLx::Sprite::Animated</remote-id>
+    <remote-id type="cpan-module">SDLx::Surface</remote-id>
+    <remote-id type="cpan-module">SDLx::Surface::TiedMatrix</remote-id>
+    <remote-id type="cpan-module">SDLx::Surface::TiedMatrixRow</remote-id>
+    <remote-id type="cpan-module">SDLx::TTF</remote-id>
+    <remote-id type="cpan-module">SDLx::Text</remote-id>
+    <remote-id type="cpan-module">SDLx::Validate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SGMLSpm/metadata.xml b/dev-perl/SGMLSpm/metadata.xml
index f391791af3f5..a15eb83580f1 100644
--- a/dev-perl/SGMLSpm/metadata.xml
+++ b/dev-perl/SGMLSpm/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SGMLSpm</remote-id>
+    <remote-id type="cpan-module">SGMLS</remote-id>
+    <remote-id type="cpan-module">SGMLS::Output</remote-id>
+    <remote-id type="cpan-module">SGMLS::Refs</remote-id>
+    <remote-id type="cpan-module">SGMLS_Attribute</remote-id>
+    <remote-id type="cpan-module">SGMLS_Element</remote-id>
+    <remote-id type="cpan-module">SGMLS_Entity</remote-id>
+    <remote-id type="cpan-module">SGMLS_Event</remote-id>
+    <remote-id type="cpan-module">SGMLS_Notation</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SOAP-Lite/metadata.xml b/dev-perl/SOAP-Lite/metadata.xml
index 569ba3087720..d4bab4cad7a6 100644
--- a/dev-perl/SOAP-Lite/metadata.xml
+++ b/dev-perl/SOAP-Lite/metadata.xml
@@ -4,5 +4,95 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">SOAP-Lite</remote-id>
+		<remote-id type="cpan-module">Apache::SOAP</remote-id>
+		<remote-id type="cpan-module">Apache::XMLRPC::Lite</remote-id>
+		<remote-id type="cpan-module">IO::SessionData</remote-id>
+		<remote-id type="cpan-module">IO::SessionSet</remote-id>
+		<remote-id type="cpan-module">LWP::Protocol</remote-id>
+		<remote-id type="cpan-module">My::PingPong</remote-id>
+		<remote-id type="cpan-module">SOAP</remote-id>
+		<remote-id type="cpan-module">SOAP::Client</remote-id>
+		<remote-id type="cpan-module">SOAP::Cloneable</remote-id>
+		<remote-id type="cpan-module">SOAP::Constants</remote-id>
+		<remote-id type="cpan-module">SOAP::Custom::XML::Data</remote-id>
+		<remote-id type="cpan-module">SOAP::Custom::XML::Deserializer</remote-id>
+		<remote-id type="cpan-module">SOAP::Data</remote-id>
+		<remote-id type="cpan-module">SOAP::Deserializer</remote-id>
+		<remote-id type="cpan-module">SOAP::Fault</remote-id>
+		<remote-id type="cpan-module">SOAP::Header</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::COM</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Deserializer::XMLSchema1999</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Deserializer::XMLSchema2001</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Deserializer::XMLSchemaSOAP1_1</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Deserializer::XMLSchemaSOAP1_2</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Packager</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Packager::DIME</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Packager::MIME</remote-id>
+		<remote-id type="cpan-module">SOAP::Lite::Utils</remote-id>
+		<remote-id type="cpan-module">SOAP::Packager</remote-id>
+		<remote-id type="cpan-module">SOAP::Packager::DIME</remote-id>
+		<remote-id type="cpan-module">SOAP::Packager::MIME</remote-id>
+		<remote-id type="cpan-module">SOAP::Parser</remote-id>
+		<remote-id type="cpan-module">SOAP::SOM</remote-id>
+		<remote-id type="cpan-module">SOAP::Schema</remote-id>
+		<remote-id type="cpan-module">SOAP::Schema::Deserializer</remote-id>
+		<remote-id type="cpan-module">SOAP::Schema::WSDL</remote-id>
+		<remote-id type="cpan-module">SOAP::Serializer</remote-id>
+		<remote-id type="cpan-module">SOAP::Server</remote-id>
+		<remote-id type="cpan-module">SOAP::Server::Object</remote-id>
+		<remote-id type="cpan-module">SOAP::Server::Parameters</remote-id>
+		<remote-id type="cpan-module">SOAP::Test</remote-id>
+		<remote-id type="cpan-module">SOAP::Test::Server</remote-id>
+		<remote-id type="cpan-module">SOAP::Trace</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::Apache</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::CGI</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::Client</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::Daemon</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::FCGI</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::HTTP::Server</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::IO</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::IO::Server</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::LOCAL</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::LOCAL::Client</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::LOOPBACK</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::LOOPBACK::Client</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::MAILTO</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::MAILTO::Client</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::POP3</remote-id>
+		<remote-id type="cpan-module">SOAP::Transport::POP3::Server</remote-id>
+		<remote-id type="cpan-module">SOAP::Utils</remote-id>
+		<remote-id type="cpan-module">SOAP::XMLSchema1999::Serializer</remote-id>
+		<remote-id type="cpan-module">SOAP::XMLSchema2001::Serializer</remote-id>
+		<remote-id type="cpan-module">SOAP::XMLSchema::Serializer</remote-id>
+		<remote-id type="cpan-module">SOAP::XMLSchemaApacheSOAP::Deserializer</remote-id>
+		<remote-id type="cpan-module">UDDI::Constants</remote-id>
+		<remote-id type="cpan-module">UDDI::Data</remote-id>
+		<remote-id type="cpan-module">UDDI::Deserializer</remote-id>
+		<remote-id type="cpan-module">UDDI::Lite</remote-id>
+		<remote-id type="cpan-module">UDDI::SOM</remote-id>
+		<remote-id type="cpan-module">UDDI::Serializer</remote-id>
+		<remote-id type="cpan-module">XML::Parser::Lite</remote-id>
+		<remote-id type="cpan-module">XMLRPC</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Constants</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Data</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Deserializer</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Lite</remote-id>
+		<remote-id type="cpan-module">XMLRPC::SOM</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Serializer</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Server</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Server::Parameters</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Test</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Test::Server</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::HTTP</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::HTTP::Apache</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::HTTP::CGI</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::HTTP::Daemon</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::POP3</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::POP3::Server</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::TCP</remote-id>
+		<remote-id type="cpan-module">XMLRPC::Transport::TCP::Server</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/SOAP-WSDL/metadata.xml b/dev-perl/SOAP-WSDL/metadata.xml
index 2eb135d549d7..5c9461f10522 100644
--- a/dev-perl/SOAP-WSDL/metadata.xml
+++ b/dev-perl/SOAP-WSDL/metadata.xml
@@ -4,5 +4,130 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SOAP-WSDL</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Base</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Binding</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Client</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Client::Base</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Definitions</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Deserializer::Hash</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Deserializer::SOM</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Deserializer::XSD</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Expat::Base</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Expat::Message2Hash</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Expat::MessageParser</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Expat::MessageStreamParser</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Expat::WSDLParser</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Factory::Deserializer</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Factory::Generator</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Factory::Serializer</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Factory::Transport</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Iterator::WSDL11</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::PrefixResolver</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Template</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Template::Plugin::XSD</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Template::XSD</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Visitor</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Generator::Visitor::Typemap</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Message</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::OpMessage</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Operation</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Part</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Port</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::PortType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Address</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Body</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Header</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::HeaderFault</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Operation</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Typelib::Fault</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Typelib::Fault11</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::SOAP::Typelib::Fault11Detail</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Serializer::XSD</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Server</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Server::CGI</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Server::Mod_Perl2</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Server::Simple</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Service</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Transport::HTTP</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Transport::Loopback</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Transport::Test</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::TypeLookup</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::Types</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Annotation</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Attribute</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::AttributeGroup</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Builtin</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::ComplexType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Element</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Enumeration</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::FractionDigits</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Group</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Length</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MaxExclusive</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MaxInclusive</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MaxLength</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MinExclusive</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MinInclusive</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::MinLength</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Pattern</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Schema</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Schema::Builtin</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::SimpleType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::TotalDigits</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Attribute</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::AttributeSet</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::ENTITY</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::ID</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::IDREF</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::IDREFS</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::NCName</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::NOTATION</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::Name</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::QName</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::anyType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::anyURI</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::base64Binary</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::boolean</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::byte</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::date</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::dateTime</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::decimal</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::double</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::duration</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::float</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::gDay</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::gMonth</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::gYear</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::hexBinary</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::int</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::integer</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::language</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::list</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::long</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::normalizedString</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::short</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::string</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::time</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::token</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::ComplexType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::Element</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::SimpleType</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::Typelib::SimpleType::restriction</remote-id>
+    <remote-id type="cpan-module">SOAP::WSDL::XSD::WhiteSpace</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SQL-Abstract-Limit/metadata.xml b/dev-perl/SQL-Abstract-Limit/metadata.xml
index 8ee5c7b901c7..594bdf3a7527 100644
--- a/dev-perl/SQL-Abstract-Limit/metadata.xml
+++ b/dev-perl/SQL-Abstract-Limit/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">SQL-Abstract-Limit</remote-id>
+    <remote-id type="cpan-module">SQL::Abstract::Limit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SQL-Statement/metadata.xml b/dev-perl/SQL-Statement/metadata.xml
index c63de1f3aace..676bab7ce3c6 100644
--- a/dev-perl/SQL-Statement/metadata.xml
+++ b/dev-perl/SQL-Statement/metadata.xml
@@ -4,5 +4,57 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SQL-Statement</remote-id>
+    <remote-id type="cpan-module">SQL::Dialects::ANSI</remote-id>
+    <remote-id type="cpan-module">SQL::Dialects::AnyData</remote-id>
+    <remote-id type="cpan-module">SQL::Dialects::CSV</remote-id>
+    <remote-id type="cpan-module">SQL::Dialects::Role</remote-id>
+    <remote-id type="cpan-module">SQL::Eval</remote-id>
+    <remote-id type="cpan-module">SQL::Eval::Table</remote-id>
+    <remote-id type="cpan-module">SQL::Parser</remote-id>
+    <remote-id type="cpan-module">SQL::Statement</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Aggregate</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::ColumnValue</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::ConstantTerm</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function::NumericEval</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function::StrConcat</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function::SubString</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function::Trim</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Function::UserFunc</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Functions</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::GetInfo</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Group</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Limit</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::ANSI::Is</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::And</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Between</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Clike</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Contains</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Equal</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Equality</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Greater</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::GreaterEqual</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Is</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Like</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Lower</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::LowerEqual</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Neg</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::NotEqual</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Or</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Regexp</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Operation::Rlike</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Order</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Param</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Placeholder</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::RAM</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::RAM::Table</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Table</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::TempTable</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Term</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::TermFactory</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Util</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Util::Column</remote-id>
+    <remote-id type="cpan-module">SQL::Statement::Util::Function</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SQL-Translator/metadata.xml b/dev-perl/SQL-Translator/metadata.xml
index 5875607eedc4..f6bea6d5fd4e 100644
--- a/dev-perl/SQL-Translator/metadata.xml
+++ b/dev-perl/SQL-Translator/metadata.xml
@@ -7,5 +7,74 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">SQL-Translator</remote-id>
+    <remote-id type="cpan-module">Parse::RecDescent::SQL::Translator::Parser::DB2::Grammar</remote-id>
+    <remote-id type="cpan-module">SQL::Translator</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Diff</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Filter::DefaultExtra</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Filter::Globals</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Filter::Names</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Generator::DDL::SQLServer</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Generator::DDL::SQLite</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Generator::Role::DDL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Generator::Role::Quote</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::Access</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DB2</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DB2::Grammar</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::DB2</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::MySQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::Oracle</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::PostgreSQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::SQLServer</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::SQLite</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::DBI::Sybase</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::Excel</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::MySQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::Oracle</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::PostgreSQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::SQLServer</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::SQLite</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::Storable</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::Sybase</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::XML</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::XML::SQLFairy</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::YAML</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Parser::xSV</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::ClassDBI</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::DB2</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::DiaUml</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Diagram</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Dumper</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::GraphViz</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::HTML</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Latex</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::MySQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Oracle</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::POD</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::PostgreSQL</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::SQLServer</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::SQLite</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Storable</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::Sybase</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::TT::Base</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::TT::Table</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::TTSchema</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::XML</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::XML::SQLFairy</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Producer::YAML</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Constants</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Constraint</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Field</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Index</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Object</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Procedure</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Table</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::Trigger</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Schema::View</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Utils</remote-id>
+    <remote-id type="cpan-module">Test::SQL::Translator</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SRU/metadata.xml b/dev-perl/SRU/metadata.xml
index 81360ada51d5..87a85b6bdc83 100644
--- a/dev-perl/SRU/metadata.xml
+++ b/dev-perl/SRU/metadata.xml
@@ -8,5 +8,22 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">SRU</remote-id>
+    <remote-id type="cpan-module">Catalyst::Controller::SRU</remote-id>
+    <remote-id type="cpan-module">SRU</remote-id>
+    <remote-id type="cpan-module">SRU::Request</remote-id>
+    <remote-id type="cpan-module">SRU::Request::Explain</remote-id>
+    <remote-id type="cpan-module">SRU::Request::Scan</remote-id>
+    <remote-id type="cpan-module">SRU::Request::SearchRetrieve</remote-id>
+    <remote-id type="cpan-module">SRU::Response</remote-id>
+    <remote-id type="cpan-module">SRU::Response::Diagnostic</remote-id>
+    <remote-id type="cpan-module">SRU::Response::Explain</remote-id>
+    <remote-id type="cpan-module">SRU::Response::Record</remote-id>
+    <remote-id type="cpan-module">SRU::Response::Scan</remote-id>
+    <remote-id type="cpan-module">SRU::Response::SearchRetrieve</remote-id>
+    <remote-id type="cpan-module">SRU::Response::Term</remote-id>
+    <remote-id type="cpan-module">SRU::Server</remote-id>
+    <remote-id type="cpan-module">SRU::Utils</remote-id>
+    <remote-id type="cpan-module">SRU::Utils::XML</remote-id>
+    <remote-id type="cpan-module">SRU::Utils::XMLTest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SVG-Graph/metadata.xml b/dev-perl/SVG-Graph/metadata.xml
index 1c6e56f85993..ac8916bd90fb 100644
--- a/dev-perl/SVG-Graph/metadata.xml
+++ b/dev-perl/SVG-Graph/metadata.xml
@@ -8,5 +8,25 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">SVG-Graph</remote-id>
+    <remote-id type="cpan-module">SVG::Graph</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Data</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Data::Datum</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Data::Node</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Data::Tree</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::File</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Frame</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::axis</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::bar</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::barflex</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::bezier</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::bubble</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::heatmap</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::line</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::pictogram</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::scatter</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::tree</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Glyph::wedge</remote-id>
+    <remote-id type="cpan-module">SVG::Graph::Group</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SVG/metadata.xml b/dev-perl/SVG/metadata.xml
index 7ee11f20df38..681fbef8c323 100644
--- a/dev-perl/SVG/metadata.xml
+++ b/dev-perl/SVG/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SVG</remote-id>
+    <remote-id type="cpan-module">SVG</remote-id>
+    <remote-id type="cpan-module">SVG::DOM</remote-id>
+    <remote-id type="cpan-module">SVG::Element</remote-id>
+    <remote-id type="cpan-module">SVG::Extension</remote-id>
+    <remote-id type="cpan-module">SVG::Manual</remote-id>
+    <remote-id type="cpan-module">SVG::XML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SVN-Mirror/metadata.xml b/dev-perl/SVN-Mirror/metadata.xml
index 4dcb65e816da..1fc179a816a8 100644
--- a/dev-perl/SVN-Mirror/metadata.xml
+++ b/dev-perl/SVN-Mirror/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SVN-Mirror</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror::Git</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror::Ra</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror::Ra::CompositeEditor</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror::Ra::NewMirrorEditor</remote-id>
+    <remote-id type="cpan-module">SVN::Mirror::VCP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/SVN-Simple/metadata.xml b/dev-perl/SVN-Simple/metadata.xml
index 8e502e1b11d6..9693329e2f73 100644
--- a/dev-perl/SVN-Simple/metadata.xml
+++ b/dev-perl/SVN-Simple/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">SVN-Simple</remote-id>
+    <remote-id type="cpan-module">SVN::Simple::Edit</remote-id>
+    <remote-id type="cpan-module">SVN::Simple::Editor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Safe-Hole/metadata.xml b/dev-perl/Safe-Hole/metadata.xml
index 200f3ba8d24d..b5f5e7c9c17d 100644
--- a/dev-perl/Safe-Hole/metadata.xml
+++ b/dev-perl/Safe-Hole/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Safe-Hole</remote-id>
+    <remote-id type="cpan-module">Safe::Hole</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sane/metadata.xml b/dev-perl/Sane/metadata.xml
index dcdfffb9e2ca..330f452f0b90 100644
--- a/dev-perl/Sane/metadata.xml
+++ b/dev-perl/Sane/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sane</remote-id>
+    <remote-id type="cpan-module">Sane</remote-id>
+    <remote-id type="cpan-module">Sane::Device</remote-id>
+    <remote-id type="cpan-module">Sane::Status</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Scalar-Properties/metadata.xml b/dev-perl/Scalar-Properties/metadata.xml
index 35cf3e433de7..0794fa1d4078 100644
--- a/dev-perl/Scalar-Properties/metadata.xml
+++ b/dev-perl/Scalar-Properties/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Scalar-Properties</remote-id>
+    <remote-id type="cpan-module">Scalar::Properties</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Schedule-At/metadata.xml b/dev-perl/Schedule-At/metadata.xml
index 801e1bf8d727..a5e79b6526dc 100644
--- a/dev-perl/Schedule-At/metadata.xml
+++ b/dev-perl/Schedule-At/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Schedule-At</remote-id>
+    <remote-id type="cpan-module">Schedule::At</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Scope-Guard/metadata.xml b/dev-perl/Scope-Guard/metadata.xml
index cdd02c7bf752..b2bd7ec430f5 100644
--- a/dev-perl/Scope-Guard/metadata.xml
+++ b/dev-perl/Scope-Guard/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Scope-Guard</remote-id>
+    <remote-id type="cpan-module">Scope::Guard</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Search-Xapian/metadata.xml b/dev-perl/Search-Xapian/metadata.xml
index 3f75d860cdfb..7d5799af6650 100644
--- a/dev-perl/Search-Xapian/metadata.xml
+++ b/dev-perl/Search-Xapian/metadata.xml
@@ -11,5 +11,54 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Search-Xapian</remote-id>
+		<remote-id type="cpan-module">Search::Xapian</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::AssertionError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::BM25Weight</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::BoolWeight</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Database</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseCorruptError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseCreateError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseLockError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseModifiedError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseOpeningError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DatabaseVersionError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::DocNotFoundError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Document</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::ESet</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::ESetIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Enquire</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Error</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::FeatureUnavailableError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::InternalError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::InvalidArgumentError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::InvalidOperationError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::LogicError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::MSet</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::MSet::Tied</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::MSetIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::MultiValueSorter</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::NetworkError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::NetworkTimeoutError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::PerlStopper</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::PositionIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::PostingIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Query</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::QueryParser</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::QueryParserError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::RSet</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::RangeError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::RuntimeError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::SerialisationError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::SimpleStopper</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Stem</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Stopper</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::TermGenerator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::TermIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::TradWeight</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::UnimplementedError</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::ValueIterator</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::Weight</remote-id>
+		<remote-id type="cpan-module">Search::Xapian::WritableDatabase</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Server-Starter/metadata.xml b/dev-perl/Server-Starter/metadata.xml
index baa1d0ff8a52..8eb6deb5353f 100644
--- a/dev-perl/Server-Starter/metadata.xml
+++ b/dev-perl/Server-Starter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Server-Starter</remote-id>
+    <remote-id type="cpan-module">Server::Starter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Set-Infinite/metadata.xml b/dev-perl/Set-Infinite/metadata.xml
index 14fe3386c052..5626bbaecaba 100644
--- a/dev-perl/Set-Infinite/metadata.xml
+++ b/dev-perl/Set-Infinite/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Set-Infinite</remote-id>
+    <remote-id type="cpan-module">Set::Infinite</remote-id>
+    <remote-id type="cpan-module">Set::Infinite::Arithmetic</remote-id>
+    <remote-id type="cpan-module">Set::Infinite::Basic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Set-IntSpan/metadata.xml b/dev-perl/Set-IntSpan/metadata.xml
index 16e805b8223c..06f0a115d47f 100644
--- a/dev-perl/Set-IntSpan/metadata.xml
+++ b/dev-perl/Set-IntSpan/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Set-IntSpan</remote-id>
+    <remote-id type="cpan-module">Set::IntSpan</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Set-Object/metadata.xml b/dev-perl/Set-Object/metadata.xml
index 9ce4d4f0596a..7e6ad3919b04 100644
--- a/dev-perl/Set-Object/metadata.xml
+++ b/dev-perl/Set-Object/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Set-Object</remote-id>
+    <remote-id type="cpan-module">Set::Object</remote-id>
+    <remote-id type="cpan-module">Set::Object::TieArray</remote-id>
+    <remote-id type="cpan-module">Set::Object::TieHash</remote-id>
+    <remote-id type="cpan-module">Set::Object::Weak</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Shell-EnvImporter/metadata.xml b/dev-perl/Shell-EnvImporter/metadata.xml
index 19a7f2af7a09..27efb24cec58 100644
--- a/dev-perl/Shell-EnvImporter/metadata.xml
+++ b/dev-perl/Shell-EnvImporter/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Shell-EnvImporter</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Change</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Result</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::bash</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::csh</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::ksh</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::perl</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::sh</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::tcsh</remote-id>
+    <remote-id type="cpan-module">Shell::EnvImporter::Shell::zsh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ShipIt/metadata.xml b/dev-perl/ShipIt/metadata.xml
index bf9d8f8ffde7..f5228d751095 100644
--- a/dev-perl/ShipIt/metadata.xml
+++ b/dev-perl/ShipIt/metadata.xml
@@ -8,5 +8,31 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">ShipIt</remote-id>
+    <remote-id type="cpan-module">ShipIt</remote-id>
+    <remote-id type="cpan-module">ShipIt::Conf</remote-id>
+    <remote-id type="cpan-module">ShipIt::ProjectType</remote-id>
+    <remote-id type="cpan-module">ShipIt::ProjectType::AutoConf</remote-id>
+    <remote-id type="cpan-module">ShipIt::ProjectType::Perl</remote-id>
+    <remote-id type="cpan-module">ShipIt::ProjectType::Perl::MakeMaker</remote-id>
+    <remote-id type="cpan-module">ShipIt::ProjectType::Perl::ModuleBuild</remote-id>
+    <remote-id type="cpan-module">ShipIt::State</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::AddToSVNDir</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::ChangeRPMVersion</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::ChangeVersion</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::CheckChangeLog</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::Commit</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::DistTest</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::FindVersion</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::MakeDist</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::Tag</remote-id>
+    <remote-id type="cpan-module">ShipIt::Step::UploadCPAN</remote-id>
+    <remote-id type="cpan-module">ShipIt::Util</remote-id>
+    <remote-id type="cpan-module">ShipIt::Util::TempDir</remote-id>
+    <remote-id type="cpan-module">ShipIt::VC</remote-id>
+    <remote-id type="cpan-module">ShipIt::VC::Git</remote-id>
+    <remote-id type="cpan-module">ShipIt::VC::Mercurial</remote-id>
+    <remote-id type="cpan-module">ShipIt::VC::SVK</remote-id>
+    <remote-id type="cpan-module">ShipIt::VC::SVN</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Snowball-Norwegian/metadata.xml b/dev-perl/Snowball-Norwegian/metadata.xml
index c601afdb924b..34456e459935 100644
--- a/dev-perl/Snowball-Norwegian/metadata.xml
+++ b/dev-perl/Snowball-Norwegian/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Snowball-Norwegian</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Snowball::No</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Snowball-Swedish/metadata.xml b/dev-perl/Snowball-Swedish/metadata.xml
index 257b7661110e..690863b93594 100644
--- a/dev-perl/Snowball-Swedish/metadata.xml
+++ b/dev-perl/Snowball-Swedish/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Snowball-Swedish</remote-id>
+    <remote-id type="cpan-module">Lingua::Stem::Snowball::Se</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Socket6/metadata.xml b/dev-perl/Socket6/metadata.xml
index e003fc5718f6..f095070bba25 100644
--- a/dev-perl/Socket6/metadata.xml
+++ b/dev-perl/Socket6/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Socket6</remote-id>
+    <remote-id type="cpan-module">Socket6</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sort-Naturally/metadata.xml b/dev-perl/Sort-Naturally/metadata.xml
index a794412270a8..9fdb0ec6f9b2 100644
--- a/dev-perl/Sort-Naturally/metadata.xml
+++ b/dev-perl/Sort-Naturally/metadata.xml
@@ -10,5 +10,6 @@
 </longdescription>
   <upstream>
     <remote-id type="cpan">Sort-Naturally</remote-id>
+    <remote-id type="cpan-module">Sort::Naturally</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sort-Tree/metadata.xml b/dev-perl/Sort-Tree/metadata.xml
index ec5c8466abde..559724009a95 100644
--- a/dev-perl/Sort-Tree/metadata.xml
+++ b/dev-perl/Sort-Tree/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="cpan">Sort-Tree</remote-id>
+    <remote-id type="cpan-module">Sort::Tree</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sort-Versions/metadata.xml b/dev-perl/Sort-Versions/metadata.xml
index bf895d4035d5..b1c6b4d39371 100644
--- a/dev-perl/Sort-Versions/metadata.xml
+++ b/dev-perl/Sort-Versions/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sort-Versions</remote-id>
+    <remote-id type="cpan-module">Sort::Versions</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Speech-Recognizer-SPX/metadata.xml b/dev-perl/Speech-Recognizer-SPX/metadata.xml
index fd05035caee9..32a8854f77b5 100644
--- a/dev-perl/Speech-Recognizer-SPX/metadata.xml
+++ b/dev-perl/Speech-Recognizer-SPX/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Speech-Recognizer-SPX</remote-id>
+    <remote-id type="cpan-module">Audio::MFCC</remote-id>
+    <remote-id type="cpan-module">Audio::SPX</remote-id>
+    <remote-id type="cpan-module">Speech::Recognizer::SPX</remote-id>
+    <remote-id type="cpan-module">Speech::Recognizer::SPX::Hypothesis</remote-id>
+    <remote-id type="cpan-module">Speech::Recognizer::SPX::Segment</remote-id>
+    <remote-id type="cpan-module">Speech::Recognizer::SPX::Server</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sphinx-Config/metadata.xml b/dev-perl/Sphinx-Config/metadata.xml
index ffa96d05a3f4..ae556a589929 100644
--- a/dev-perl/Sphinx-Config/metadata.xml
+++ b/dev-perl/Sphinx-Config/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Sphinx-Config</remote-id>
+    <remote-id type="cpan-module">Sphinx::Config</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Spiffy/metadata.xml b/dev-perl/Spiffy/metadata.xml
index 74a4b17efe4c..dfb864742e74 100644
--- a/dev-perl/Spiffy/metadata.xml
+++ b/dev-perl/Spiffy/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Spiffy</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">Spiffy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Spreadsheet-ParseExcel/metadata.xml b/dev-perl/Spreadsheet-ParseExcel/metadata.xml
index e63cf7fd616d..45c61cf83088 100644
--- a/dev-perl/Spreadsheet-ParseExcel/metadata.xml
+++ b/dev-perl/Spreadsheet-ParseExcel/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Spreadsheet-ParseExcel</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Cell</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Dump</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::FmtDefault</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::FmtJapan</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::FmtJapan2</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::FmtUnicode</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Font</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Format</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::SaveParser</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::SaveParser::Workbook</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::SaveParser::Worksheet</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Utility</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Workbook</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::ParseExcel::Worksheet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Spreadsheet-WriteExcel/metadata.xml b/dev-perl/Spreadsheet-WriteExcel/metadata.xml
index 0756ffed4e5e..27cd14a6ab20 100644
--- a/dev-perl/Spreadsheet-WriteExcel/metadata.xml
+++ b/dev-perl/Spreadsheet-WriteExcel/metadata.xml
@@ -4,5 +4,25 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Spreadsheet-WriteExcel</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::BIFFwriter</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Big</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Area</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Bar</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Column</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::External</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Line</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Pie</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Scatter</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Chart::Stock</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Examples</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Format</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Formula</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::OLEwriter</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Properties</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Utility</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Workbook</remote-id>
+    <remote-id type="cpan-module">Spreadsheet::WriteExcel::Worksheet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Starlet/metadata.xml b/dev-perl/Starlet/metadata.xml
index 0a9a9ede9d9b..1766782eb0e5 100644
--- a/dev-perl/Starlet/metadata.xml
+++ b/dev-perl/Starlet/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Starlet</remote-id>
+    <remote-id type="cpan-module">Plack::Handler::Starlet</remote-id>
+    <remote-id type="cpan-module">Plack::Server::Standalone::Prefork::Server::Starter</remote-id>
+    <remote-id type="cpan-module">Starlet</remote-id>
+    <remote-id type="cpan-module">Starlet::Server</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Stat-lsMode/metadata.xml b/dev-perl/Stat-lsMode/metadata.xml
index 4f6bd74366d2..ac30bf0a44cf 100644
--- a/dev-perl/Stat-lsMode/metadata.xml
+++ b/dev-perl/Stat-lsMode/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Stat-lsMode</remote-id>
+    <remote-id type="cpan-module">Stat::lsMode</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Statistics-Descriptive-Discrete/metadata.xml b/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
index b14840e06390..81633accc1a2 100644
--- a/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
+++ b/dev-perl/Statistics-Descriptive-Discrete/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Statistics-Descriptive-Discrete</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Discrete</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Statistics-Descriptive/metadata.xml b/dev-perl/Statistics-Descriptive/metadata.xml
index f491a91c377c..f5dcf62f1ff2 100644
--- a/dev-perl/Statistics-Descriptive/metadata.xml
+++ b/dev-perl/Statistics-Descriptive/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Statistics-Descriptive</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Full</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Smoother</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Smoother::Exponential</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Smoother::Weightedexponential</remote-id>
+    <remote-id type="cpan-module">Statistics::Descriptive::Sparse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/String-Approx/metadata.xml b/dev-perl/String-Approx/metadata.xml
index a87380369b01..e6f90ed73d43 100644
--- a/dev-perl/String-Approx/metadata.xml
+++ b/dev-perl/String-Approx/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">String-Approx</remote-id>
+    <remote-id type="cpan-module">String::Approx</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/String-Ediff/metadata.xml b/dev-perl/String-Ediff/metadata.xml
index 52e8896fefab..804e47a98962 100644
--- a/dev-perl/String-Ediff/metadata.xml
+++ b/dev-perl/String-Ediff/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">String-Ediff</remote-id>
+    <remote-id type="cpan-module">String::Ediff</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/String-Format/metadata.xml b/dev-perl/String-Format/metadata.xml
index 10e681e88acd..b86f28181311 100644
--- a/dev-perl/String-Format/metadata.xml
+++ b/dev-perl/String-Format/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">String-Format</remote-id>
+    <remote-id type="cpan-module">String::Format</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/String-ShellQuote/metadata.xml b/dev-perl/String-ShellQuote/metadata.xml
index cb07891f3583..0d66ad7350d4 100644
--- a/dev-perl/String-ShellQuote/metadata.xml
+++ b/dev-perl/String-ShellQuote/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">String-ShellQuote</remote-id>
+    <remote-id type="cpan-module">String::ShellQuote</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/String-Tokenizer/metadata.xml b/dev-perl/String-Tokenizer/metadata.xml
index 06db243c6eac..90d142003087 100644
--- a/dev-perl/String-Tokenizer/metadata.xml
+++ b/dev-perl/String-Tokenizer/metadata.xml
@@ -8,5 +8,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">String-Tokenizer</remote-id>
+    <remote-id type="cpan-module">String::Tokenizer</remote-id>
+    <remote-id type="cpan-module">String::Tokenizer::Iterator</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Exporter/metadata.xml b/dev-perl/Sub-Exporter/metadata.xml
index 7eeecece83d5..4dee1fc36b68 100644
--- a/dev-perl/Sub-Exporter/metadata.xml
+++ b/dev-perl/Sub-Exporter/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Exporter</remote-id>
+    <remote-id type="cpan-module">Sub::Exporter</remote-id>
+    <remote-id type="cpan-module">Sub::Exporter::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Identify/metadata.xml b/dev-perl/Sub-Identify/metadata.xml
index d2163fc88dd4..6c9f0de2ef86 100644
--- a/dev-perl/Sub-Identify/metadata.xml
+++ b/dev-perl/Sub-Identify/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Identify</remote-id>
+    <remote-id type="cpan-module">Sub::Identify</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Install/metadata.xml b/dev-perl/Sub-Install/metadata.xml
index 647f09787869..d8e3ab58564d 100644
--- a/dev-perl/Sub-Install/metadata.xml
+++ b/dev-perl/Sub-Install/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Install</remote-id>
+    <remote-id type="cpan-module">Sub::Install</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Name/metadata.xml b/dev-perl/Sub-Name/metadata.xml
index b10507863359..994a4e8c772f 100644
--- a/dev-perl/Sub-Name/metadata.xml
+++ b/dev-perl/Sub-Name/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Name</remote-id>
+    <remote-id type="cpan-module">Sub::Name</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Override/metadata.xml b/dev-perl/Sub-Override/metadata.xml
index 3fce6a01240d..841bfc0cd604 100644
--- a/dev-perl/Sub-Override/metadata.xml
+++ b/dev-perl/Sub-Override/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Override</remote-id>
+    <remote-id type="cpan-module">Sub::Override</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Uplevel/metadata.xml b/dev-perl/Sub-Uplevel/metadata.xml
index f9f5870ed28c..8a147f22f57b 100644
--- a/dev-perl/Sub-Uplevel/metadata.xml
+++ b/dev-perl/Sub-Uplevel/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sub-Uplevel</remote-id>
+    <remote-id type="cpan-module">Sub::Uplevel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Symbol-Util/metadata.xml b/dev-perl/Symbol-Util/metadata.xml
index 86c323e6d006..b4961a45f573 100644
--- a/dev-perl/Symbol-Util/metadata.xml
+++ b/dev-perl/Symbol-Util/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Symbol-Util</remote-id>
+    <remote-id type="cpan-module">Symbol::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-CPU/metadata.xml b/dev-perl/Sys-CPU/metadata.xml
index 8ae3a36ae32b..0ad314ea9797 100644
--- a/dev-perl/Sys-CPU/metadata.xml
+++ b/dev-perl/Sys-CPU/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sys-CPU</remote-id>
+    <remote-id type="cpan-module">Sys::CPU</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-Hostname-Long/metadata.xml b/dev-perl/Sys-Hostname-Long/metadata.xml
index 20861460ef3e..fd63fd94519e 100644
--- a/dev-perl/Sys-Hostname-Long/metadata.xml
+++ b/dev-perl/Sys-Hostname-Long/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sys-Hostname-Long</remote-id>
+    <remote-id type="cpan-module">Sys::Hostname::Long</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-MemInfo/metadata.xml b/dev-perl/Sys-MemInfo/metadata.xml
index 2f4fca135191..94c4a6d2a788 100644
--- a/dev-perl/Sys-MemInfo/metadata.xml
+++ b/dev-perl/Sys-MemInfo/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sys-MemInfo</remote-id>
+    <remote-id type="cpan-module">Sys::MemInfo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-SigAction/Sys-SigAction-0.150.0.ebuild b/dev-perl/Sys-SigAction/Sys-SigAction-0.150.0.ebuild
index 13d187767fb6..826b84890a7c 100644
--- a/dev-perl/Sys-SigAction/Sys-SigAction-0.150.0.ebuild
+++ b/dev-perl/Sys-SigAction/Sys-SigAction-0.150.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/Sys-SigAction/Sys-SigAction-0.150.0.ebuild,v 1.1 2011/07/06 13:08:12 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-SigAction/Sys-SigAction-0.150.0.ebuild,v 1.2 2012/06/24 10:55:30 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for Consistent Signal Handling"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sys-SigAction/metadata.xml b/dev-perl/Sys-SigAction/metadata.xml
index 02f803148991..989e5f485d37 100644
--- a/dev-perl/Sys-SigAction/metadata.xml
+++ b/dev-perl/Sys-SigAction/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sys-SigAction</remote-id>
+    <remote-id type="cpan-module">Sys::SigAction</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-Statistics-Linux/metadata.xml b/dev-perl/Sys-Statistics-Linux/metadata.xml
index 54ccbaacd9e7..562cb6edac0d 100644
--- a/dev-perl/Sys-Statistics-Linux/metadata.xml
+++ b/dev-perl/Sys-Statistics-Linux/metadata.xml
@@ -4,5 +4,19 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Sys-Statistics-Linux</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::Compilation</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::CpuStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::DiskStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::DiskUsage</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::FileStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::LoadAVG</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::MemStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::NetStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::PgSwStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::ProcStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::Processes</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::SockStats</remote-id>
+    <remote-id type="cpan-module">Sys::Statistics::Linux::SysInfo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-Syscall/metadata.xml b/dev-perl/Sys-Syscall/metadata.xml
index 8082981283ab..fe70bc79b4cb 100644
--- a/dev-perl/Sys-Syscall/metadata.xml
+++ b/dev-perl/Sys-Syscall/metadata.xml
@@ -9,5 +9,6 @@
   <longdescription>Access system calls that Perl doesn't normally provide access to.</longdescription>
   <upstream>
     <remote-id type="cpan">Sys-Syscall</remote-id>
+    <remote-id type="cpan-module">Sys::Syscall</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sys-Virt/metadata.xml b/dev-perl/Sys-Virt/metadata.xml
index bcf5c4c8b837..042982179c9d 100644
--- a/dev-perl/Sys-Virt/metadata.xml
+++ b/dev-perl/Sys-Virt/metadata.xml
@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>perl</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
+	<herd>perl</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
 	<email>andreis.vinogradovs@gmail.com</email>
 	<name>Andreis Vinogradovs</name>
-</maintainer>
-<maintainer>
+	</maintainer>
+	<maintainer>
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
-</maintainer>
+	</maintainer>
 	<upstream>
-		<remote-id type="cpan">Sys-Virt</remote-id>
+	<remote-id type="cpan">Sys-Virt</remote-id>
+	<remote-id type="cpan-module">Sys::Virt</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Domain</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::DomainSnapshot</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Error</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Event</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Interface</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::NWFilter</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Network</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::NodeDevice</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Secret</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::StoragePool</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::StorageVol</remote-id>
+	<remote-id type="cpan-module">Sys::Virt::Stream</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sysadm-Install/metadata.xml b/dev-perl/Sysadm-Install/metadata.xml
index 119c0298503d..4890a99d9c5a 100644
--- a/dev-perl/Sysadm-Install/metadata.xml
+++ b/dev-perl/Sysadm-Install/metadata.xml
@@ -8,5 +8,6 @@
   </use>
   <upstream>
     <remote-id type="cpan">Sysadm-Install</remote-id>
+    <remote-id type="cpan-module">Sysadm::Install</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Taint-Runtime/metadata.xml b/dev-perl/Taint-Runtime/metadata.xml
index e390eac0f46c..c3ec894487f6 100644
--- a/dev-perl/Taint-Runtime/metadata.xml
+++ b/dev-perl/Taint-Runtime/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Taint-Runtime</remote-id>
+    <remote-id type="cpan-module">Taint::Runtime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Task-Weaken/metadata.xml b/dev-perl/Task-Weaken/metadata.xml
index a79467000bfd..b54c77e52f73 100644
--- a/dev-perl/Task-Weaken/metadata.xml
+++ b/dev-perl/Task-Weaken/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Task-Weaken</remote-id>
+    <remote-id type="cpan-module">Task::Weaken</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/TeX-Encode/metadata.xml b/dev-perl/TeX-Encode/metadata.xml
index 93a02156b7a1..372a15464615 100644
--- a/dev-perl/TeX-Encode/metadata.xml
+++ b/dev-perl/TeX-Encode/metadata.xml
@@ -6,5 +6,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">TeX-Encode</remote-id>
+		<remote-id type="cpan-module">TeX::Encode</remote-id>
+		<remote-id type="cpan-module">TeX::Encode::BibTeX</remote-id>
+		<remote-id type="cpan-module">TeX::Encode::charmap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Template-DBI/metadata.xml b/dev-perl/Template-DBI/metadata.xml
index 06d3b9f44164..e81f80a9c9df 100644
--- a/dev-perl/Template-DBI/metadata.xml
+++ b/dev-perl/Template-DBI/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Template-DBI</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::DBI</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::DBI::Iterator</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::DBI::Query</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Template-GD/metadata.xml b/dev-perl/Template-GD/metadata.xml
index daecad0bc3d4..aae91c520572 100644
--- a/dev-perl/Template-GD/metadata.xml
+++ b/dev-perl/Template-GD/metadata.xml
@@ -4,5 +4,22 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Template-GD</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Constants</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::area</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::bars</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::bars3d</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::lines</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::lines3d</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::linespoints</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::mixed</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::pie</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::pie3d</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Graph::points</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Image</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Polygon</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Text</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Text::Align</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::GD::Text::Wrap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Template-Tiny/metadata.xml b/dev-perl/Template-Tiny/metadata.xml
index f07697d16ab5..62b1cdf5d641 100644
--- a/dev-perl/Template-Tiny/metadata.xml
+++ b/dev-perl/Template-Tiny/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Template-Tiny</remote-id>
+    <remote-id type="cpan-module">Template::Tiny</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Template-Toolkit/metadata.xml b/dev-perl/Template-Toolkit/metadata.xml
index 5b41fa3794a0..c5ae6767f06d 100644
--- a/dev-perl/Template-Toolkit/metadata.xml
+++ b/dev-perl/Template-Toolkit/metadata.xml
@@ -4,5 +4,56 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Template-Toolkit</remote-id>
+    <remote-id type="cpan-module">Template</remote-id>
+    <remote-id type="cpan-module">Template::Base</remote-id>
+    <remote-id type="cpan-module">Template::Config</remote-id>
+    <remote-id type="cpan-module">Template::Constants</remote-id>
+    <remote-id type="cpan-module">Template::Context</remote-id>
+    <remote-id type="cpan-module">Template::Directive</remote-id>
+    <remote-id type="cpan-module">Template::Document</remote-id>
+    <remote-id type="cpan-module">Template::Exception</remote-id>
+    <remote-id type="cpan-module">Template::Filters</remote-id>
+    <remote-id type="cpan-module">Template::Grammar</remote-id>
+    <remote-id type="cpan-module">Template::Iterator</remote-id>
+    <remote-id type="cpan-module">Template::Monad::Assert</remote-id>
+    <remote-id type="cpan-module">Template::Monad::Scalar</remote-id>
+    <remote-id type="cpan-module">Template::Namespace::Constants</remote-id>
+    <remote-id type="cpan-module">Template::Parser</remote-id>
+    <remote-id type="cpan-module">Template::Perl</remote-id>
+    <remote-id type="cpan-module">Template::Plugin</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Assert</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::CGI</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Datafile</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Date</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Date::Calc</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Date::Manip</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Directory</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Dumper</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::File</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Filter</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Format</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::HTML</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Image</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Iterator</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Math</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Pod</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Procedural</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Scalar</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::String</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Table</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::URL</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::View</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::Wrap</remote-id>
+    <remote-id type="cpan-module">Template::Plugins</remote-id>
+    <remote-id type="cpan-module">Template::Provider</remote-id>
+    <remote-id type="cpan-module">Template::Service</remote-id>
+    <remote-id type="cpan-module">Template::Stash</remote-id>
+    <remote-id type="cpan-module">Template::Stash::Context</remote-id>
+    <remote-id type="cpan-module">Template::Stash::XS</remote-id>
+    <remote-id type="cpan-module">Template::Test</remote-id>
+    <remote-id type="cpan-module">Template::TieString</remote-id>
+    <remote-id type="cpan-module">Template::VMethods</remote-id>
+    <remote-id type="cpan-module">Template::View</remote-id>
+    <remote-id type="cpan-module">bytes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Template-XML/metadata.xml b/dev-perl/Template-XML/metadata.xml
index 98f1785dc99d..34ea84e6e2e5 100644
--- a/dev-perl/Template-XML/metadata.xml
+++ b/dev-perl/Template-XML/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Template-XML</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::DOM</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::File</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::RSS</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::Simple</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::Style</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::View</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::View::Element</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::View::Parser</remote-id>
+    <remote-id type="cpan-module">Template::Plugin::XML::XPath</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Element</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Node</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Comment</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Element</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Text</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ANSIScreen/metadata.xml b/dev-perl/Term-ANSIScreen/metadata.xml
index 6ba3d5de9926..73c06cc4d1c4 100644
--- a/dev-perl/Term-ANSIScreen/metadata.xml
+++ b/dev-perl/Term-ANSIScreen/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ANSIScreen</remote-id>
+    <remote-id type="cpan-module">Term::ANSIScreen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar/metadata.xml b/dev-perl/Term-ProgressBar/metadata.xml
index 84eeb1405702..6559a9940733 100644
--- a/dev-perl/Term-ProgressBar/metadata.xml
+++ b/dev-perl/Term-ProgressBar/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ProgressBar</remote-id>
+    <remote-id type="cpan-module">Term::ProgressBar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ReadLine-Gnu/metadata.xml b/dev-perl/Term-ReadLine-Gnu/metadata.xml
index 6af5c26d3b4c..5672a68a0aff 100644
--- a/dev-perl/Term-ReadLine-Gnu/metadata.xml
+++ b/dev-perl/Term-ReadLine-Gnu/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ReadLine-Gnu</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Gnu</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Gnu::AU</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Gnu::Var</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Gnu::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ReadLine-Perl/metadata.xml b/dev-perl/Term-ReadLine-Perl/metadata.xml
index c47f2d62f82a..eb237d76ae9e 100644
--- a/dev-perl/Term-ReadLine-Perl/metadata.xml
+++ b/dev-perl/Term-ReadLine-Perl/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ReadLine-Perl</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Compa</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Perl</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Perl::AU</remote-id>
+    <remote-id type="cpan-module">Term::ReadLine::Perl::Tie</remote-id>
+    <remote-id type="cpan-module">readline</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ReadPassword/metadata.xml b/dev-perl/Term-ReadPassword/metadata.xml
index 7ae0619a1a7c..784fc0baf5d2 100644
--- a/dev-perl/Term-ReadPassword/metadata.xml
+++ b/dev-perl/Term-ReadPassword/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ReadPassword</remote-id>
+    <remote-id type="cpan-module">Term::ReadPassword</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-Screen/metadata.xml b/dev-perl/Term-Screen/metadata.xml
index 2c499449f69f..e57b8e6db601 100644
--- a/dev-perl/Term-Screen/metadata.xml
+++ b/dev-perl/Term-Screen/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-Screen</remote-id>
+    <remote-id type="cpan-module">Term::Screen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ScreenColor/metadata.xml b/dev-perl/Term-ScreenColor/metadata.xml
index 9efaa3ed7260..ed5dffbe3097 100644
--- a/dev-perl/Term-ScreenColor/metadata.xml
+++ b/dev-perl/Term-ScreenColor/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ScreenColor</remote-id>
+    <remote-id type="cpan-module">Term::Screen::Fixes</remote-id>
+    <remote-id type="cpan-module">Term::ScreenColor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-Shell/metadata.xml b/dev-perl/Term-Shell/metadata.xml
index ce923c97d29e..4efb6250e86f 100644
--- a/dev-perl/Term-Shell/metadata.xml
+++ b/dev-perl/Term-Shell/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+	<maintainer>
 <email>pva@gentoo.org</email>
 <name>Peter Volkov</name>
-</maintainer>
-<maintainer>
+	</maintainer>
+	<maintainer>
 <email>azamat.hackimov@gmail.com</email>
 <name>Azamat Hackimov</name>
-</maintainer>
-<herd>perl</herd>
+	</maintainer>
+	<herd>perl</herd>
 	<upstream>
-		<remote-id type="cpan">Term-Shell</remote-id>
+<remote-id type="cpan">Term-Shell</remote-id>
+<remote-id type="cpan-module">Term::Shell</remote-id>
+<remote-id type="cpan-module">Term::Shell::OnScopeLeave</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Term-ShellUI/metadata.xml b/dev-perl/Term-ShellUI/metadata.xml
index a3b91ac467dd..b27a8fd42948 100644
--- a/dev-perl/Term-ShellUI/metadata.xml
+++ b/dev-perl/Term-ShellUI/metadata.xml
@@ -4,5 +4,7 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Term-ShellUI</remote-id>
+		<remote-id type="cpan-module">Term::ShellUI</remote-id>
+		<remote-id type="cpan-module">Text::Shellwords::Cursor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/TermReadKey/metadata.xml b/dev-perl/TermReadKey/metadata.xml
index 4f83d18abe2b..a3712a726f07 100644
--- a/dev-perl/TermReadKey/metadata.xml
+++ b/dev-perl/TermReadKey/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">TermReadKey</remote-id>
+    <remote-id type="cpan-module">Term::ReadKey</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Assert/metadata.xml b/dev-perl/Test-Assert/metadata.xml
index e1fffd961536..8ffeecf4756c 100644
--- a/dev-perl/Test-Assert/metadata.xml
+++ b/dev-perl/Test-Assert/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Assert</remote-id>
+    <remote-id type="cpan-module">Exception::Assertion</remote-id>
+    <remote-id type="cpan-module">Test::Assert</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Base/metadata.xml b/dev-perl/Test-Base/metadata.xml
index caa03d99a7ee..288416380a19 100644
--- a/dev-perl/Test-Base/metadata.xml
+++ b/dev-perl/Test-Base/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Base</remote-id>
+    <remote-id type="cpan-module">Module::Install::TestBase</remote-id>
+    <remote-id type="cpan-module">Test::Base</remote-id>
+    <remote-id type="cpan-module">Test::Base::Block</remote-id>
+    <remote-id type="cpan-module">Test::Base::Filter</remote-id>
+    <remote-id type="cpan-module">Test::Base::Handle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Class/metadata.xml b/dev-perl/Test-Class/metadata.xml
index b829909085e7..4c1c2edb56e3 100644
--- a/dev-perl/Test-Class/metadata.xml
+++ b/dev-perl/Test-Class/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Class</remote-id>
+    <remote-id type="cpan-module">Test::Class</remote-id>
+    <remote-id type="cpan-module">Test::Class::Load</remote-id>
+    <remote-id type="cpan-module">Test::Class::MethodInfo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-ClassAPI/metadata.xml b/dev-perl/Test-ClassAPI/metadata.xml
index 7bbd1a06c4a6..3f63627fb1a7 100644
--- a/dev-perl/Test-ClassAPI/metadata.xml
+++ b/dev-perl/Test-ClassAPI/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-ClassAPI</remote-id>
+    <remote-id type="cpan-module">Test::ClassAPI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Command/metadata.xml b/dev-perl/Test-Command/metadata.xml
index c4b4d4f05404..456a0062a494 100644
--- a/dev-perl/Test-Command/metadata.xml
+++ b/dev-perl/Test-Command/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Command</remote-id>
+    <remote-id type="cpan-module">Test::Command</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Deep/metadata.xml b/dev-perl/Test-Deep/metadata.xml
index e9a7d6f64a39..cffd7024fb7b 100644
--- a/dev-perl/Test-Deep/metadata.xml
+++ b/dev-perl/Test-Deep/metadata.xml
@@ -4,5 +4,53 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Deep</remote-id>
+    <remote-id type="cpan-module">Test::Deep</remote-id>
+    <remote-id type="cpan-module">Test::Deep::All</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Any</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Array</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ArrayEach</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ArrayElementsOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ArrayLength</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ArrayLengthOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Blessed</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Boolean</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Cache</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Cache::Simple</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Class</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Cmp</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Code</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Hash</remote-id>
+    <remote-id type="cpan-module">Test::Deep::HashEach</remote-id>
+    <remote-id type="cpan-module">Test::Deep::HashElements</remote-id>
+    <remote-id type="cpan-module">Test::Deep::HashKeys</remote-id>
+    <remote-id type="cpan-module">Test::Deep::HashKeysOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Ignore</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Isa</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ListMethods</remote-id>
+    <remote-id type="cpan-module">Test::Deep::MM</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Methods</remote-id>
+    <remote-id type="cpan-module">Test::Deep::NoTest</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Number</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Ref</remote-id>
+    <remote-id type="cpan-module">Test::Deep::RefType</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Regexp</remote-id>
+    <remote-id type="cpan-module">Test::Deep::RegexpMatches</remote-id>
+    <remote-id type="cpan-module">Test::Deep::RegexpRef</remote-id>
+    <remote-id type="cpan-module">Test::Deep::RegexpRefOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::RegexpVersion</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ScalarRef</remote-id>
+    <remote-id type="cpan-module">Test::Deep::ScalarRefOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Set</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Shallow</remote-id>
+    <remote-id type="cpan-module">Test::Deep::Stack</remote-id>
+    <remote-id type="cpan-module">Test::Deep::String</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SubHash</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SubHashElements</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SubHashKeys</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SubHashKeysOnly</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SuperHash</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SuperHashElements</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SuperHashKeys</remote-id>
+    <remote-id type="cpan-module">Test::Deep::SuperHashKeysOnly</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Differences/metadata.xml b/dev-perl/Test-Differences/metadata.xml
index 61c11c1e84e2..b556128e1b69 100644
--- a/dev-perl/Test-Differences/metadata.xml
+++ b/dev-perl/Test-Differences/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Differences</remote-id>
+    <remote-id type="cpan-module">Test::Differences</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-DistManifest/metadata.xml b/dev-perl/Test-DistManifest/metadata.xml
index bbaf0360ad6e..27325aa22ef7 100644
--- a/dev-perl/Test-DistManifest/metadata.xml
+++ b/dev-perl/Test-DistManifest/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Test-DistManifest</remote-id>
+		<remote-id type="cpan-module">Test::DistManifest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Distribution/metadata.xml b/dev-perl/Test-Distribution/metadata.xml
index a911c6642eec..38eda5db1f3d 100644
--- a/dev-perl/Test-Distribution/metadata.xml
+++ b/dev-perl/Test-Distribution/metadata.xml
@@ -7,5 +7,16 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Distribution</remote-id>
+    <remote-id type="cpan-module">Test::Distribution</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::base</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::description</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::exports</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::manifest</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::pod</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::podcover</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::prereq</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::sig</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::use</remote-id>
+    <remote-id type="cpan-module">Test::Distribution::versions</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Exception/metadata.xml b/dev-perl/Test-Exception/metadata.xml
index 77e12433d900..14adf3bbfea5 100644
--- a/dev-perl/Test-Exception/metadata.xml
+++ b/dev-perl/Test-Exception/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Exception</remote-id>
+    <remote-id type="cpan-module">Test::Exception</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Fatal/metadata.xml b/dev-perl/Test-Fatal/metadata.xml
index 9c845e4d34f9..99676ad063a1 100644
--- a/dev-perl/Test-Fatal/metadata.xml
+++ b/dev-perl/Test-Fatal/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Fatal</remote-id>
+    <remote-id type="cpan-module">Test::Fatal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Inline/metadata.xml b/dev-perl/Test-Inline/metadata.xml
index bc4fc049d29d..b185372436ea 100644
--- a/dev-perl/Test-Inline/metadata.xml
+++ b/dev-perl/Test-Inline/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Inline</remote-id>
+    <remote-id type="cpan-module">Test::Inline</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Content</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Content::Default</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Content::Legacy</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Content::Simple</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Extract</remote-id>
+    <remote-id type="cpan-module">Test::Inline::IO::File</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Script</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Section</remote-id>
+    <remote-id type="cpan-module">Test::Inline::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Inter/metadata.xml b/dev-perl/Test-Inter/metadata.xml
index 12dbec08ad0f..b2f7cab1d7cd 100644
--- a/dev-perl/Test-Inter/metadata.xml
+++ b/dev-perl/Test-Inter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Inter</remote-id>
+    <remote-id type="cpan-module">Test::Inter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-LongString/metadata.xml b/dev-perl/Test-LongString/metadata.xml
index 517d73b767cb..acca10fbdbe6 100644
--- a/dev-perl/Test-LongString/metadata.xml
+++ b/dev-perl/Test-LongString/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-LongString</remote-id>
+    <remote-id type="cpan-module">Test::LongString</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Manifest/metadata.xml b/dev-perl/Test-Manifest/metadata.xml
index c76bebec26c7..880d5d5bf94a 100644
--- a/dev-perl/Test-Manifest/metadata.xml
+++ b/dev-perl/Test-Manifest/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Manifest</remote-id>
+    <remote-id type="cpan-module">Test::Manifest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Memory-Cycle/metadata.xml b/dev-perl/Test-Memory-Cycle/metadata.xml
index 7ab2f884b245..19fd231f4c35 100644
--- a/dev-perl/Test-Memory-Cycle/metadata.xml
+++ b/dev-perl/Test-Memory-Cycle/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Memory-Cycle</remote-id>
+    <remote-id type="cpan-module">Test::Memory::Cycle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-MockObject/metadata.xml b/dev-perl/Test-MockObject/metadata.xml
index 0c8b76157feb..5725b78e07e6 100644
--- a/dev-perl/Test-MockObject/metadata.xml
+++ b/dev-perl/Test-MockObject/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-MockObject</remote-id>
+    <remote-id type="cpan-module">Test::MockObject</remote-id>
+    <remote-id type="cpan-module">Test::MockObject::Extends</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-MockTime/metadata.xml b/dev-perl/Test-MockTime/metadata.xml
index 78f75765f65c..6ad93aa3d4b2 100644
--- a/dev-perl/Test-MockTime/metadata.xml
+++ b/dev-perl/Test-MockTime/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-MockTime</remote-id>
+    <remote-id type="cpan-module">Test::MockTime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Most/metadata.xml b/dev-perl/Test-Most/metadata.xml
index 2b79553c9995..cac37eef5481 100644
--- a/dev-perl/Test-Most/metadata.xml
+++ b/dev-perl/Test-Most/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Most</remote-id>
+    <remote-id type="cpan-module">Test::Most</remote-id>
+    <remote-id type="cpan-module">Test::Most::Exception</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-NoWarnings/metadata.xml b/dev-perl/Test-NoWarnings/metadata.xml
index e2b68e711dd1..19789f3fd881 100644
--- a/dev-perl/Test-NoWarnings/metadata.xml
+++ b/dev-perl/Test-NoWarnings/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-NoWarnings</remote-id>
+    <remote-id type="cpan-module">Test::NoWarnings</remote-id>
+    <remote-id type="cpan-module">Test::NoWarnings::Warning</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Number-Delta/metadata.xml b/dev-perl/Test-Number-Delta/metadata.xml
index 94f47eef0db1..5442e26c3c53 100644
--- a/dev-perl/Test-Number-Delta/metadata.xml
+++ b/dev-perl/Test-Number-Delta/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Number-Delta</remote-id>
+    <remote-id type="cpan-module">Test::Number::Delta</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Object/metadata.xml b/dev-perl/Test-Object/metadata.xml
index 8083007d4718..9a8b0e256c55 100644
--- a/dev-perl/Test-Object/metadata.xml
+++ b/dev-perl/Test-Object/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Object</remote-id>
+    <remote-id type="cpan-module">Test::Object</remote-id>
+    <remote-id type="cpan-module">Test::Object::Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Output/metadata.xml b/dev-perl/Test-Output/metadata.xml
index 138a02e93169..722d01f20a69 100644
--- a/dev-perl/Test-Output/metadata.xml
+++ b/dev-perl/Test-Output/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Output</remote-id>
+    <remote-id type="cpan-module">Test::Output</remote-id>
+    <remote-id type="cpan-module">Test::Output::Tie</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Perl-Critic/metadata.xml b/dev-perl/Test-Perl-Critic/metadata.xml
index 2174346a2805..20b373e48833 100644
--- a/dev-perl/Test-Perl-Critic/metadata.xml
+++ b/dev-perl/Test-Perl-Critic/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Perl-Critic</remote-id>
+    <remote-id type="cpan-module">Test::Perl::Critic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Pod-Coverage/metadata.xml b/dev-perl/Test-Pod-Coverage/metadata.xml
index 3f7d99d80ed8..aea8469eafe7 100644
--- a/dev-perl/Test-Pod-Coverage/metadata.xml
+++ b/dev-perl/Test-Pod-Coverage/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Pod-Coverage</remote-id>
+    <remote-id type="cpan-module">Test::Pod::Coverage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Pod/metadata.xml b/dev-perl/Test-Pod/metadata.xml
index f482aad54871..6793e22aff2b 100644
--- a/dev-perl/Test-Pod/metadata.xml
+++ b/dev-perl/Test-Pod/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Pod</remote-id>
+    <remote-id type="cpan-module">Test::Pod</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Portability-Files/metadata.xml b/dev-perl/Test-Portability-Files/metadata.xml
index 223da2398bb1..6c0ee55a773f 100644
--- a/dev-perl/Test-Portability-Files/metadata.xml
+++ b/dev-perl/Test-Portability-Files/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Portability-Files</remote-id>
+    <remote-id type="cpan-module">Test::Portability::Files</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Requires/metadata.xml b/dev-perl/Test-Requires/metadata.xml
index 88805cdc7f0f..0b6be79e51ad 100644
--- a/dev-perl/Test-Requires/metadata.xml
+++ b/dev-perl/Test-Requires/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Requires</remote-id>
+    <remote-id type="cpan-module">Test::Requires</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Script/metadata.xml b/dev-perl/Test-Script/metadata.xml
index 64ee8511526e..5821cdef85e2 100644
--- a/dev-perl/Test-Script/metadata.xml
+++ b/dev-perl/Test-Script/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Script</remote-id>
+    <remote-id type="cpan-module">Test::Script</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-SharedFork/metadata.xml b/dev-perl/Test-SharedFork/metadata.xml
index 911367ff37b1..a98b3722d639 100644
--- a/dev-perl/Test-SharedFork/metadata.xml
+++ b/dev-perl/Test-SharedFork/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-SharedFork</remote-id>
+    <remote-id type="cpan-module">Test::SharedFork</remote-id>
+    <remote-id type="cpan-module">Test::SharedFork::Array</remote-id>
+    <remote-id type="cpan-module">Test::SharedFork::Scalar</remote-id>
+    <remote-id type="cpan-module">Test::SharedFork::Store</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-SubCalls/metadata.xml b/dev-perl/Test-SubCalls/metadata.xml
index 80e92c5f6280..cc4596ba5b57 100644
--- a/dev-perl/Test-SubCalls/metadata.xml
+++ b/dev-perl/Test-SubCalls/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-SubCalls</remote-id>
+    <remote-id type="cpan-module">Test::SubCalls</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-TCP/metadata.xml b/dev-perl/Test-TCP/metadata.xml
index 3d0ac51fd893..99659e6ee0d4 100644
--- a/dev-perl/Test-TCP/metadata.xml
+++ b/dev-perl/Test-TCP/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-TCP</remote-id>
+    <remote-id type="cpan-module">Test::TCP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Taint/metadata.xml b/dev-perl/Test-Taint/metadata.xml
index c1a0aa65bccf..54f74736292c 100644
--- a/dev-perl/Test-Taint/metadata.xml
+++ b/dev-perl/Test-Taint/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Taint</remote-id>
+    <remote-id type="cpan-module">Test::Taint</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Tester/metadata.xml b/dev-perl/Test-Tester/metadata.xml
index 81af47590c1a..ca3c00848979 100644
--- a/dev-perl/Test-Tester/metadata.xml
+++ b/dev-perl/Test-Tester/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Tester</remote-id>
+    <remote-id type="cpan-module">Test::Tester</remote-id>
+    <remote-id type="cpan-module">Test::Tester::Capture</remote-id>
+    <remote-id type="cpan-module">Test::Tester::CaptureRunner</remote-id>
+    <remote-id type="cpan-module">Test::Tester::Delegate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Trap/metadata.xml b/dev-perl/Test-Trap/metadata.xml
index 73eb963afb7c..e8def212b928 100644
--- a/dev-perl/Test-Trap/metadata.xml
+++ b/dev-perl/Test-Trap/metadata.xml
@@ -7,5 +7,10 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Test-Trap</remote-id>
+		<remote-id type="cpan-module">Test::Trap</remote-id>
+		<remote-id type="cpan-module">Test::Trap::Builder</remote-id>
+		<remote-id type="cpan-module">Test::Trap::Builder::PerlIO</remote-id>
+		<remote-id type="cpan-module">Test::Trap::Builder::SystemSafe</remote-id>
+		<remote-id type="cpan-module">Test::Trap::Builder::TempFile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Unit-Lite/metadata.xml b/dev-perl/Test-Unit-Lite/metadata.xml
index 40b1b185eef7..ca1ba30b890c 100644
--- a/dev-perl/Test-Unit-Lite/metadata.xml
+++ b/dev-perl/Test-Unit-Lite/metadata.xml
@@ -7,5 +7,13 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Test-Unit-Lite</remote-id>
+    <remote-id type="cpan-module">Test::Unit::Debug</remote-id>
+    <remote-id type="cpan-module">Test::Unit::HarnessUnit</remote-id>
+    <remote-id type="cpan-module">Test::Unit::Lite</remote-id>
+    <remote-id type="cpan-module">Test::Unit::Lite::AllTests</remote-id>
+    <remote-id type="cpan-module">Test::Unit::Result</remote-id>
+    <remote-id type="cpan-module">Test::Unit::TestCase</remote-id>
+    <remote-id type="cpan-module">Test::Unit::TestRunner</remote-id>
+    <remote-id type="cpan-module">Test::Unit::TestSuite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-WWW-Mechanize/metadata.xml b/dev-perl/Test-WWW-Mechanize/metadata.xml
index 5790990405aa..4689d7d1eba6 100644
--- a/dev-perl/Test-WWW-Mechanize/metadata.xml
+++ b/dev-perl/Test-WWW-Mechanize/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-WWW-Mechanize</remote-id>
+    <remote-id type="cpan-module">Test::WWW::Mechanize</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-Warn/metadata.xml b/dev-perl/Test-Warn/metadata.xml
index 84b3bcf3d7bf..0d6baa3c4d68 100644
--- a/dev-perl/Test-Warn/metadata.xml
+++ b/dev-perl/Test-Warn/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Warn</remote-id>
+    <remote-id type="cpan-module">Test::Warn</remote-id>
+    <remote-id type="cpan-module">Test::Warn::Categorization</remote-id>
+    <remote-id type="cpan-module">Test::Warn::DAG_Node_Tree</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Test-use-ok/metadata.xml b/dev-perl/Test-use-ok/metadata.xml
index 4809afeb7b21..3319ceea0d2a 100644
--- a/dev-perl/Test-use-ok/metadata.xml
+++ b/dev-perl/Test-use-ok/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-use-ok</remote-id>
+    <remote-id type="cpan-module">Test::use::ok</remote-id>
+    <remote-id type="cpan-module">ok</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Aligner/metadata.xml b/dev-perl/Text-Aligner/metadata.xml
index 6545d65de67b..259efa56ab35 100644
--- a/dev-perl/Text-Aligner/metadata.xml
+++ b/dev-perl/Text-Aligner/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Aligner</remote-id>
+    <remote-id type="cpan-module">Text::Aligner</remote-id>
+    <remote-id type="cpan-module">Text::Aligner::Auto</remote-id>
+    <remote-id type="cpan-module">Text::Aligner::MaxKeeper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Aspell/metadata.xml b/dev-perl/Text-Aspell/metadata.xml
index 13bf542c8884..c69696be5500 100644
--- a/dev-perl/Text-Aspell/metadata.xml
+++ b/dev-perl/Text-Aspell/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Aspell</remote-id>
+    <remote-id type="cpan-module">Text::Aspell</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-CSV-Simple/metadata.xml b/dev-perl/Text-CSV-Simple/metadata.xml
index aa48ceb646e9..6cf57851ea15 100644
--- a/dev-perl/Text-CSV-Simple/metadata.xml
+++ b/dev-perl/Text-CSV-Simple/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-CSV-Simple</remote-id>
+    <remote-id type="cpan-module">Text::CSV::Simple</remote-id>
+    <remote-id type="cpan-module">Text::CSV::Simple::__::Base</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-CSV/metadata.xml b/dev-perl/Text-CSV/metadata.xml
index eb395df0f7c9..76cd532bf8c7 100644
--- a/dev-perl/Text-CSV/metadata.xml
+++ b/dev-perl/Text-CSV/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Text-CSV</remote-id>
+    <remote-id type="cpan-module">Text::CSV</remote-id>
+    <remote-id type="cpan-module">Text::CSV::ErrorDiag</remote-id>
+    <remote-id type="cpan-module">Text::CSV_PP</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-CSV_XS/metadata.xml b/dev-perl/Text-CSV_XS/metadata.xml
index 5e03f825c0d2..13ecc18e2eea 100644
--- a/dev-perl/Text-CSV_XS/metadata.xml
+++ b/dev-perl/Text-CSV_XS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-CSV_XS</remote-id>
+    <remote-id type="cpan-module">Text::CSV_XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-CharWidth/metadata.xml b/dev-perl/Text-CharWidth/metadata.xml
index fe3c17ffe3d9..e7e33d1b4d3f 100644
--- a/dev-perl/Text-CharWidth/metadata.xml
+++ b/dev-perl/Text-CharWidth/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-CharWidth</remote-id>
+    <remote-id type="cpan-module">Text::CharWidth</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Diff/metadata.xml b/dev-perl/Text-Diff/metadata.xml
index 1ad287803a09..48f596581f41 100644
--- a/dev-perl/Text-Diff/metadata.xml
+++ b/dev-perl/Text-Diff/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Diff</remote-id>
+    <remote-id type="cpan-module">Text::Diff</remote-id>
+    <remote-id type="cpan-module">Text::Diff::Base</remote-id>
+    <remote-id type="cpan-module">Text::Diff::Config</remote-id>
+    <remote-id type="cpan-module">Text::Diff::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-FindIndent/metadata.xml b/dev-perl/Text-FindIndent/metadata.xml
index 32da44676b06..57143809b113 100644
--- a/dev-perl/Text-FindIndent/metadata.xml
+++ b/dev-perl/Text-FindIndent/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-FindIndent</remote-id>
+    <remote-id type="cpan-module">Text::FindIndent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-German/metadata.xml b/dev-perl/Text-German/metadata.xml
index f0a912729a43..5badd95d228d 100644
--- a/dev-perl/Text-German/metadata.xml
+++ b/dev-perl/Text-German/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-German</remote-id>
+    <remote-id type="cpan-module">Text::German</remote-id>
+    <remote-id type="cpan-module">Text::German::Adjektiv</remote-id>
+    <remote-id type="cpan-module">Text::German::Ausnahme</remote-id>
+    <remote-id type="cpan-module">Text::German::Cache</remote-id>
+    <remote-id type="cpan-module">Text::German::Endung</remote-id>
+    <remote-id type="cpan-module">Text::German::Regel</remote-id>
+    <remote-id type="cpan-module">Text::German::Util</remote-id>
+    <remote-id type="cpan-module">Text::German::Verb</remote-id>
+    <remote-id type="cpan-module">Text::German::Vorsilbe</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Glob/metadata.xml b/dev-perl/Text-Glob/metadata.xml
index c8d56f4b24f9..5059cbb1aa3a 100644
--- a/dev-perl/Text-Glob/metadata.xml
+++ b/dev-perl/Text-Glob/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Glob</remote-id>
+    <remote-id type="cpan-module">Text::Glob</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Iconv/metadata.xml b/dev-perl/Text-Iconv/metadata.xml
index 898e1e215ea1..7b09daeadff4 100644
--- a/dev-perl/Text-Iconv/metadata.xml
+++ b/dev-perl/Text-Iconv/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Iconv</remote-id>
+    <remote-id type="cpan-module">Text::Iconv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Kakasi/metadata.xml b/dev-perl/Text-Kakasi/metadata.xml
index 5c4182c266b4..d63d8df610a2 100644
--- a/dev-perl/Text-Kakasi/metadata.xml
+++ b/dev-perl/Text-Kakasi/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Kakasi</remote-id>
+    <remote-id type="cpan-module">Text::Kakasi</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Levenshtein/metadata.xml b/dev-perl/Text-Levenshtein/metadata.xml
index bdab64ea047f..aa56fdfce785 100644
--- a/dev-perl/Text-Levenshtein/metadata.xml
+++ b/dev-perl/Text-Levenshtein/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Levenshtein</remote-id>
+    <remote-id type="cpan-module">Text::Levenshtein</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-LevenshteinXS/metadata.xml b/dev-perl/Text-LevenshteinXS/metadata.xml
index cded122083e2..9534c90ee148 100644
--- a/dev-perl/Text-LevenshteinXS/metadata.xml
+++ b/dev-perl/Text-LevenshteinXS/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-LevenshteinXS</remote-id>
+    <remote-id type="cpan-module">Text::LevenshteinXS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Markdown/metadata.xml b/dev-perl/Text-Markdown/metadata.xml
index 07a63de87571..2d97bdf96a56 100644
--- a/dev-perl/Text-Markdown/metadata.xml
+++ b/dev-perl/Text-Markdown/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Markdown</remote-id>
+    <remote-id type="cpan-module">Text::Markdown</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Netstring/metadata.xml b/dev-perl/Text-Netstring/metadata.xml
index bff33b49590e..f871ab7b8020 100644
--- a/dev-perl/Text-Netstring/metadata.xml
+++ b/dev-perl/Text-Netstring/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Netstring</remote-id>
+    <remote-id type="cpan-module">Text::Netstring</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Password-Pronounceable/metadata.xml b/dev-perl/Text-Password-Pronounceable/metadata.xml
index 24b6372d2465..6f0ef1258fe3 100644
--- a/dev-perl/Text-Password-Pronounceable/metadata.xml
+++ b/dev-perl/Text-Password-Pronounceable/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Password-Pronounceable</remote-id>
+    <remote-id type="cpan-module">Text::Password::Pronounceable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Patch/metadata.xml b/dev-perl/Text-Patch/metadata.xml
index ba93048c5dab..af62dd76817f 100644
--- a/dev-perl/Text-Patch/metadata.xml
+++ b/dev-perl/Text-Patch/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Patch</remote-id>
+    <remote-id type="cpan-module">Text::Patch</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Quoted/metadata.xml b/dev-perl/Text-Quoted/metadata.xml
index 9e79f820fdb0..c7d8a93833f1 100644
--- a/dev-perl/Text-Quoted/metadata.xml
+++ b/dev-perl/Text-Quoted/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Quoted</remote-id>
+    <remote-id type="cpan-module">Text::Quoted</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Shellwords/metadata.xml b/dev-perl/Text-Shellwords/metadata.xml
index 8a297d878d66..771cbf32330d 100644
--- a/dev-perl/Text-Shellwords/metadata.xml
+++ b/dev-perl/Text-Shellwords/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Shellwords</remote-id>
+    <remote-id type="cpan-module">Text::Shellwords</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Table/metadata.xml b/dev-perl/Text-Table/metadata.xml
index 055692a086a2..4a148feabd79 100644
--- a/dev-perl/Text-Table/metadata.xml
+++ b/dev-perl/Text-Table/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Text-Table</remote-id>
+    <remote-id type="cpan-module">Text::Table</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Unaccent/metadata.xml b/dev-perl/Text-Unaccent/metadata.xml
index 8f4166a385fd..c66773654bd6 100644
--- a/dev-perl/Text-Unaccent/metadata.xml
+++ b/dev-perl/Text-Unaccent/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Unaccent</remote-id>
+    <remote-id type="cpan-module">Text::Unaccent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-Unidecode/metadata.xml b/dev-perl/Text-Unidecode/metadata.xml
index 37e40ae5f00e..c9be3adbd932 100644
--- a/dev-perl/Text-Unidecode/metadata.xml
+++ b/dev-perl/Text-Unidecode/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Unidecode</remote-id>
+    <remote-id type="cpan-module">Text::Unidecode</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-WikiFormat/metadata.xml b/dev-perl/Text-WikiFormat/metadata.xml
index d3df029e6a56..46d5f135fa69 100644
--- a/dev-perl/Text-WikiFormat/metadata.xml
+++ b/dev-perl/Text-WikiFormat/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-WikiFormat</remote-id>
+    <remote-id type="cpan-module">Text::WikiFormat</remote-id>
+    <remote-id type="cpan-module">Text::WikiFormat::Block</remote-id>
+    <remote-id type="cpan-module">Text::WikiFormat::Block::code</remote-id>
+    <remote-id type="cpan-module">Text::WikiFormat::Blocks</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-WrapI18N/metadata.xml b/dev-perl/Text-WrapI18N/metadata.xml
index 10ebaffe6ba0..4ed8c96a6c82 100644
--- a/dev-perl/Text-WrapI18N/metadata.xml
+++ b/dev-perl/Text-WrapI18N/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-WrapI18N</remote-id>
+    <remote-id type="cpan-module">Text::WrapI18N</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Text-vFile-asData/metadata.xml b/dev-perl/Text-vFile-asData/metadata.xml
index 062a77dae2b6..6be698052fbc 100644
--- a/dev-perl/Text-vFile-asData/metadata.xml
+++ b/dev-perl/Text-vFile-asData/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-vFile-asData</remote-id>
+    <remote-id type="cpan-module">Text::vFile::asData</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/TextToHTML/metadata.xml b/dev-perl/TextToHTML/metadata.xml
index b2c2a5ab3a82..7f8f5d5d090c 100644
--- a/dev-perl/TextToHTML/metadata.xml
+++ b/dev-perl/TextToHTML/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">txt2html</remote-id>
+    <remote-id type="cpan-module">HTML::TextToHTML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/TheSchwartz/metadata.xml b/dev-perl/TheSchwartz/metadata.xml
index 2b374eea81dc..2156b722459c 100644
--- a/dev-perl/TheSchwartz/metadata.xml
+++ b/dev-perl/TheSchwartz/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">TheSchwartz</remote-id>
+    <remote-id type="cpan-module">TheSchwartz</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::Error</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::ExitStatus</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::FuncMap</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::Job</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::JobHandle</remote-id>
+    <remote-id type="cpan-module">TheSchwartz::Worker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Throwable/metadata.xml b/dev-perl/Throwable/metadata.xml
index 1f82bb5e9e4e..f5223fffb11b 100644
--- a/dev-perl/Throwable/metadata.xml
+++ b/dev-perl/Throwable/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Throwable</remote-id>
+    <remote-id type="cpan-module">StackTrace::Auto</remote-id>
+    <remote-id type="cpan-module">Throwable</remote-id>
+    <remote-id type="cpan-module">Throwable::Error</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Array-Sorted/metadata.xml b/dev-perl/Tie-Array-Sorted/metadata.xml
index 9819513b13cd..746f34cc9a85 100644
--- a/dev-perl/Tie-Array-Sorted/metadata.xml
+++ b/dev-perl/Tie-Array-Sorted/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-Array-Sorted</remote-id>
+    <remote-id type="cpan-module">Tie::Array::Sorted</remote-id>
+    <remote-id type="cpan-module">Tie::Array::Sorted::Lazy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Cache-LRU-Expires/metadata.xml b/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
index 4c35b7a2218a..9b85634db765 100644
--- a/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
+++ b/dev-perl/Tie-Cache-LRU-Expires/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-Cache-LRU-Expires</remote-id>
+    <remote-id type="cpan-module">Tie::Cache::LRU::Expires</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Cache-LRU/metadata.xml b/dev-perl/Tie-Cache-LRU/metadata.xml
index 794e98b548de..810c1b640ce2 100644
--- a/dev-perl/Tie-Cache-LRU/metadata.xml
+++ b/dev-perl/Tie-Cache-LRU/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-Cache-LRU</remote-id>
+    <remote-id type="cpan-module">Tie::Cache::LRU</remote-id>
+    <remote-id type="cpan-module">Tie::Cache::LRU::Array</remote-id>
+    <remote-id type="cpan-module">Tie::Cache::LRU::LinkedList</remote-id>
+    <remote-id type="cpan-module">Tie::Cache::LRU::Virtual</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Cache/metadata.xml b/dev-perl/Tie-Cache/metadata.xml
index f2054451e310..daf27a54044a 100644
--- a/dev-perl/Tie-Cache/metadata.xml
+++ b/dev-perl/Tie-Cache/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-Cache</remote-id>
+    <remote-id type="cpan-module">Tie::Cache</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-IxHash/metadata.xml b/dev-perl/Tie-IxHash/metadata.xml
index 9a87816a92a7..8ff0da1d0a41 100644
--- a/dev-perl/Tie-IxHash/metadata.xml
+++ b/dev-perl/Tie-IxHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-IxHash</remote-id>
+    <remote-id type="cpan-module">Tie::IxHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-LLHash/metadata.xml b/dev-perl/Tie-LLHash/metadata.xml
index 9ec6e6dcb237..910b62153b86 100644
--- a/dev-perl/Tie-LLHash/metadata.xml
+++ b/dev-perl/Tie-LLHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-LLHash</remote-id>
+    <remote-id type="cpan-module">Tie::LLHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-RegexpHash/metadata.xml b/dev-perl/Tie-RegexpHash/metadata.xml
index 87e3c2dc205b..4eac42bf95f3 100644
--- a/dev-perl/Tie-RegexpHash/metadata.xml
+++ b/dev-perl/Tie-RegexpHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-RegexpHash</remote-id>
+    <remote-id type="cpan-module">Tie::RegexpHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-ShadowHash/metadata.xml b/dev-perl/Tie-ShadowHash/metadata.xml
index 08a08bd6756a..039e37cd8332 100644
--- a/dev-perl/Tie-ShadowHash/metadata.xml
+++ b/dev-perl/Tie-ShadowHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-ShadowHash</remote-id>
+    <remote-id type="cpan-module">Tie::ShadowHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Simple/metadata.xml b/dev-perl/Tie-Simple/metadata.xml
index 3b46f0a74493..e72e387cf691 100644
--- a/dev-perl/Tie-Simple/metadata.xml
+++ b/dev-perl/Tie-Simple/metadata.xml
@@ -8,5 +8,11 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Simple</remote-id>
+    <remote-id type="cpan-module">Tie::Simple</remote-id>
+    <remote-id type="cpan-module">Tie::Simple::Array</remote-id>
+    <remote-id type="cpan-module">Tie::Simple::Handle</remote-id>
+    <remote-id type="cpan-module">Tie::Simple::Hash</remote-id>
+    <remote-id type="cpan-module">Tie::Simple::Scalar</remote-id>
+    <remote-id type="cpan-module">Tie::Simple::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-StrictHash/metadata.xml b/dev-perl/Tie-StrictHash/metadata.xml
index 6d7cff3ece2d..8ed1ae96b5cb 100644
--- a/dev-perl/Tie-StrictHash/metadata.xml
+++ b/dev-perl/Tie-StrictHash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-StrictHash</remote-id>
+    <remote-id type="cpan-module">Tie::StrictHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-Sub/metadata.xml b/dev-perl/Tie-Sub/metadata.xml
index e8d084346290..4ab9dea543f4 100644
--- a/dev-perl/Tie-Sub/metadata.xml
+++ b/dev-perl/Tie-Sub/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Tie-Sub</remote-id>
+    <remote-id type="cpan-module">Tie::Sub</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tie-ToObject/metadata.xml b/dev-perl/Tie-ToObject/metadata.xml
index 10c499b7198d..54a857dfc90c 100644
--- a/dev-perl/Tie-ToObject/metadata.xml
+++ b/dev-perl/Tie-ToObject/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-ToObject</remote-id>
+    <remote-id type="cpan-module">Tie::ToObject</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Time-Duration-Parse/metadata.xml b/dev-perl/Time-Duration-Parse/metadata.xml
index 8951ed7d3667..15b36f866e93 100644
--- a/dev-perl/Time-Duration-Parse/metadata.xml
+++ b/dev-perl/Time-Duration-Parse/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Duration-Parse</remote-id>
+    <remote-id type="cpan-module">Time::Duration::Parse</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Time-Duration/metadata.xml b/dev-perl/Time-Duration/metadata.xml
index 986f320ac4d0..3227eacf79ce 100644
--- a/dev-perl/Time-Duration/metadata.xml
+++ b/dev-perl/Time-Duration/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Duration</remote-id>
+    <remote-id type="cpan-module">Time::Duration</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Time-Piece-MySQL/metadata.xml b/dev-perl/Time-Piece-MySQL/metadata.xml
index 6670796ac6a3..5d475a8b3421 100644
--- a/dev-perl/Time-Piece-MySQL/metadata.xml
+++ b/dev-perl/Time-Piece-MySQL/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Piece-MySQL</remote-id>
+    <remote-id type="cpan-module">Time::Piece</remote-id>
+    <remote-id type="cpan-module">Time::Piece::MySQL</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Time-TAI64/metadata.xml b/dev-perl/Time-TAI64/metadata.xml
index 868047c5f832..341be736f1c4 100644
--- a/dev-perl/Time-TAI64/metadata.xml
+++ b/dev-perl/Time-TAI64/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Time-TAI64</remote-id>
+    <remote-id type="cpan-module">Time::TAI64</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Time-modules/metadata.xml b/dev-perl/Time-modules/metadata.xml
index cc5cb1b475fc..283954addcf0 100644
--- a/dev-perl/Time-modules/metadata.xml
+++ b/dev-perl/Time-modules/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-modules</remote-id>
+    <remote-id type="cpan-module">Time::CTime</remote-id>
+    <remote-id type="cpan-module">Time::DaysInMonth</remote-id>
+    <remote-id type="cpan-module">Time::JulianDay</remote-id>
+    <remote-id type="cpan-module">Time::ParseDate</remote-id>
+    <remote-id type="cpan-module">Time::Timezone</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/TimeDate/metadata.xml b/dev-perl/TimeDate/metadata.xml
index 0869e867c2f1..efc102924b9a 100644
--- a/dev-perl/TimeDate/metadata.xml
+++ b/dev-perl/TimeDate/metadata.xml
@@ -4,5 +4,42 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">TimeDate</remote-id>
+    <remote-id type="cpan-module">Date::Format</remote-id>
+    <remote-id type="cpan-module">Date::Format::Generic</remote-id>
+    <remote-id type="cpan-module">Date::Language</remote-id>
+    <remote-id type="cpan-module">Date::Language::Afar</remote-id>
+    <remote-id type="cpan-module">Date::Language::Amharic</remote-id>
+    <remote-id type="cpan-module">Date::Language::Austrian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Brazilian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Chinese</remote-id>
+    <remote-id type="cpan-module">Date::Language::Chinese_GB</remote-id>
+    <remote-id type="cpan-module">Date::Language::Czech</remote-id>
+    <remote-id type="cpan-module">Date::Language::Danish</remote-id>
+    <remote-id type="cpan-module">Date::Language::Dutch</remote-id>
+    <remote-id type="cpan-module">Date::Language::English</remote-id>
+    <remote-id type="cpan-module">Date::Language::Finnish</remote-id>
+    <remote-id type="cpan-module">Date::Language::French</remote-id>
+    <remote-id type="cpan-module">Date::Language::Gedeo</remote-id>
+    <remote-id type="cpan-module">Date::Language::German</remote-id>
+    <remote-id type="cpan-module">Date::Language::Greek</remote-id>
+    <remote-id type="cpan-module">Date::Language::Hungarian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Icelandic</remote-id>
+    <remote-id type="cpan-module">Date::Language::Italian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Norwegian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Oromo</remote-id>
+    <remote-id type="cpan-module">Date::Language::Romanian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Russian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Russian_cp1251</remote-id>
+    <remote-id type="cpan-module">Date::Language::Russian_koi8r</remote-id>
+    <remote-id type="cpan-module">Date::Language::Sidama</remote-id>
+    <remote-id type="cpan-module">Date::Language::Somali</remote-id>
+    <remote-id type="cpan-module">Date::Language::Spanish</remote-id>
+    <remote-id type="cpan-module">Date::Language::Swedish</remote-id>
+    <remote-id type="cpan-module">Date::Language::Tigrinya</remote-id>
+    <remote-id type="cpan-module">Date::Language::TigrinyaEritrean</remote-id>
+    <remote-id type="cpan-module">Date::Language::TigrinyaEthiopian</remote-id>
+    <remote-id type="cpan-module">Date::Language::Turkish</remote-id>
+    <remote-id type="cpan-module">Date::Parse</remote-id>
+    <remote-id type="cpan-module">Time::Zone</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tk-CursorControl/metadata.xml b/dev-perl/Tk-CursorControl/metadata.xml
index 4e7fbc7e606c..365369fe1868 100644
--- a/dev-perl/Tk-CursorControl/metadata.xml
+++ b/dev-perl/Tk-CursorControl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tk-CursorControl</remote-id>
+    <remote-id type="cpan-module">Tk::CursorControl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tk-JPEG-Lite/metadata.xml b/dev-perl/Tk-JPEG-Lite/metadata.xml
index f74697ab5bec..945db46d9b70 100644
--- a/dev-perl/Tk-JPEG-Lite/metadata.xml
+++ b/dev-perl/Tk-JPEG-Lite/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tk-JPEG-Lite</remote-id>
+    <remote-id type="cpan-module">Tk::JPEG::Lite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tk-TableMatrix/metadata.xml b/dev-perl/Tk-TableMatrix/metadata.xml
index 0557081cf16d..8ad76deef2c1 100644
--- a/dev-perl/Tk-TableMatrix/metadata.xml
+++ b/dev-perl/Tk-TableMatrix/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tk-TableMatrix</remote-id>
+    <remote-id type="cpan-module">Tk::TableMatrix</remote-id>
+    <remote-id type="cpan-module">Tk::TableMatrix::Spreadsheet</remote-id>
+    <remote-id type="cpan-module">Tk::TableMatrix::SpreadsheetHideRows</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tree-DAG_Node/metadata.xml b/dev-perl/Tree-DAG_Node/metadata.xml
index 9c4110188348..49c8d281dcdf 100644
--- a/dev-perl/Tree-DAG_Node/metadata.xml
+++ b/dev-perl/Tree-DAG_Node/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tree-DAG_Node</remote-id>
+    <remote-id type="cpan-module">Tree::DAG_Node</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Tree-Simple/metadata.xml b/dev-perl/Tree-Simple/metadata.xml
index 57b4ac466439..5d5de123946f 100644
--- a/dev-perl/Tree-Simple/metadata.xml
+++ b/dev-perl/Tree-Simple/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tree-Simple</remote-id>
+    <remote-id type="cpan-module">Tree::Simple</remote-id>
+    <remote-id type="cpan-module">Tree::Simple::Visitor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Try-Tiny/metadata.xml b/dev-perl/Try-Tiny/metadata.xml
index e2b09e9ed842..67a411aa7a69 100644
--- a/dev-perl/Try-Tiny/metadata.xml
+++ b/dev-perl/Try-Tiny/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Try-Tiny</remote-id>
+    <remote-id type="cpan-module">Try::Tiny</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/UNIVERSAL-can/metadata.xml b/dev-perl/UNIVERSAL-can/metadata.xml
index c23b0df2bd32..153a7ac964bc 100644
--- a/dev-perl/UNIVERSAL-can/metadata.xml
+++ b/dev-perl/UNIVERSAL-can/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-can</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL::can</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/UNIVERSAL-isa/metadata.xml b/dev-perl/UNIVERSAL-isa/metadata.xml
index 70e04a938ff0..cb3325017a20 100644
--- a/dev-perl/UNIVERSAL-isa/metadata.xml
+++ b/dev-perl/UNIVERSAL-isa/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-isa</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL::isa</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/UNIVERSAL-moniker/metadata.xml b/dev-perl/UNIVERSAL-moniker/metadata.xml
index 82b7189d82a4..31a06e578e8a 100644
--- a/dev-perl/UNIVERSAL-moniker/metadata.xml
+++ b/dev-perl/UNIVERSAL-moniker/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-moniker</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL::moniker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/UNIVERSAL-require/metadata.xml b/dev-perl/UNIVERSAL-require/metadata.xml
index c4cf215c3eb6..22aee9aaeaa7 100644
--- a/dev-perl/UNIVERSAL-require/metadata.xml
+++ b/dev-perl/UNIVERSAL-require/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">UNIVERSAL-require</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL</remote-id>
+    <remote-id type="cpan-module">UNIVERSAL::require</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/URI-Fetch/metadata.xml b/dev-perl/URI-Fetch/metadata.xml
index 0f042dcf0450..f42dc7cbac91 100644
--- a/dev-perl/URI-Fetch/metadata.xml
+++ b/dev-perl/URI-Fetch/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">URI-Fetch</remote-id>
+    <remote-id type="cpan-module">URI::Fetch</remote-id>
+    <remote-id type="cpan-module">URI::Fetch::Response</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/URI-Find/metadata.xml b/dev-perl/URI-Find/metadata.xml
index e236c610698b..b357f5149633 100644
--- a/dev-perl/URI-Find/metadata.xml
+++ b/dev-perl/URI-Find/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">URI-Find</remote-id>
+    <remote-id type="cpan-module">URI::Find</remote-id>
+    <remote-id type="cpan-module">URI::Find::Schemeless</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/URI/metadata.xml b/dev-perl/URI/metadata.xml
index 6f997c13c6d2..d1083f8dcce8 100644
--- a/dev-perl/URI/metadata.xml
+++ b/dev-perl/URI/metadata.xml
@@ -4,5 +4,57 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">URI</remote-id>
+    <remote-id type="cpan-module">URI</remote-id>
+    <remote-id type="cpan-module">URI::Escape</remote-id>
+    <remote-id type="cpan-module">URI::Heuristic</remote-id>
+    <remote-id type="cpan-module">URI::IRI</remote-id>
+    <remote-id type="cpan-module">URI::QueryParam</remote-id>
+    <remote-id type="cpan-module">URI::Split</remote-id>
+    <remote-id type="cpan-module">URI::URL</remote-id>
+    <remote-id type="cpan-module">URI::WithBase</remote-id>
+    <remote-id type="cpan-module">URI::_foreign</remote-id>
+    <remote-id type="cpan-module">URI::_generic</remote-id>
+    <remote-id type="cpan-module">URI::_idna</remote-id>
+    <remote-id type="cpan-module">URI::_ldap</remote-id>
+    <remote-id type="cpan-module">URI::_login</remote-id>
+    <remote-id type="cpan-module">URI::_punycode</remote-id>
+    <remote-id type="cpan-module">URI::_query</remote-id>
+    <remote-id type="cpan-module">URI::_segment</remote-id>
+    <remote-id type="cpan-module">URI::_server</remote-id>
+    <remote-id type="cpan-module">URI::_userpass</remote-id>
+    <remote-id type="cpan-module">URI::data</remote-id>
+    <remote-id type="cpan-module">URI::file</remote-id>
+    <remote-id type="cpan-module">URI::file::Base</remote-id>
+    <remote-id type="cpan-module">URI::file::FAT</remote-id>
+    <remote-id type="cpan-module">URI::file::Mac</remote-id>
+    <remote-id type="cpan-module">URI::file::OS2</remote-id>
+    <remote-id type="cpan-module">URI::file::QNX</remote-id>
+    <remote-id type="cpan-module">URI::file::Unix</remote-id>
+    <remote-id type="cpan-module">URI::file::Win32</remote-id>
+    <remote-id type="cpan-module">URI::ftp</remote-id>
+    <remote-id type="cpan-module">URI::gopher</remote-id>
+    <remote-id type="cpan-module">URI::http</remote-id>
+    <remote-id type="cpan-module">URI::https</remote-id>
+    <remote-id type="cpan-module">URI::ldap</remote-id>
+    <remote-id type="cpan-module">URI::ldapi</remote-id>
+    <remote-id type="cpan-module">URI::ldaps</remote-id>
+    <remote-id type="cpan-module">URI::mailto</remote-id>
+    <remote-id type="cpan-module">URI::mms</remote-id>
+    <remote-id type="cpan-module">URI::news</remote-id>
+    <remote-id type="cpan-module">URI::nntp</remote-id>
+    <remote-id type="cpan-module">URI::pop</remote-id>
+    <remote-id type="cpan-module">URI::rlogin</remote-id>
+    <remote-id type="cpan-module">URI::rsync</remote-id>
+    <remote-id type="cpan-module">URI::rtsp</remote-id>
+    <remote-id type="cpan-module">URI::rtspu</remote-id>
+    <remote-id type="cpan-module">URI::sip</remote-id>
+    <remote-id type="cpan-module">URI::sips</remote-id>
+    <remote-id type="cpan-module">URI::snews</remote-id>
+    <remote-id type="cpan-module">URI::ssh</remote-id>
+    <remote-id type="cpan-module">URI::telnet</remote-id>
+    <remote-id type="cpan-module">URI::tn3270</remote-id>
+    <remote-id type="cpan-module">URI::urn</remote-id>
+    <remote-id type="cpan-module">URI::urn::isbn</remote-id>
+    <remote-id type="cpan-module">URI::urn::oid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/UltraDNS/metadata.xml b/dev-perl/UltraDNS/metadata.xml
index 98e83ce81b0a..5a63fdf3aafb 100644
--- a/dev-perl/UltraDNS/metadata.xml
+++ b/dev-perl/UltraDNS/metadata.xml
@@ -8,5 +8,9 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">UltraDNS</remote-id>
+    <remote-id type="cpan-module">UltraDNS</remote-id>
+    <remote-id type="cpan-module">UltraDNS::Methods</remote-id>
+    <remote-id type="cpan-module">UltraDNS::Parser</remote-id>
+    <remote-id type="cpan-module">UltraDNS::Type</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-EastAsianWidth/metadata.xml b/dev-perl/Unicode-EastAsianWidth/metadata.xml
index 230919b161b2..391331998c1c 100644
--- a/dev-perl/Unicode-EastAsianWidth/metadata.xml
+++ b/dev-perl/Unicode-EastAsianWidth/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Unicode-EastAsianWidth</remote-id>
+		<remote-id type="cpan-module">Unicode::EastAsianWidth</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-Map/metadata.xml b/dev-perl/Unicode-Map/metadata.xml
index a8b2231af983..7bebb90e67ac 100644
--- a/dev-perl/Unicode-Map/metadata.xml
+++ b/dev-perl/Unicode-Map/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unicode-Map</remote-id>
+    <remote-id type="cpan-module">Unicode::Map</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-Map8/metadata.xml b/dev-perl/Unicode-Map8/metadata.xml
index c46b10d1593a..5bde22b80aba 100644
--- a/dev-perl/Unicode-Map8/metadata.xml
+++ b/dev-perl/Unicode-Map8/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unicode-Map8</remote-id>
+    <remote-id type="cpan-module">Unicode::Map8</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-MapUTF8/metadata.xml b/dev-perl/Unicode-MapUTF8/metadata.xml
index ae49b70700c3..9bd2eebde818 100644
--- a/dev-perl/Unicode-MapUTF8/metadata.xml
+++ b/dev-perl/Unicode-MapUTF8/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unicode-MapUTF8</remote-id>
+    <remote-id type="cpan-module">Unicode::MapUTF8</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-String/metadata.xml b/dev-perl/Unicode-String/metadata.xml
index c37cb8e11560..bbf9e1cf03fc 100644
--- a/dev-perl/Unicode-String/metadata.xml
+++ b/dev-perl/Unicode-String/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unicode-String</remote-id>
+    <remote-id type="cpan-module">Unicode::CharName</remote-id>
+    <remote-id type="cpan-module">Unicode::String</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unicode-UTF8simple/metadata.xml b/dev-perl/Unicode-UTF8simple/metadata.xml
index 58f20c0bf53b..712c74eb60a1 100644
--- a/dev-perl/Unicode-UTF8simple/metadata.xml
+++ b/dev-perl/Unicode-UTF8simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unicode-UTF8simple</remote-id>
+    <remote-id type="cpan-module">Unicode::UTF8simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Unix-Syslog/metadata.xml b/dev-perl/Unix-Syslog/metadata.xml
index 681fdbc0bc97..a7e636b25848 100644
--- a/dev-perl/Unix-Syslog/metadata.xml
+++ b/dev-perl/Unix-Syslog/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Unix-Syslog</remote-id>
+    <remote-id type="cpan-module">Unix::Syslog</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/User-Identity/metadata.xml b/dev-perl/User-Identity/metadata.xml
index 7da2de105df5..d454eef3afc6 100644
--- a/dev-perl/User-Identity/metadata.xml
+++ b/dev-perl/User-Identity/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">User-Identity</remote-id>
+    <remote-id type="cpan-module">Mail::Identity</remote-id>
+    <remote-id type="cpan-module">User::Identity</remote-id>
+    <remote-id type="cpan-module">User::Identity::Archive</remote-id>
+    <remote-id type="cpan-module">User::Identity::Archive::Plain</remote-id>
+    <remote-id type="cpan-module">User::Identity::Collection</remote-id>
+    <remote-id type="cpan-module">User::Identity::Collection::Emails</remote-id>
+    <remote-id type="cpan-module">User::Identity::Collection::Locations</remote-id>
+    <remote-id type="cpan-module">User::Identity::Collection::Systems</remote-id>
+    <remote-id type="cpan-module">User::Identity::Collection::Users</remote-id>
+    <remote-id type="cpan-module">User::Identity::Item</remote-id>
+    <remote-id type="cpan-module">User::Identity::Location</remote-id>
+    <remote-id type="cpan-module">User::Identity::System</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Validate-Net/metadata.xml b/dev-perl/Validate-Net/metadata.xml
index a768bceee286..6f30fc3807f7 100644
--- a/dev-perl/Validate-Net/metadata.xml
+++ b/dev-perl/Validate-Net/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Validate-Net</remote-id>
+    <remote-id type="cpan-module">Validate::Net</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Variable-Magic/metadata.xml b/dev-perl/Variable-Magic/metadata.xml
index d14ea8d28766..a35a0bcc6c7e 100644
--- a/dev-perl/Variable-Magic/metadata.xml
+++ b/dev-perl/Variable-Magic/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Variable-Magic</remote-id>
+    <remote-id type="cpan-module">Variable::Magic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Video-Frequencies/metadata.xml b/dev-perl/Video-Frequencies/metadata.xml
index dcdc1827e2ab..cd672cd43c5f 100644
--- a/dev-perl/Video-Frequencies/metadata.xml
+++ b/dev-perl/Video-Frequencies/metadata.xml
@@ -6,7 +6,4 @@
     Driver for ivtv based tv tuner cards, currently supports Hauppauge 
     PVR-[23]50 cards
   </longdescription>
-  <upstream>
-    <remote-id type="cpan">Video-Frequencies</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Video-ivtv/metadata.xml b/dev-perl/Video-ivtv/metadata.xml
index 5442a4632d88..cd672cd43c5f 100644
--- a/dev-perl/Video-ivtv/metadata.xml
+++ b/dev-perl/Video-ivtv/metadata.xml
@@ -6,7 +6,4 @@
     Driver for ivtv based tv tuner cards, currently supports Hauppauge 
     PVR-[23]50 cards
   </longdescription>
-  <upstream>
-    <remote-id type="cpan">Video-ivtv</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Bugzilla/metadata.xml b/dev-perl/WWW-Bugzilla/metadata.xml
index 3cd027230590..db2566abd627 100644
--- a/dev-perl/WWW-Bugzilla/metadata.xml
+++ b/dev-perl/WWW-Bugzilla/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WWW-Bugzilla</remote-id>
+    <remote-id type="cpan-module">WWW::Bugzilla</remote-id>
+    <remote-id type="cpan-module">WWW::Bugzilla::Search</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Curl/metadata.xml b/dev-perl/WWW-Curl/metadata.xml
index a67eaaaa02f5..f549aa0f6cf9 100644
--- a/dev-perl/WWW-Curl/metadata.xml
+++ b/dev-perl/WWW-Curl/metadata.xml
@@ -8,5 +8,10 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Curl</remote-id>
+    <remote-id type="cpan-module">WWW::Curl</remote-id>
+    <remote-id type="cpan-module">WWW::Curl::Easy</remote-id>
+    <remote-id type="cpan-module">WWW::Curl::Form</remote-id>
+    <remote-id type="cpan-module">WWW::Curl::Multi</remote-id>
+    <remote-id type="cpan-module">WWW::Curl::Share</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Dict-Leo-Org/metadata.xml b/dev-perl/WWW-Dict-Leo-Org/metadata.xml
index ec71ba8e498c..451033bbe45f 100644
--- a/dev-perl/WWW-Dict-Leo-Org/metadata.xml
+++ b/dev-perl/WWW-Dict-Leo-Org/metadata.xml
@@ -7,5 +7,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WWW-Dict-Leo-Org</remote-id>
+    <remote-id type="cpan-module">WWW::Dict::Leo::Org</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Mechanize-FormFiller/metadata.xml b/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
index 8943b5475b46..69da96601d3d 100644
--- a/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
+++ b/dev-perl/WWW-Mechanize-FormFiller/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WWW-Mechanize-FormFiller</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Callback</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Default</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Fixed</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Interactive</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Keep</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Random</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Random::Chars</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Random::Date</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::FormFiller::Value::Random::Word</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Mechanize/metadata.xml b/dev-perl/WWW-Mechanize/metadata.xml
index 78e7f4b0fb92..17512f8cc2bc 100644
--- a/dev-perl/WWW-Mechanize/metadata.xml
+++ b/dev-perl/WWW-Mechanize/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WWW-Mechanize</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::Image</remote-id>
+    <remote-id type="cpan-module">WWW::Mechanize::Link</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml b/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
index 940d1bbe7ff6..21eee839af1d 100644
--- a/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
+++ b/dev-perl/WWW-Pastebin-PastebinCom-Create/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">WWW-Pastebin-PastebinCom-Create</remote-id>
+    <remote-id type="cpan-module">WWW::Pastebin::PastebinCom::Create</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-RobotRules/metadata.xml b/dev-perl/WWW-RobotRules/metadata.xml
index 128d240ac0b0..8c8f3a8afb95 100644
--- a/dev-perl/WWW-RobotRules/metadata.xml
+++ b/dev-perl/WWW-RobotRules/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">WWW-RobotRules</remote-id>
+		<remote-id type="cpan-module">WWW::RobotRules</remote-id>
+		<remote-id type="cpan-module">WWW::RobotRules::AnyDBM_File</remote-id>
+		<remote-id type="cpan-module">WWW::RobotRules::InCore</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/WWW-Shorten/metadata.xml b/dev-perl/WWW-Shorten/metadata.xml
index 053f9754ed26..129acc31b424 100644
--- a/dev-perl/WWW-Shorten/metadata.xml
+++ b/dev-perl/WWW-Shorten/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WWW-Shorten</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::LinkToolbot</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::Linkz</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::MakeAShorterLink</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::Metamark</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::TinyClick</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::TinyURL</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::UserAgent</remote-id>
+    <remote-id type="cpan-module">WWW::Shorten::generic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Want/metadata.xml b/dev-perl/Want/metadata.xml
index 515a77bceb4a..bed059b4f105 100644
--- a/dev-perl/Want/metadata.xml
+++ b/dev-perl/Want/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Want</remote-id>
+    <remote-id type="cpan-module">Want</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WeakRef/metadata.xml b/dev-perl/WeakRef/metadata.xml
index a33db3502b6d..8eb19a802f80 100644
--- a/dev-perl/WeakRef/metadata.xml
+++ b/dev-perl/WeakRef/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WeakRef</remote-id>
+    <remote-id type="cpan-module">WeakRef</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/WebService-MusicBrainz/metadata.xml b/dev-perl/WebService-MusicBrainz/metadata.xml
index 2b280bb2483c..0c2dea5683d6 100644
--- a/dev-perl/WebService-MusicBrainz/metadata.xml
+++ b/dev-perl/WebService-MusicBrainz/metadata.xml
@@ -3,4 +3,44 @@
 <pkgmetadata>
 <herd>perl</herd>
 <herd>sound</herd>
+<upstream>
+<remote-id type="cpan">WebService-MusicBrainz</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Artist</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Label</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Query</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Release</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::ReleaseGroup</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Alias</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::AliasList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Artist</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ArtistList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Disc</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::DiscList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ISRC</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ISRCList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Label</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::LabelList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Metadata</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Puid</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::PuidList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Rating</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Relation</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::RelationList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Release</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ReleaseEvent</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ReleaseEventList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ReleaseGroup</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ReleaseGroupList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::ReleaseList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Tag</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::TagList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::Track</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::TrackList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::UserRating</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::UserTag</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Response::UserTagList</remote-id>
+<remote-id type="cpan-module">WebService::MusicBrainz::Track</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-perl/WordNet-QueryData/metadata.xml b/dev-perl/WordNet-QueryData/metadata.xml
index 6cb8ac8e01c8..8c89c88f0bec 100644
--- a/dev-perl/WordNet-QueryData/metadata.xml
+++ b/dev-perl/WordNet-QueryData/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">WordNet-QueryData</remote-id>
+    <remote-id type="cpan-module">WordNet::QueryData</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Wx-Perl-ProcessStream/metadata.xml b/dev-perl/Wx-Perl-ProcessStream/metadata.xml
index c7cdf17244f6..35424c808b1f 100644
--- a/dev-perl/Wx-Perl-ProcessStream/metadata.xml
+++ b/dev-perl/Wx-Perl-ProcessStream/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Wx-Perl-ProcessStream</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::ProcessStream</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::ProcessStream::ProcEvtHandler</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::ProcessStream::Process</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::ProcessStream::ProcessEvent</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::ProcessStream::ProcessHandler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Wx-Scintilla/metadata.xml b/dev-perl/Wx-Scintilla/metadata.xml
index 5fc50fdb0c09..3a18679c453f 100644
--- a/dev-perl/Wx-Scintilla/metadata.xml
+++ b/dev-perl/Wx-Scintilla/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Wx-Scintilla</remote-id>
+    <remote-id type="cpan-module">Wx::Scintilla</remote-id>
+    <remote-id type="cpan-module">Wx::Scintilla::Constant</remote-id>
+    <remote-id type="cpan-module">Wx::Scintilla::TextCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::Scintilla::TextEvent</remote-id>
+    <remote-id type="cpan-module">Wx::ScintillaTextCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::ScintillaTextEvent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/X-Osd/metadata.xml b/dev-perl/X-Osd/metadata.xml
index 2cbc0e4f25be..6ac0ed9ab3ad 100644
--- a/dev-perl/X-Osd/metadata.xml
+++ b/dev-perl/X-Osd/metadata.xml
@@ -5,5 +5,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">X-Osd</remote-id>
+    <remote-id type="cpan-module">X::Osd</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml b/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
index 7fb20c9e7ef7..fb6cfb4f41b6 100644
--- a/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
+++ b/dev-perl/X11-FreeDesktop-DesktopEntry/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">X11-FreeDesktop-DesktopEntry</remote-id>
+    <remote-id type="cpan-module">X11::FreeDesktop::DesktopEntry</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/X11-Protocol/metadata.xml b/dev-perl/X11-Protocol/metadata.xml
index 76861fcee673..b3368e11c13f 100644
--- a/dev-perl/X11-Protocol/metadata.xml
+++ b/dev-perl/X11-Protocol/metadata.xml
@@ -4,5 +4,22 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">X11-Protocol</remote-id>
+    <remote-id type="cpan-module">X11::Auth</remote-id>
+    <remote-id type="cpan-module">X11::Keysyms</remote-id>
+    <remote-id type="cpan-module">X11::Protocol</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::FileHandle</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::INETFH</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::INETSocket</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::Socket</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::UNIXFH</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Connection::UNIXSocket</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Constants</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::BIG_REQUESTS</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::DPMS</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::RENDER</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::SHAPE</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::XC_MISC</remote-id>
+    <remote-id type="cpan-module">X11::Protocol::Ext::XFree86_Misc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/X500-DN/metadata.xml b/dev-perl/X500-DN/metadata.xml
index a5cd2b915183..9b37e180a659 100644
--- a/dev-perl/X500-DN/metadata.xml
+++ b/dev-perl/X500-DN/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">X500-DN</remote-id>
+    <remote-id type="cpan-module">X500::DN</remote-id>
+    <remote-id type="cpan-module">X500::RDN</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Atom/metadata.xml b/dev-perl/XML-Atom/metadata.xml
index 9db22520788b..36dff68033dc 100644
--- a/dev-perl/XML-Atom/metadata.xml
+++ b/dev-perl/XML-Atom/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Atom</remote-id>
+    <remote-id type="cpan-module">LWP::UserAgent::AtomClient</remote-id>
+    <remote-id type="cpan-module">XML::Atom</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Base</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Category</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Client</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Content</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Entry</remote-id>
+    <remote-id type="cpan-module">XML::Atom::ErrorHandler</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Feed</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Link</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Person</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Server</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Thing</remote-id>
+    <remote-id type="cpan-module">XML::Atom::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-AutoWriter/metadata.xml b/dev-perl/XML-AutoWriter/metadata.xml
index b7ebed34ca1e..a604be022bd4 100644
--- a/dev-perl/XML-AutoWriter/metadata.xml
+++ b/dev-perl/XML-AutoWriter/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-AutoWriter</remote-id>
+    <remote-id type="cpan-module">XML::AutoWriter</remote-id>
+    <remote-id type="cpan-module">XML::Doctype</remote-id>
+    <remote-id type="cpan-module">XML::Doctype::AttDef</remote-id>
+    <remote-id type="cpan-module">XML::Doctype::ElementDecl</remote-id>
+    <remote-id type="cpan-module">XML::VWElement</remote-id>
+    <remote-id type="cpan-module">XML::ValidWriter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Catalog/metadata.xml b/dev-perl/XML-Catalog/metadata.xml
index 76330cecf0b2..d2b8f4a5dd52 100644
--- a/dev-perl/XML-Catalog/metadata.xml
+++ b/dev-perl/XML-Catalog/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Catalog</remote-id>
+    <remote-id type="cpan-module">XML::Catalog</remote-id>
+    <remote-id type="cpan-module">XML::Catalog::XML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-CompactTree-XS/metadata.xml b/dev-perl/XML-CompactTree-XS/metadata.xml
index 8a7b2fe38984..30274dc17f56 100644
--- a/dev-perl/XML-CompactTree-XS/metadata.xml
+++ b/dev-perl/XML-CompactTree-XS/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">XML-CompactTree-XS</remote-id>
+    <remote-id type="cpan-module">XML::CompactTree::XS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-DOM-XPath/metadata.xml b/dev-perl/XML-DOM-XPath/metadata.xml
index 7f7f632f1afd..adbaef133c1a 100644
--- a/dev-perl/XML-DOM-XPath/metadata.xml
+++ b/dev-perl/XML-DOM-XPath/metadata.xml
@@ -9,5 +9,14 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">XML-DOM-XPath</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Attr</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Comment</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Document</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Element</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Node</remote-id>
+    <remote-id type="cpan-module">XML::DOM::ProcessingInstruction</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Text</remote-id>
+    <remote-id type="cpan-module">XML::DOM::XPath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-DOM/metadata.xml b/dev-perl/XML-DOM/metadata.xml
index faee228961e1..f9605ded5f81 100644
--- a/dev-perl/XML-DOM/metadata.xml
+++ b/dev-perl/XML-DOM/metadata.xml
@@ -4,5 +4,30 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-DOM</remote-id>
+    <remote-id type="cpan-module">XML::DOM</remote-id>
+    <remote-id type="cpan-module">XML::DOM::AttDef</remote-id>
+    <remote-id type="cpan-module">XML::DOM::AttlistDecl</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Attr</remote-id>
+    <remote-id type="cpan-module">XML::DOM::CDATASection</remote-id>
+    <remote-id type="cpan-module">XML::DOM::CharacterData</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Comment</remote-id>
+    <remote-id type="cpan-module">XML::DOM::DOMImplementation</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Document</remote-id>
+    <remote-id type="cpan-module">XML::DOM::DocumentFragment</remote-id>
+    <remote-id type="cpan-module">XML::DOM::DocumentType</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Element</remote-id>
+    <remote-id type="cpan-module">XML::DOM::ElementDecl</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Entity</remote-id>
+    <remote-id type="cpan-module">XML::DOM::EntityReference</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Node</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Notation</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Parser</remote-id>
+    <remote-id type="cpan-module">XML::DOM::PrintToFileHandle</remote-id>
+    <remote-id type="cpan-module">XML::DOM::PrintToString</remote-id>
+    <remote-id type="cpan-module">XML::DOM::ProcessingInstruction</remote-id>
+    <remote-id type="cpan-module">XML::DOM::Text</remote-id>
+    <remote-id type="cpan-module">XML::DOM::XMLDecl</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Dom</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Node</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-DT/metadata.xml b/dev-perl/XML-DT/metadata.xml
index ead707962128..71d0ed6d0f91 100644
--- a/dev-perl/XML-DT/metadata.xml
+++ b/dev-perl/XML-DT/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-DT</remote-id>
+    <remote-id type="cpan-module">XML::DT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-DTDParser/metadata.xml b/dev-perl/XML-DTDParser/metadata.xml
index c19dc7143312..1b11dd4ac12e 100644
--- a/dev-perl/XML-DTDParser/metadata.xml
+++ b/dev-perl/XML-DTDParser/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-DTDParser</remote-id>
+    <remote-id type="cpan-module">XML::DTDParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Dumper/metadata.xml b/dev-perl/XML-Dumper/metadata.xml
index 2764f0a3b607..0c3c74d22337 100644
--- a/dev-perl/XML-Dumper/metadata.xml
+++ b/dev-perl/XML-Dumper/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Dumper</remote-id>
+    <remote-id type="cpan-module">XML::Dumper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Elemental/metadata.xml b/dev-perl/XML-Elemental/metadata.xml
index 075ec1b07de7..5af787e06fdb 100644
--- a/dev-perl/XML-Elemental/metadata.xml
+++ b/dev-perl/XML-Elemental/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Elemental</remote-id>
+    <remote-id type="cpan-module">XML::Elemental</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::Characters</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::Document</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::Element</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::Node</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::SAXHandler</remote-id>
+    <remote-id type="cpan-module">XML::Elemental::Util</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Elemental</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Encoding/metadata.xml b/dev-perl/XML-Encoding/metadata.xml
index d862cc36f5b1..ab888e63f395 100644
--- a/dev-perl/XML-Encoding/metadata.xml
+++ b/dev-perl/XML-Encoding/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Encoding</remote-id>
+    <remote-id type="cpan-module">XML::Encoding</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Fast/metadata.xml b/dev-perl/XML-Fast/metadata.xml
index 318bd0f13185..3a77dc7c4e4e 100644
--- a/dev-perl/XML-Fast/metadata.xml
+++ b/dev-perl/XML-Fast/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Fast</remote-id>
+    <remote-id type="cpan-module">XML::Fast</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Feed/metadata.xml b/dev-perl/XML-Feed/metadata.xml
index 997052caea83..3381d692eb98 100644
--- a/dev-perl/XML-Feed/metadata.xml
+++ b/dev-perl/XML-Feed/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Feed</remote-id>
+    <remote-id type="cpan-module">XML::Feed</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Content</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Enclosure</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Entry</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Entry::Format::Atom</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Entry::Format::RSS</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Format::Atom</remote-id>
+    <remote-id type="cpan-module">XML::Feed::Format::RSS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Filter-BufferText/metadata.xml b/dev-perl/XML-Filter-BufferText/metadata.xml
index a72a8a117f0b..6d3c9b77b859 100644
--- a/dev-perl/XML-Filter-BufferText/metadata.xml
+++ b/dev-perl/XML-Filter-BufferText/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Filter-BufferText</remote-id>
+    <remote-id type="cpan-module">XML::Filter::BufferText</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml b/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
index 2a009531ce1a..91141e2898dc 100644
--- a/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
+++ b/dev-perl/XML-Filter-DOMFilter-LibXML/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Filter-DOMFilter-LibXML</remote-id>
+    <remote-id type="cpan-module">XML::Filter::DOMFilter::LibXML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-GDOME/metadata.xml b/dev-perl/XML-GDOME/metadata.xml
index a9952023720b..fe2646b51e5f 100644
--- a/dev-perl/XML-GDOME/metadata.xml
+++ b/dev-perl/XML-GDOME/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-GDOME</remote-id>
+    <remote-id type="cpan-module">XML::GDOME</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::Document</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::Element</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::Node</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::SAX::AttributeNode</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::SAX::Builder</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::SAX::Generator</remote-id>
+    <remote-id type="cpan-module">XML::GDOME::SAX::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Generator/metadata.xml b/dev-perl/XML-Generator/metadata.xml
index 3c73ff8a65b1..e36e724f2060 100644
--- a/dev-perl/XML-Generator/metadata.xml
+++ b/dev-perl/XML-Generator/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Generator</remote-id>
+    <remote-id type="cpan-module">XML::Generator</remote-id>
+    <remote-id type="cpan-module">XML::Generator::DOM</remote-id>
+    <remote-id type="cpan-module">XML::Generator::DOM::util</remote-id>
+    <remote-id type="cpan-module">XML::Generator::cdata</remote-id>
+    <remote-id type="cpan-module">XML::Generator::comment</remote-id>
+    <remote-id type="cpan-module">XML::Generator::final</remote-id>
+    <remote-id type="cpan-module">XML::Generator::overload</remote-id>
+    <remote-id type="cpan-module">XML::Generator::pi</remote-id>
+    <remote-id type="cpan-module">XML::Generator::pretty</remote-id>
+    <remote-id type="cpan-module">XML::Generator::util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Grove/metadata.xml b/dev-perl/XML-Grove/metadata.xml
index 4c516da0ea8f..fd88ad2dc2d4 100644
--- a/dev-perl/XML-Grove/metadata.xml
+++ b/dev-perl/XML-Grove/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Grove</remote-id>
+    <remote-id type="cpan-module">XML::Grove</remote-id>
+    <remote-id type="cpan-module">XML::Grove::AsCanonXML</remote-id>
+    <remote-id type="cpan-module">XML::Grove::AsString</remote-id>
+    <remote-id type="cpan-module">XML::Grove::AttListDecl</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Builder</remote-id>
+    <remote-id type="cpan-module">XML::Grove::CData</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Characters</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Comment</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Document</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Element</remote-id>
+    <remote-id type="cpan-module">XML::Grove::ElementDecl</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Entity</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Entity::External</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Entity::SGML</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Entity::SubDoc</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Factory</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Factory_</remote-id>
+    <remote-id type="cpan-module">XML::Grove::IDs</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Notation</remote-id>
+    <remote-id type="cpan-module">XML::Grove::PI</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Path</remote-id>
+    <remote-id type="cpan-module">XML::Grove::PerlSAX</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Sub</remote-id>
+    <remote-id type="cpan-module">XML::Grove::SubDoc</remote-id>
+    <remote-id type="cpan-module">XML::Grove::Subst</remote-id>
+    <remote-id type="cpan-module">XML::Grove::XPointer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Handler-YAWriter/metadata.xml b/dev-perl/XML-Handler-YAWriter/metadata.xml
index 79aaf9b10d03..a704223da5bf 100644
--- a/dev-perl/XML-Handler-YAWriter/metadata.xml
+++ b/dev-perl/XML-Handler-YAWriter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Handler-YAWriter</remote-id>
+    <remote-id type="cpan-module">XML::Handler::YAWriter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-LibXML-Iterator/metadata.xml b/dev-perl/XML-LibXML-Iterator/metadata.xml
index 2435dc99a7c4..31706fdd9acd 100644
--- a/dev-perl/XML-LibXML-Iterator/metadata.xml
+++ b/dev-perl/XML-LibXML-Iterator/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-LibXML-Iterator</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Iterator</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::NodeList::Iterator</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-LibXML-Simple/metadata.xml b/dev-perl/XML-LibXML-Simple/metadata.xml
index b945ce804034..e677b06e9b64 100644
--- a/dev-perl/XML-LibXML-Simple/metadata.xml
+++ b/dev-perl/XML-LibXML-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-LibXML-Simple</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index a3c7dae2e1d4..4637ed7fe827 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -4,3 +4,4 @@ DIST XML-LibXML-1.96.tar.gz 441094 RMD160 e130fce12809046b939006587c8565f0f28b2b
 DIST XML-LibXML-1.97.tar.gz 441572 RMD160 6adadd6523393b6994fe64d606fe057dc2d710a6 SHA1 1b9afa42ee35aec72f7715db960e71c41d302b6e SHA256 043d2deb952b018a7b6398c470054ce4d76b125de0a684eff27009dfaaac6914
 DIST XML-LibXML-1.98.tar.gz 441894 RMD160 6ad7f72bf32b1bd04b4f3c3bc1bc81c162a39f87 SHA1 3bfbf154645b2f5be861989ee447ecaf2d4fcc10 SHA256 6f2cbfdaa7b626bb356f3b6f9b0fc9e6dcc3fed91cbdb0bebec2319245ab6ad9
 DIST XML-LibXML-1.99.tar.gz 443263 RMD160 c43b0eb5245992b346dcfa5d8d78edece7bb4459 SHA1 7302f1b74270aec251e642220276abb2c96d318d SHA256 05f21424346d658c8a642ef6b91db9fca41a3f57be4bf38fee4af1d099e55c8e
+DIST XML-LibXML-2.0001.tar.gz 444112 RMD160 f44dd3f8fdb7cb8b23f5c23020c3ab7100514c2a SHA1 c46c77c21012013a0d8ac84d72a0fea6dcde1548 SHA256 a627f0b7443bb178cdbd4795f1f57467f89d16c781b3c28253df87512276a4ff
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.0.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.0.100.ebuild
new file mode 100644
index 000000000000..d0aafb6ce31d
--- /dev/null
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.0.100.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-2.0.100.ebuild,v 1.1 2012/06/24 15:43:37 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=2.0001
+inherit perl-module
+
+DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/XML-SAX-0.120.0
+	>=dev-libs/libxml2-2.6.21
+	>=dev-perl/XML-NamespaceSupport-1.70.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST="do"
+
+# rac can't discern any difference between the build with or without
+# this, and if somebody wants to reactivate it, get it out of global
+# scope.
+#export PERL5LIB=`perl -e 'print map { ":$ENV{D}/$_" } @INC'`
+mytargets="pure_install doc_install"
+
+src_compile() {
+	export SKIP_SAX_INSTALL=1
+	perl-module_src_compile
+}
+
+pkg_postinst() {
+	pkg_update_parser add XML::LibXML::SAX::Parser
+	pkg_update_parser add XML::LibXML::SAX
+}
+
+pkg_postrm() {
+	pkg_update_parser remove XML::LibXML::SAX::Parser
+	pkg_update_parser remove XML::LibXML::SAX
+}
+
+pkg_update_parser() {
+	# pkg_update_parser [add|remove] $parser_module
+	local action=$1
+	local parser_module=$2
+
+	if [[ "$ROOT" = "/" ]] ; then
+		einfo "Update Parser: $1 $2"
+		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
+			|| ewarn "Update Parser: $1 $2 failed"
+	else
+		elog "To $1 $2 run:"
+		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
+	fi
+}
diff --git a/dev-perl/XML-LibXML/metadata.xml b/dev-perl/XML-LibXML/metadata.xml
index 010e339a6fc0..e4232c704e27 100644
--- a/dev-perl/XML-LibXML/metadata.xml
+++ b/dev-perl/XML-LibXML/metadata.xml
@@ -4,5 +4,41 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-LibXML</remote-id>
+    <remote-id type="cpan-module">XML::LibXML</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Attr</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::AttributeHash</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Boolean</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::CDATASection</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Comment</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Common</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Devel</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Document</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::DocumentFragment</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Dtd</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Element</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::ErrNo</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Error</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::InputCallback</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Literal</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::NamedNodeMap</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Node</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::NodeList</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Number</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::PI</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Pattern</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Reader</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::RegExp</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::RelaxNG</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::SAX</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::SAX::AttributeNode</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::SAX::Builder</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::SAX::Generator</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::SAX::Parser</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Schema</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::Text</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::XPathContext</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::XPathExpression</remote-id>
+    <remote-id type="cpan-module">XML::LibXML::_SAXParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-LibXSLT/metadata.xml b/dev-perl/XML-LibXSLT/metadata.xml
index 7e0dc281f93e..c753b08f55f5 100644
--- a/dev-perl/XML-LibXSLT/metadata.xml
+++ b/dev-perl/XML-LibXSLT/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-LibXSLT</remote-id>
+    <remote-id type="cpan-module">Driver::BaseClass</remote-id>
+    <remote-id type="cpan-module">Driver::LibXSLT</remote-id>
+    <remote-id type="cpan-module">Driver::Sablotron</remote-id>
+    <remote-id type="cpan-module">Driver::Sablotron::Handler</remote-id>
+    <remote-id type="cpan-module">XML::LibXSLT</remote-id>
+    <remote-id type="cpan-module">XML::LibXSLT::Security</remote-id>
+    <remote-id type="cpan-module">XML::LibXSLT::StylesheetWrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Mini/metadata.xml b/dev-perl/XML-Mini/metadata.xml
index 0492c9e3e495..4ca41f9e143e 100644
--- a/dev-perl/XML-Mini/metadata.xml
+++ b/dev-perl/XML-Mini/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Mini</remote-id>
+    <remote-id type="cpan-module">XML::Mini</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Document</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element::CData</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element::Comment</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element::DocType</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element::Entity</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Element::Header</remote-id>
+    <remote-id type="cpan-module">XML::Mini::Node</remote-id>
+    <remote-id type="cpan-module">XML::Mini::TreeComponent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-NamespaceSupport/metadata.xml b/dev-perl/XML-NamespaceSupport/metadata.xml
index b3a705a42e58..1e3c5115fd46 100644
--- a/dev-perl/XML-NamespaceSupport/metadata.xml
+++ b/dev-perl/XML-NamespaceSupport/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-NamespaceSupport</remote-id>
+    <remote-id type="cpan-module">XML::NamespaceSupport</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-NodeFilter/metadata.xml b/dev-perl/XML-NodeFilter/metadata.xml
index 3d9e0305cb03..0df290afe025 100644
--- a/dev-perl/XML-NodeFilter/metadata.xml
+++ b/dev-perl/XML-NodeFilter/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-NodeFilter</remote-id>
+    <remote-id type="cpan-module">XML::NodeFilter</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Parser/metadata.xml b/dev-perl/XML-Parser/metadata.xml
index 1ec03d33d014..c867a87635c1 100644
--- a/dev-perl/XML-Parser/metadata.xml
+++ b/dev-perl/XML-Parser/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Parser</remote-id>
+    <remote-id type="cpan-module">XML::Parser</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Expat</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Debug</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Objects</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Stream</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Subs</remote-id>
+    <remote-id type="cpan-module">XML::Parser::Style::Tree</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-RAI/metadata.xml b/dev-perl/XML-RAI/metadata.xml
index 932a2afe8596..61f38fb044ba 100644
--- a/dev-perl/XML-RAI/metadata.xml
+++ b/dev-perl/XML-RAI/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-RAI</remote-id>
+    <remote-id type="cpan-module">XML::RAI</remote-id>
+    <remote-id type="cpan-module">XML::RAI::Channel</remote-id>
+    <remote-id type="cpan-module">XML::RAI::Image</remote-id>
+    <remote-id type="cpan-module">XML::RAI::Item</remote-id>
+    <remote-id type="cpan-module">XML::RAI::Object</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-RSS-Feed/metadata.xml b/dev-perl/XML-RSS-Feed/metadata.xml
index 85da8f68f2b5..c6df7b4a746e 100644
--- a/dev-perl/XML-RSS-Feed/metadata.xml
+++ b/dev-perl/XML-RSS-Feed/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-RSS-Feed</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Feed</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Headline</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Headline::Fark</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Headline::PerlJobs</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Headline::UsePerlJournals</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-RSS-Parser/metadata.xml b/dev-perl/XML-RSS-Parser/metadata.xml
index f82f38710c2a..e84028f7b09d 100644
--- a/dev-perl/XML-RSS-Parser/metadata.xml
+++ b/dev-perl/XML-RSS-Parser/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-RSS-Parser</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Parser</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Parser::Characters</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Parser::Element</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Parser::Feed</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Parser::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-RSS/metadata.xml b/dev-perl/XML-RSS/metadata.xml
index 34311e418d98..e6508f10ddf7 100644
--- a/dev-perl/XML-RSS/metadata.xml
+++ b/dev-perl/XML-RSS/metadata.xml
@@ -8,5 +8,13 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">XML-RSS</remote-id>
+    <remote-id type="cpan-module">XML::RSS</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::Base</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::Roles::ImageDims</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::Roles::ModulesElems</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::V0_9</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::V0_91</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::V1_0</remote-id>
+    <remote-id type="cpan-module">XML::RSS::Private::Output::V2_0</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-RegExp/metadata.xml b/dev-perl/XML-RegExp/metadata.xml
index cc64ca114e12..42d9c6f2819e 100644
--- a/dev-perl/XML-RegExp/metadata.xml
+++ b/dev-perl/XML-RegExp/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="cpan">XML-RegExp</remote-id>
+    <remote-id type="cpan-module">XML::RegExp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-SAX-Base/metadata.xml b/dev-perl/XML-SAX-Base/metadata.xml
index 880e471a348b..2440c164abd7 100644
--- a/dev-perl/XML-SAX-Base/metadata.xml
+++ b/dev-perl/XML-SAX-Base/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">XML-SAX-Base</remote-id>
+		<remote-id type="cpan-module">XML::SAX::Base</remote-id>
+		<remote-id type="cpan-module">XML::SAX::Base::NoHandler</remote-id>
+		<remote-id type="cpan-module">XML::SAX::Exception</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-SAX-Expat/metadata.xml b/dev-perl/XML-SAX-Expat/metadata.xml
index 1c3d982d379e..521d36d4d52e 100644
--- a/dev-perl/XML-SAX-Expat/metadata.xml
+++ b/dev-perl/XML-SAX-Expat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-SAX-Expat</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Expat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-SAX-Writer/metadata.xml b/dev-perl/XML-SAX-Writer/metadata.xml
index c9f5796cdd7f..c981f1f48a8b 100644
--- a/dev-perl/XML-SAX-Writer/metadata.xml
+++ b/dev-perl/XML-SAX-Writer/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-SAX-Writer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::ArrayConsumer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::CodeConsumer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::ConsumerInterface</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::Encode</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::FileConsumer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::HandleConsumer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::NullConverter</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::StringConsumer</remote-id>
+    <remote-id type="cpan-module">XML::SAX::Writer::XML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-SAX/metadata.xml b/dev-perl/XML-SAX/metadata.xml
index f11da0d0b90b..1d4aefa3a393 100644
--- a/dev-perl/XML-SAX/metadata.xml
+++ b/dev-perl/XML-SAX/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-SAX</remote-id>
+    <remote-id type="cpan-module">XML::SAX</remote-id>
+    <remote-id type="cpan-module">XML::SAX::DocumentLocator</remote-id>
+    <remote-id type="cpan-module">XML::SAX::ParserFactory</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::DebugHandler</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Exception</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Productions</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Reader</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Reader::Stream</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Reader::String</remote-id>
+    <remote-id type="cpan-module">XML::SAX::PurePerl::Reader::URI</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Sablot/metadata.xml b/dev-perl/XML-Sablot/metadata.xml
index ae4e9c899e45..4152055eaacd 100644
--- a/dev-perl/XML-Sablot/metadata.xml
+++ b/dev-perl/XML-Sablot/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Sablotron</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::Common</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Attribute</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::CDATASection</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::CharacterData</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Comment</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::DOMHandler</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::DOMImplementation</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Document</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::DocumentFragment</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::DocumentType</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Element</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Entity</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::EntityReference</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::NamedNodeMap</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Node</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::NodeList</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Notation</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::ProcessingInstruction</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::DOM::Text</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::Processor</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::SAXBuilder</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::SXP</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::Situation</remote-id>
+    <remote-id type="cpan-module">XML::Sablotron::Situation::DOMHandlerDispatcher</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Simple-DTDReader/metadata.xml b/dev-perl/XML-Simple-DTDReader/metadata.xml
index e97e56298cd7..32599e4ab4cd 100644
--- a/dev-perl/XML-Simple-DTDReader/metadata.xml
+++ b/dev-perl/XML-Simple-DTDReader/metadata.xml
@@ -9,5 +9,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">XML-Simple-DTDReader</remote-id>
+    <remote-id type="cpan-module">XML::Simple::DTDReader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Simple/metadata.xml b/dev-perl/XML-Simple/metadata.xml
index d99315888792..b1de76f39212 100644
--- a/dev-perl/XML-Simple/metadata.xml
+++ b/dev-perl/XML-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Simple</remote-id>
+    <remote-id type="cpan-module">XML::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-SimpleObject/metadata.xml b/dev-perl/XML-SimpleObject/metadata.xml
index c985a452c7a8..745565f7bc8f 100644
--- a/dev-perl/XML-SimpleObject/metadata.xml
+++ b/dev-perl/XML-SimpleObject/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-SimpleObject</remote-id>
+    <remote-id type="cpan-module">XML::SimpleObject</remote-id>
+    <remote-id type="cpan-module">XML::SimpleObject::Enhanced</remote-id>
+    <remote-id type="cpan-module">XML::SimpleObject::LibXML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Stream/metadata.xml b/dev-perl/XML-Stream/metadata.xml
index e9fcce727794..77dca91c5266 100644
--- a/dev-perl/XML-Stream/metadata.xml
+++ b/dev-perl/XML-Stream/metadata.xml
@@ -4,5 +4,26 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Stream</remote-id>
+    <remote-id type="cpan-module">XML::Stream</remote-id>
+    <remote-id type="cpan-module">XML::Stream::IO::Select::Win32</remote-id>
+    <remote-id type="cpan-module">XML::Stream::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::Stream::Node</remote-id>
+    <remote-id type="cpan-module">XML::Stream::Parser</remote-id>
+    <remote-id type="cpan-module">XML::Stream::Parser::DTD</remote-id>
+    <remote-id type="cpan-module">XML::Stream::Tree</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::AllOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::AndOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::AttributeOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::ContextOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::EqualOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::FunctionOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::NodeOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::NotEqualOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::Op</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::OrOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::PositionOp</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::Query</remote-id>
+    <remote-id type="cpan-module">XML::Stream::XPath::Value</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Twig/metadata.xml b/dev-perl/XML-Twig/metadata.xml
index 089532b20cd8..e9bf58bb62ca 100644
--- a/dev-perl/XML-Twig/metadata.xml
+++ b/dev-perl/XML-Twig/metadata.xml
@@ -4,5 +4,15 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Twig</remote-id>
+    <remote-id type="cpan-module">XML::Twig</remote-id>
+    <remote-id type="cpan-module">XML::Twig::Elt</remote-id>
+    <remote-id type="cpan-module">XML::Twig::Entity</remote-id>
+    <remote-id type="cpan-module">XML::Twig::Entity_list</remote-id>
+    <remote-id type="cpan-module">XML::Twig::XPath</remote-id>
+    <remote-id type="cpan-module">XML::Twig::XPath::Attribute</remote-id>
+    <remote-id type="cpan-module">XML::Twig::XPath::Elt</remote-id>
+    <remote-id type="cpan-module">XML::Twig::XPath::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::XPath::NodeSet</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::NodeSet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-Writer/metadata.xml b/dev-perl/XML-Writer/metadata.xml
index 589c03d026a4..b221467b61a8 100644
--- a/dev-perl/XML-Writer/metadata.xml
+++ b/dev-perl/XML-Writer/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-Writer</remote-id>
+    <remote-id type="cpan-module">XML::Writer</remote-id>
+    <remote-id type="cpan-module">XML::Writer::Namespaces</remote-id>
+    <remote-id type="cpan-module">XML::Writer::_PrintChecker</remote-id>
+    <remote-id type="cpan-module">XML::Writer::_String</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-XPath/metadata.xml b/dev-perl/XML-XPath/metadata.xml
index 840e46fbc28d..d5b7fa35f156 100644
--- a/dev-perl/XML-XPath/metadata.xml
+++ b/dev-perl/XML-XPath/metadata.xml
@@ -4,5 +4,34 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-XPath</remote-id>
+    <remote-id type="cpan-module">XML::XPath</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Boolean</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Builder</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Expr</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Function</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Literal</remote-id>
+    <remote-id type="cpan-module">XML::XPath::LocationPath</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Attribute</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::AttributeImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Comment</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::CommentImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Element</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::ElementImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Namespace</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::NamespaceImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::PI</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::PIImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::Text</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Node::TextImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::NodeImpl</remote-id>
+    <remote-id type="cpan-module">XML::XPath::NodeSet</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Number</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Parser</remote-id>
+    <remote-id type="cpan-module">XML::XPath::PerlSAX</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Root</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Step</remote-id>
+    <remote-id type="cpan-module">XML::XPath::Variable</remote-id>
+    <remote-id type="cpan-module">XML::XPath::XMLParser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-XPathEngine/metadata.xml b/dev-perl/XML-XPathEngine/metadata.xml
index 55955214f239..4265cf6a7df1 100644
--- a/dev-perl/XML-XPathEngine/metadata.xml
+++ b/dev-perl/XML-XPathEngine/metadata.xml
@@ -9,5 +9,16 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">XML-XPathEngine</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Boolean</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Expr</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Function</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Literal</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::LocationPath</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::NodeSet</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Number</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Root</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Step</remote-id>
+    <remote-id type="cpan-module">XML::XPathEngine::Variable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-XQL/metadata.xml b/dev-perl/XML-XQL/metadata.xml
index 670085de7c07..79cf3cda9229 100644
--- a/dev-perl/XML-XQL/metadata.xml
+++ b/dev-perl/XML-XQL/metadata.xml
@@ -4,5 +4,37 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-XQL</remote-id>
+    <remote-id type="cpan-module">XML::XQL</remote-id>
+    <remote-id type="cpan-module">XML::XQL::AllAttr</remote-id>
+    <remote-id type="cpan-module">XML::XQL::AllElements</remote-id>
+    <remote-id type="cpan-module">XML::XQL::And</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Attribute</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Bang</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Boolean</remote-id>
+    <remote-id type="cpan-module">XML::XQL::BooleanOp</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Compare</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Current</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Element</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Filter</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Func</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Intersect</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Invocation</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Node</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Not</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Number</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Operator</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Or</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Parent</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Path</remote-id>
+    <remote-id type="cpan-module">XML::XQL::PrimitiveType</remote-id>
+    <remote-id type="cpan-module">XML::XQL::PrimitiveTypeBase</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Query</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Root</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Sequence</remote-id>
+    <remote-id type="cpan-module">XML::XQL::SimpleAttr</remote-id>
+    <remote-id type="cpan-module">XML::XQL::SimpleElement</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Subscript</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Text</remote-id>
+    <remote-id type="cpan-module">XML::XQL::Union</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-XSLT/metadata.xml b/dev-perl/XML-XSLT/metadata.xml
index cfdb2da254a9..9f64c8843bde 100644
--- a/dev-perl/XML-XSLT/metadata.xml
+++ b/dev-perl/XML-XSLT/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-XSLT</remote-id>
+    <remote-id type="cpan-module">XML::XSLT</remote-id>
+    <remote-id type="cpan-module">XML::XSLT::DOM::TextDOE</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/XML-XUpdate-LibXML/metadata.xml b/dev-perl/XML-XUpdate-LibXML/metadata.xml
index 02c80f36406f..19c7b6ae9981 100644
--- a/dev-perl/XML-XUpdate-LibXML/metadata.xml
+++ b/dev-perl/XML-XUpdate-LibXML/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XML-XUpdate-LibXML</remote-id>
+    <remote-id type="cpan-module">XML::Normalize::LibXML</remote-id>
+    <remote-id type="cpan-module">XML::XUpdate::LibXML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/YAML-LibYAML/metadata.xml b/dev-perl/YAML-LibYAML/metadata.xml
index ffe1913ddb26..4fc739b2a30c 100644
--- a/dev-perl/YAML-LibYAML/metadata.xml
+++ b/dev-perl/YAML-LibYAML/metadata.xml
@@ -4,5 +4,8 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">YAML-LibYAML</remote-id>
+        <remote-id type="cpan-module">YAML::LibYAML</remote-id>
+        <remote-id type="cpan-module">YAML::XS</remote-id>
+        <remote-id type="cpan-module">YAML::XS::LibYAML</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-perl/YAML-Parser-Syck/metadata.xml b/dev-perl/YAML-Parser-Syck/metadata.xml
index 0ecffa7ecd44..bbc2b5dda452 100644
--- a/dev-perl/YAML-Parser-Syck/metadata.xml
+++ b/dev-perl/YAML-Parser-Syck/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">YAML-Parser-Syck</remote-id>
+    <remote-id type="cpan-module">YAML::Parser::Syck</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/YAML-Syck/metadata.xml b/dev-perl/YAML-Syck/metadata.xml
index f98e80510413..f308dafa777d 100644
--- a/dev-perl/YAML-Syck/metadata.xml
+++ b/dev-perl/YAML-Syck/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">YAML-Syck</remote-id>
+    <remote-id type="cpan-module">JSON::Syck</remote-id>
+    <remote-id type="cpan-module">YAML::Dumper::Syck</remote-id>
+    <remote-id type="cpan-module">YAML::Loader::Syck</remote-id>
+    <remote-id type="cpan-module">YAML::Syck</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/YAML-Tiny/metadata.xml b/dev-perl/YAML-Tiny/metadata.xml
index 8c560b3cb6fc..faef7e6b4e51 100644
--- a/dev-perl/YAML-Tiny/metadata.xml
+++ b/dev-perl/YAML-Tiny/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">YAML-Tiny</remote-id>
+    <remote-id type="cpan-module">YAML::Tiny</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/boolean/metadata.xml b/dev-perl/boolean/metadata.xml
index aec543536332..fdfa660b3d79 100644
--- a/dev-perl/boolean/metadata.xml
+++ b/dev-perl/boolean/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">boolean</remote-id>
+    <remote-id type="cpan-module">boolean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/cache-mmap/metadata.xml b/dev-perl/cache-mmap/metadata.xml
index 6197a44035d6..cc82c955dc1f 100644
--- a/dev-perl/cache-mmap/metadata.xml
+++ b/dev-perl/cache-mmap/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Cache-Mmap</remote-id>
+    <remote-id type="cpan-module">Cache::Mmap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/capitalization/metadata.xml b/dev-perl/capitalization/metadata.xml
index 065ddb16c076..05be84f17c32 100644
--- a/dev-perl/capitalization/metadata.xml
+++ b/dev-perl/capitalization/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">capitalization</remote-id>
+    <remote-id type="cpan-module">capitalization</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/class-loader/metadata.xml b/dev-perl/class-loader/metadata.xml
index d967f819e88a..d5bec093c938 100644
--- a/dev-perl/class-loader/metadata.xml
+++ b/dev-perl/class-loader/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-Loader</remote-id>
+    <remote-id type="cpan-module">Class::Loader</remote-id>
+    <remote-id type="cpan-module">Class::LoaderTest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/class-returnvalue/metadata.xml b/dev-perl/class-returnvalue/metadata.xml
index 4498ae4684f6..49ac0f05dafc 100644
--- a/dev-perl/class-returnvalue/metadata.xml
+++ b/dev-perl/class-returnvalue/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-ReturnValue</remote-id>
+    <remote-id type="cpan-module">Class::ReturnValue</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/config-general/metadata.xml b/dev-perl/config-general/metadata.xml
index ed2642ff4459..83e709d296de 100644
--- a/dev-perl/config-general/metadata.xml
+++ b/dev-perl/config-general/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Config-General</remote-id>
+    <remote-id type="cpan-module">Config::General</remote-id>
+    <remote-id type="cpan-module">Config::General::Extended</remote-id>
+    <remote-id type="cpan-module">Config::General::Interpolated</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/constant-boolean/metadata.xml b/dev-perl/constant-boolean/metadata.xml
index b24de5010ef0..62cef5a8a24b 100644
--- a/dev-perl/constant-boolean/metadata.xml
+++ b/dev-perl/constant-boolean/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">constant-boolean</remote-id>
+    <remote-id type="cpan-module">constant::boolean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/convert-ascii-armour/metadata.xml b/dev-perl/convert-ascii-armour/metadata.xml
index 2287fa19149d..cd05aec659ef 100644
--- a/dev-perl/convert-ascii-armour/metadata.xml
+++ b/dev-perl/convert-ascii-armour/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-ASCII-Armour</remote-id>
+    <remote-id type="cpan-module">Convert::ASCII::Armor</remote-id>
+    <remote-id type="cpan-module">Convert::ASCII::Armour</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/convert-pem/metadata.xml b/dev-perl/convert-pem/metadata.xml
index 5deb844a2bbb..7f6a3e39a273 100644
--- a/dev-perl/convert-pem/metadata.xml
+++ b/dev-perl/convert-pem/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Convert-PEM</remote-id>
+    <remote-id type="cpan-module">Convert::PEM</remote-id>
+    <remote-id type="cpan-module">Convert::PEM::CBC</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-cbc/metadata.xml b/dev-perl/crypt-cbc/metadata.xml
index b53008903e53..5fa8cf896c48 100644
--- a/dev-perl/crypt-cbc/metadata.xml
+++ b/dev-perl/crypt-cbc/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-CBC</remote-id>
+    <remote-id type="cpan-module">Crypt::CBC</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-des-ede3/metadata.xml b/dev-perl/crypt-des-ede3/metadata.xml
index f19fa670aa35..be00dce52933 100644
--- a/dev-perl/crypt-des-ede3/metadata.xml
+++ b/dev-perl/crypt-des-ede3/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-DES_EDE3</remote-id>
+    <remote-id type="cpan-module">Crypt::DES_EDE3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-dh/metadata.xml b/dev-perl/crypt-dh/metadata.xml
index ad5a7e94354b..3522ba3d2cb3 100644
--- a/dev-perl/crypt-dh/metadata.xml
+++ b/dev-perl/crypt-dh/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-DH</remote-id>
+    <remote-id type="cpan-module">Crypt::DH</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-dsa/metadata.xml b/dev-perl/crypt-dsa/metadata.xml
index e14a179f19b7..57c6ee08d0db 100644
--- a/dev-perl/crypt-dsa/metadata.xml
+++ b/dev-perl/crypt-dsa/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-DSA</remote-id>
+    <remote-id type="cpan-module">BufferWithInt</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::Key</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::Key::PEM</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::Key::SSH2</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::KeyChain</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::Signature</remote-id>
+    <remote-id type="cpan-module">Crypt::DSA::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-idea/metadata.xml b/dev-perl/crypt-idea/metadata.xml
index f9e8d2fe6b30..9add9d57a59f 100644
--- a/dev-perl/crypt-idea/metadata.xml
+++ b/dev-perl/crypt-idea/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-IDEA</remote-id>
+    <remote-id type="cpan-module">Crypt::IDEA</remote-id>
+    <remote-id type="cpan-module">IDEA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-primes/metadata.xml b/dev-perl/crypt-primes/metadata.xml
index 9f51700a3a62..92a2c3362492 100644
--- a/dev-perl/crypt-primes/metadata.xml
+++ b/dev-perl/crypt-primes/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Primes</remote-id>
+    <remote-id type="cpan-module">Crypt::Primes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-random/metadata.xml b/dev-perl/crypt-random/metadata.xml
index e5c232d80696..615e3d526853 100644
--- a/dev-perl/crypt-random/metadata.xml
+++ b/dev-perl/crypt-random/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-Random</remote-id>
+    <remote-id type="cpan-module">Crypt::Random</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Generator</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Provider::File</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Provider::devrandom</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Provider::devurandom</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Provider::egd</remote-id>
+    <remote-id type="cpan-module">Crypt::Random::Provider::rand</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/crypt-rsa/metadata.xml b/dev-perl/crypt-rsa/metadata.xml
index b5bfb3f7c751..e50f7f0b58f0 100644
--- a/dev-perl/crypt-rsa/metadata.xml
+++ b/dev-perl/crypt-rsa/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Crypt-RSA</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::DataFormat</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Debug</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::ES::OAEP</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::ES::PKCS1v15</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Errorhandler</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key::Private</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key::Private::SSH</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key::Private::SSH::Buffer</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key::Public</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Key::Public::SSH</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::Primitives</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::SS::PKCS1v15</remote-id>
+    <remote-id type="cpan-module">Crypt::RSA::SS::PSS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/data-buffer/metadata.xml b/dev-perl/data-buffer/metadata.xml
index 55f39af56375..b435c019a850 100644
--- a/dev-perl/data-buffer/metadata.xml
+++ b/dev-perl/data-buffer/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Data-Buffer</remote-id>
+    <remote-id type="cpan-module">Data::Buffer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/dbix-searchbuilder/metadata.xml b/dev-perl/dbix-searchbuilder/metadata.xml
index cf58a637eb15..5110699e1afb 100644
--- a/dev-perl/dbix-searchbuilder/metadata.xml
+++ b/dev-perl/dbix-searchbuilder/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DBIx-SearchBuilder</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::Informix</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::ODBC</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::Oracle</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::Pg</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::SQLite</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::Sybase</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::mysql</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Handle::mysqlPP</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Record</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Record::Cachable</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::SchemaGenerator</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Union</remote-id>
+    <remote-id type="cpan-module">DBIx::SearchBuilder::Unique</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/digest-bubblebabble/metadata.xml b/dev-perl/digest-bubblebabble/metadata.xml
index e0cf7597b609..483fd37dba82 100644
--- a/dev-perl/digest-bubblebabble/metadata.xml
+++ b/dev-perl/digest-bubblebabble/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-BubbleBabble</remote-id>
+    <remote-id type="cpan-module">Digest::BubbleBabble</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/digest-md2/metadata.xml b/dev-perl/digest-md2/metadata.xml
index 1c4e8bba3dcf..908c8d71e44a 100644
--- a/dev-perl/digest-md2/metadata.xml
+++ b/dev-perl/digest-md2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-MD2</remote-id>
+    <remote-id type="cpan-module">Digest::MD2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/encoding-warnings/metadata.xml b/dev-perl/encoding-warnings/metadata.xml
index 81a10c30ef8f..82fcff1d2cc2 100644
--- a/dev-perl/encoding-warnings/metadata.xml
+++ b/dev-perl/encoding-warnings/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpan">encoding-warnings</remote-id>
+		<remote-id type="cpan-module">encoding::warnings</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/enum/metadata.xml b/dev-perl/enum/metadata.xml
index a1bc7d7fce4e..e2fea729305e 100644
--- a/dev-perl/enum/metadata.xml
+++ b/dev-perl/enum/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">enum</remote-id>
+    <remote-id type="cpan-module">enum</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/extutils-depends/metadata.xml b/dev-perl/extutils-depends/metadata.xml
index e558641748cd..54ee633e5c5c 100644
--- a/dev-perl/extutils-depends/metadata.xml
+++ b/dev-perl/extutils-depends/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-Depends</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Depends</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/extutils-pkgconfig/metadata.xml b/dev-perl/extutils-pkgconfig/metadata.xml
index 0c362cbc48e2..31ff184d4123 100644
--- a/dev-perl/extutils-pkgconfig/metadata.xml
+++ b/dev-perl/extutils-pkgconfig/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-PkgConfig</remote-id>
+    <remote-id type="cpan-module">ExtUtils::PkgConfig</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild
index a9032aeca4ac..ca3ed9039fa1 100644
--- a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild
+++ b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild
@@ -1,21 +1,24 @@
-# 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-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild,v 1.27 2010/12/14 03:45:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4.ebuild,v 1.28 2012/06/24 17:22:16 tove Exp $
 
+EAPI=4
+
+MY_PN=Frontier-RPC
+MY_PV=0.07b4
+MODULE_AUTHOR=KMACLEOD
 inherit perl-module
 
-MY_P=Frontier-RPC-0.07b4
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A Perl 5 module for performing remote procedure calls
-using extensible markup language"
-SRC_URI="http://perl-xml.sourceforge.net/xml-rpc/${MY_P}.tar.gz"
-HOMEPAGE="http://perl-xml.sourceforge.net/xml-rpc/"
+DESCRIPTION="Perform remote procedure calls using extensible markup language"
+SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${MY_P}.tar.gz"
+HOMEPAGE+=" http://perl-xml.sourceforge.net/xml-rpc/"
 
 SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="dev-perl/XML-Parser
+RDEPEND="
+	dev-perl/XML-Parser
 	dev-perl/libwww-perl
-	dev-lang/perl"
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/frontier-rpc/metadata.xml b/dev-perl/frontier-rpc/metadata.xml
index 36ee0f08c67c..93cedf2e1be0 100644
--- a/dev-perl/frontier-rpc/metadata.xml
+++ b/dev-perl/frontier-rpc/metadata.xml
@@ -2,4 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Frontier-RPC</remote-id>
+    <remote-id type="cpan-module">Apache::XMLRPC</remote-id>
+    <remote-id type="cpan-module">Frontier::Client</remote-id>
+    <remote-id type="cpan-module">Frontier::Daemon</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::Base64</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::Boolean</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::DataType</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::DateTime::ISO8601</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::Double</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::Integer</remote-id>
+    <remote-id type="cpan-module">Frontier::RPC2::String</remote-id>
+    <remote-id type="cpan-module">Frontier::Responder</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gimp-perl/metadata.xml b/dev-perl/gimp-perl/metadata.xml
index 8e4ea10c0729..cba4320299d9 100644
--- a/dev-perl/gimp-perl/metadata.xml
+++ b/dev-perl/gimp-perl/metadata.xml
@@ -4,5 +4,22 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gimp</remote-id>
+    <remote-id type="cpan-module">Gimp</remote-id>
+    <remote-id type="cpan-module">Gimp::Compat</remote-id>
+    <remote-id type="cpan-module">Gimp::Data</remote-id>
+    <remote-id type="cpan-module">Gimp::Feature</remote-id>
+    <remote-id type="cpan-module">Gimp::Fu</remote-id>
+    <remote-id type="cpan-module">Gimp::Lib</remote-id>
+    <remote-id type="cpan-module">Gimp::Module</remote-id>
+    <remote-id type="cpan-module">Gimp::Net</remote-id>
+    <remote-id type="cpan-module">Gimp::PDL</remote-id>
+    <remote-id type="cpan-module">Gimp::Parasite</remote-id>
+    <remote-id type="cpan-module">Gimp::PixelRgn</remote-id>
+    <remote-id type="cpan-module">Gimp::Pod</remote-id>
+    <remote-id type="cpan-module">Gimp::Tile</remote-id>
+    <remote-id type="cpan-module">Gimp::UI</remote-id>
+    <remote-id type="cpan-module">Gimp::Util</remote-id>
+    <remote-id type="cpan-module">Gimp::basewidget</remote-id>
+    <remote-id type="cpan-module">Gimp::run_mode</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/glib-perl/metadata.xml b/dev-perl/glib-perl/metadata.xml
index 46ef897e1ffe..8923de66f11f 100644
--- a/dev-perl/glib-perl/metadata.xml
+++ b/dev-perl/glib-perl/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Glib</remote-id>
+    <remote-id type="cpan-module">Glib</remote-id>
+    <remote-id type="cpan-module">Glib::CodeGen</remote-id>
+    <remote-id type="cpan-module">Glib::Error</remote-id>
+    <remote-id type="cpan-module">Glib::Flags</remote-id>
+    <remote-id type="cpan-module">Glib::GenPod</remote-id>
+    <remote-id type="cpan-module">Glib::MakeHelper</remote-id>
+    <remote-id type="cpan-module">Glib::Object</remote-id>
+    <remote-id type="cpan-module">Glib::Object::Property</remote-id>
+    <remote-id type="cpan-module">Glib::Object::Property::ReadWrite</remote-id>
+    <remote-id type="cpan-module">Glib::Object::Property::Readable</remote-id>
+    <remote-id type="cpan-module">Glib::Object::Property::Writable</remote-id>
+    <remote-id type="cpan-module">Glib::Object::Subclass</remote-id>
+    <remote-id type="cpan-module">Glib::Object::_LazyLoader</remote-id>
+    <remote-id type="cpan-module">Glib::ParseXSDoc</remote-id>
+    <remote-id type="cpan-module">MY</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gnome2-canvas/metadata.xml b/dev-perl/gnome2-canvas/metadata.xml
index 50897eb64416..be8b76eaa9c0 100644
--- a/dev-perl/gnome2-canvas/metadata.xml
+++ b/dev-perl/gnome2-canvas/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gnome2-Canvas</remote-id>
+    <remote-id type="cpan-module">Gnome2::Canvas</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gnome2-gconf/metadata.xml b/dev-perl/gnome2-gconf/metadata.xml
index fa2935fcf5ae..21f099bf3368 100644
--- a/dev-perl/gnome2-gconf/metadata.xml
+++ b/dev-perl/gnome2-gconf/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gnome2-GConf</remote-id>
+    <remote-id type="cpan-module">Gnome2::GConf</remote-id>
+    <remote-id type="cpan-module">Gnome2::GConf::Client</remote-id>
+    <remote-id type="cpan-module">Gnome2::GConf::Value</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gnome2-perl/metadata.xml b/dev-perl/gnome2-perl/metadata.xml
index 16e2cba49ab0..20464135e36a 100644
--- a/dev-perl/gnome2-perl/metadata.xml
+++ b/dev-perl/gnome2-perl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gnome2</remote-id>
+    <remote-id type="cpan-module">Gnome2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gnome2-vfs-perl/metadata.xml b/dev-perl/gnome2-vfs-perl/metadata.xml
index ef1f6fa4622e..20381a9bad62 100644
--- a/dev-perl/gnome2-vfs-perl/metadata.xml
+++ b/dev-perl/gnome2-vfs-perl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gnome2-VFS</remote-id>
+    <remote-id type="cpan-module">Gnome2::VFS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gnome2-wnck/metadata.xml b/dev-perl/gnome2-wnck/metadata.xml
index bf41983c7257..0bcb70a748f1 100644
--- a/dev-perl/gnome2-wnck/metadata.xml
+++ b/dev-perl/gnome2-wnck/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gnome2-Wnck</remote-id>
+    <remote-id type="cpan-module">Gnome2::Wnck</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-ex-formfactory/metadata.xml b/dev-perl/gtk2-ex-formfactory/metadata.xml
index 62a83564d1b7..ab6b9b22be7e 100644
--- a/dev-perl/gtk2-ex-formfactory/metadata.xml
+++ b/dev-perl/gtk2-ex-formfactory/metadata.xml
@@ -4,5 +4,51 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Ex-FormFactory</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Button</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::CheckButton</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::CheckButtonGroup</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Combo</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Container</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Context</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::DialogButtons</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Entry</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::ExecFlow</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Expander</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Form</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::GtkWidget</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::HBox</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::HPaned</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::HSeparator</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Image</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Label</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Layout</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::List</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Loader</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Menu</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::MenuItem</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Notebook</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Popup</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::ProgressBar</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Proxy</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::ProxyBuffered</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::RadioButton</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Rules</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Table</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::TextView</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Timestamp</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::ToggleButton</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::VBox</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::VPaned</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::VSeparator</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Widget</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::Window</remote-id>
+    <remote-id type="cpan-module">Gtk2::Ex::FormFactory::YesNo</remote-id>
+    <remote-id type="cpan-module">Music::Album</remote-id>
+    <remote-id type="cpan-module">Music::Artist</remote-id>
+    <remote-id type="cpan-module">Music::Config</remote-id>
+    <remote-id type="cpan-module">Music::DBI</remote-id>
+    <remote-id type="cpan-module">Music::Genre</remote-id>
+    <remote-id type="cpan-module">Music::Song</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-fu/metadata.xml b/dev-perl/gtk2-fu/metadata.xml
index 8aa9e4e9d3d2..2f196da350b2 100644
--- a/dev-perl/gtk2-fu/metadata.xml
+++ b/dev-perl/gtk2-fu/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2Fu</remote-id>
+    <remote-id type="cpan-module">Gtk2::Box</remote-id>
+    <remote-id type="cpan-module">Gtk2::Widget</remote-id>
+    <remote-id type="cpan-module">Gtk2::Window</remote-id>
+    <remote-id type="cpan-module">Gtk2::WrappedLabel</remote-id>
+    <remote-id type="cpan-module">Gtk2Fu</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-gladexml/metadata.xml b/dev-perl/gtk2-gladexml/metadata.xml
index 87086fb4ad3b..5a3a7610b3b9 100644
--- a/dev-perl/gtk2-gladexml/metadata.xml
+++ b/dev-perl/gtk2-gladexml/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-GladeXML</remote-id>
+    <remote-id type="cpan-module">Gtk2::GladeXML</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-perl/metadata.xml b/dev-perl/gtk2-perl/metadata.xml
index 5ecaf4fd96be..535a9aa80266 100644
--- a/dev-perl/gtk2-perl/metadata.xml
+++ b/dev-perl/gtk2-perl/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2</remote-id>
+    <remote-id type="cpan-module">Gtk2</remote-id>
+    <remote-id type="cpan-module">Gtk2::Builder</remote-id>
+    <remote-id type="cpan-module">Gtk2::CellLayout::DataFunc</remote-id>
+    <remote-id type="cpan-module">Gtk2::CodeGen</remote-id>
+    <remote-id type="cpan-module">Gtk2::Gdk</remote-id>
+    <remote-id type="cpan-module">Gtk2::Gdk::Atom</remote-id>
+    <remote-id type="cpan-module">Gtk2::Helper</remote-id>
+    <remote-id type="cpan-module">Gtk2::Pango</remote-id>
+    <remote-id type="cpan-module">Gtk2::SimpleList</remote-id>
+    <remote-id type="cpan-module">Gtk2::SimpleList::TiedList</remote-id>
+    <remote-id type="cpan-module">Gtk2::SimpleList::TiedRow</remote-id>
+    <remote-id type="cpan-module">Gtk2::SimpleMenu</remote-id>
+    <remote-id type="cpan-module">Gtk2::TestHelper</remote-id>
+    <remote-id type="cpan-module">Gtk2::TreeModelSort</remote-id>
+    <remote-id type="cpan-module">Gtk2::TreeSortable::IterCompareFunc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-spell/metadata.xml b/dev-perl/gtk2-spell/metadata.xml
index 6035cf51f87e..39fcba176405 100644
--- a/dev-perl/gtk2-spell/metadata.xml
+++ b/dev-perl/gtk2-spell/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-Spell</remote-id>
+    <remote-id type="cpan-module">Gtk2::Spell</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-trayicon/metadata.xml b/dev-perl/gtk2-trayicon/metadata.xml
index 6572246f04df..b7f0849eecc8 100644
--- a/dev-perl/gtk2-trayicon/metadata.xml
+++ b/dev-perl/gtk2-trayicon/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-TrayIcon</remote-id>
+    <remote-id type="cpan-module">Gtk2::TrayIcon</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-traymanager/metadata.xml b/dev-perl/gtk2-traymanager/metadata.xml
index 6a9a47cfb73a..7bb0117e6e24 100644
--- a/dev-perl/gtk2-traymanager/metadata.xml
+++ b/dev-perl/gtk2-traymanager/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Gtk2-TrayManager</remote-id>
+    <remote-id type="cpan-module">Gtk2::TrayManager</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/indirect/metadata.xml b/dev-perl/indirect/metadata.xml
index 05ca3cd40eb7..5944926e922d 100644
--- a/dev-perl/indirect/metadata.xml
+++ b/dev-perl/indirect/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">indirect</remote-id>
+		<remote-id type="cpan-module">indirect</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/inline-files/metadata.xml b/dev-perl/inline-files/metadata.xml
index 1fe0864ab0d5..777e752e0090 100644
--- a/dev-perl/inline-files/metadata.xml
+++ b/dev-perl/inline-files/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Inline-Files</remote-id>
+    <remote-id type="cpan-module">Inline::Files</remote-id>
+    <remote-id type="cpan-module">Inline::Files::Data</remote-id>
+    <remote-id type="cpan-module">Inline::Files::Virtual</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild
index 0f0f2f970bcc..0269ddb6d3cb 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.200.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/libintl-perl/libintl-perl-1.200.0.ebuild,v 1.16 2012/05/28 17:34:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild,v 1.17 2012/06/24 19:00:28 tove Exp $
 
 EAPI=4
 
@@ -17,3 +17,15 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
 IUSE=""
 
 SRC_TEST=do
+
+src_test() {
+	if grep -q '^de_' <( locale -a ) ; then
+		if grep -q '^de_AT$' <( locale -a ) ; then
+			perl-module_src_test
+		else
+			ewarn "Skipping tests, known broken with de_ and without de_AT"
+		fi
+	else
+		perl-module_src_test
+	fi
+}
diff --git a/dev-perl/libintl-perl/metadata.xml b/dev-perl/libintl-perl/metadata.xml
index d1c741359100..3c5fc2b916e5 100644
--- a/dev-perl/libintl-perl/metadata.xml
+++ b/dev-perl/libintl-perl/metadata.xml
@@ -4,5 +4,155 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">libintl-perl</remote-id>
+    <remote-id type="cpan-module">Locale::Messages</remote-id>
+    <remote-id type="cpan-module">Locale::Recode</remote-id>
+    <remote-id type="cpan-module">Locale::Recode::_Aliases</remote-id>
+    <remote-id type="cpan-module">Locale::Recode::_Conversions</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ASMO_449</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ATARI_ST</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ATARI_ST_EURO</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP10007</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1250</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1251</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1252</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1253</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1254</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1256</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CP1257</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CSN_369103</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::CWI</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::DEC_MCS</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_AT_DE</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_AT_DE_A</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_CA_FR</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_DK_NO</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_DK_NO_A</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_ES</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_ES_A</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_ES_S</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_FI_SE</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_FI_SE_A</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_FR</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_IS_FRISS</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_IT</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_PT</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_UK</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::EBCDIC_US</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ECMA_CYRILLIC</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GEORGIAN_ACADEMY</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GEORGIAN_PS</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GOST_19768_74</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GREEK7</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GREEK7_OLD</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::GREEK_CCITT</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::HP_ROMAN8</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM037</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM038</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM1004</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM1026</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM1047</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM256</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM273</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM274</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM275</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM277</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM278</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM280</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM281</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM284</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM285</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM290</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM297</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM420</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM423</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM424</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM437</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM500</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM850</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM851</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM852</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM855</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM857</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM860</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM861</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM862</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM863</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM864</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM865</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM866</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM868</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM869</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM870</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM871</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM874</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM875</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM880</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM891</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM903</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM904</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM905</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IBM918</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::IEC_P27_1</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::INIS</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::INIS_8</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::INIS_CYRILLIC</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_10367_BOX</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_2033_1983</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_5427</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_5427_EXT</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_5428</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_1</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_10</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_11</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_13</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_14</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_15</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_16</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_2</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_3</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_4</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_5</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_6</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_7</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_8</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::ISO_8859_9</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::KOI8_R</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::KOI8_RU</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::KOI8_T</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::KOI8_U</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::KOI_8</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::LATIN_GREEK</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::LATIN_GREEK_1</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACARABIC</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACCROATIAN</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACCYRILLIC</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACGREEK</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACHEBREW</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACICELAND</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACINTOSH</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACROMANIA</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACTHAI</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACTURKISH</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MACUKRAINE</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MAC_IS</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MAC_SAMI</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::MAC_UK</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::NATS_DANO</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::NATS_SEFI</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::NEXTSTEP</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::SAMI_WS2</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::TIS_620</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::US_ASCII</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::UTF_8</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::VISCII</remote-id>
+    <remote-id type="cpan-module">Locale::RecodeData::_Encode</remote-id>
+    <remote-id type="cpan-module">Locale::TextDomain</remote-id>
+    <remote-id type="cpan-module">Locale::Util</remote-id>
+    <remote-id type="cpan-module">Locale::gettext_pp</remote-id>
+    <remote-id type="cpan-module">Locale::gettext_xs</remote-id>
+    <remote-id type="cpan-module">MyInstall</remote-id>
+    <remote-id type="cpan-module">SimpleCal</remote-id>
+    <remote-id type="cpan-module">__TiedTextDomain</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/libvorbis-perl/metadata.xml b/dev-perl/libvorbis-perl/metadata.xml
index ef3dab2fc630..660ecdf58354 100644
--- a/dev-perl/libvorbis-perl/metadata.xml
+++ b/dev-perl/libvorbis-perl/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">libvorbis-perl</remote-id>
+    <remote-id type="cpan-module">Ogg::Vorbis</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/libwww-perl/metadata.xml b/dev-perl/libwww-perl/metadata.xml
index af6b7d8962ce..b7fba106c514 100644
--- a/dev-perl/libwww-perl/metadata.xml
+++ b/dev-perl/libwww-perl/metadata.xml
@@ -4,5 +4,31 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">libwww-perl</remote-id>
+    <remote-id type="cpan-module">LWP</remote-id>
+    <remote-id type="cpan-module">LWP::Authen::Basic</remote-id>
+    <remote-id type="cpan-module">LWP::Authen::Digest</remote-id>
+    <remote-id type="cpan-module">LWP::Authen::Ntlm</remote-id>
+    <remote-id type="cpan-module">LWP::ConnCache</remote-id>
+    <remote-id type="cpan-module">LWP::Debug</remote-id>
+    <remote-id type="cpan-module">LWP::DebugFile</remote-id>
+    <remote-id type="cpan-module">LWP::MemberMixin</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::GHTTP</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::MyFTP</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::cpan</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::data</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::file</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::ftp</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::gopher</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::http</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::http::Socket</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::http::SocketMethods</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::loopback</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::mailto</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::nntp</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::nogo</remote-id>
+    <remote-id type="cpan-module">LWP::RobotUA</remote-id>
+    <remote-id type="cpan-module">LWP::Simple</remote-id>
+    <remote-id type="cpan-module">LWP::UserAgent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/libxml-perl/metadata.xml b/dev-perl/libxml-perl/metadata.xml
index 47bb58b57c06..63ead5b1c27a 100644
--- a/dev-perl/libxml-perl/metadata.xml
+++ b/dev-perl/libxml-perl/metadata.xml
@@ -4,5 +4,23 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">libxml-perl</remote-id>
+    <remote-id type="cpan-module">Data::Grove</remote-id>
+    <remote-id type="cpan-module">Data::Grove::Characters</remote-id>
+    <remote-id type="cpan-module">Data::Grove::Parent</remote-id>
+    <remote-id type="cpan-module">Data::Grove::ParentList</remote-id>
+    <remote-id type="cpan-module">Data::Grove::Visitor</remote-id>
+    <remote-id type="cpan-module">XML::ESISParser</remote-id>
+    <remote-id type="cpan-module">XML::Handler::CanonXMLWriter</remote-id>
+    <remote-id type="cpan-module">XML::Handler::Sample</remote-id>
+    <remote-id type="cpan-module">XML::Handler::Subs</remote-id>
+    <remote-id type="cpan-module">XML::Handler::XMLWriter</remote-id>
+    <remote-id type="cpan-module">XML::Parser::PerlSAX</remote-id>
+    <remote-id type="cpan-module">XML::PatAct::ACTION</remote-id>
+    <remote-id type="cpan-module">XML::PatAct::Amsterdam</remote-id>
+    <remote-id type="cpan-module">XML::PatAct::MatchName</remote-id>
+    <remote-id type="cpan-module">XML::PatAct::PATTERN</remote-id>
+    <remote-id type="cpan-module">XML::PatAct::ToObjects</remote-id>
+    <remote-id type="cpan-module">XML::Perl2SAX</remote-id>
+    <remote-id type="cpan-module">XML::SAX2Perl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/locale-maketext-fuzzy/metadata.xml b/dev-perl/locale-maketext-fuzzy/metadata.xml
index 6869765d3bec..2aa8be2a15f3 100644
--- a/dev-perl/locale-maketext-fuzzy/metadata.xml
+++ b/dev-perl/locale-maketext-fuzzy/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Fuzzy</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Fuzzy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/locale-maketext-lexicon/metadata.xml b/dev-perl/locale-maketext-lexicon/metadata.xml
index d2b5a593b16a..61817eecb7dd 100644
--- a/dev-perl/locale-maketext-lexicon/metadata.xml
+++ b/dev-perl/locale-maketext-lexicon/metadata.xml
@@ -4,5 +4,27 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Lexicon</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::Base</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::FormFu</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::FormFu::Extractor</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::Generic</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::Mason</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::PPI</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::Perl</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::TT2</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::TT2::Directive</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::TT2::Parser</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::TextTemplate</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::TextTemplate::Parser</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::YAML</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Plugin::YAML::Extractor</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Extract::Run</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon::Auto</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon::Extract::Run</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon::Gettext</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon::Msgcat</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Lexicon::Tie</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/log-dispatch/metadata.xml b/dev-perl/log-dispatch/metadata.xml
index 92f61f5779f6..fccca803fe89 100644
--- a/dev-perl/log-dispatch/metadata.xml
+++ b/dev-perl/log-dispatch/metadata.xml
@@ -4,5 +4,20 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Log-Dispatch</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::ApacheLog</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Base</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Email</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Email::MIMELite</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Email::MailSend</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Email::MailSender</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Email::MailSendmail</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::File</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::File::Locked</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Handle</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Null</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Output</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Screen</remote-id>
+    <remote-id type="cpan-module">Log::Dispatch::Syslog</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/math-pari/metadata.xml b/dev-perl/math-pari/metadata.xml
index dfc92a242b43..853302f38c82 100644
--- a/dev-perl/math-pari/metadata.xml
+++ b/dev-perl/math-pari/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-Pari</remote-id>
+    <remote-id type="cpan-module">Math::Pari</remote-id>
+    <remote-id type="cpan-module">Math::Pari::Arr</remote-id>
+    <remote-id type="cpan-module">Math::PariBuild</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/maybe/metadata.xml b/dev-perl/maybe/metadata.xml
index e0f175f36914..e3814d29a5f1 100644
--- a/dev-perl/maybe/metadata.xml
+++ b/dev-perl/maybe/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">maybe</remote-id>
+    <remote-id type="cpan-module">maybe</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/mecab-perl/metadata.xml b/dev-perl/mecab-perl/metadata.xml
index 7a5e64e05b55..cb36a2fd8c76 100644
--- a/dev-perl/mecab-perl/metadata.xml
+++ b/dev-perl/mecab-perl/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>
-  <upstream>
-    <remote-id type="cpan">mecab-perl</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/module-info/metadata.xml b/dev-perl/module-info/metadata.xml
index 1fe65376ed75..12cf4d854049 100644
--- a/dev-perl/module-info/metadata.xml
+++ b/dev-perl/module-info/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Info</remote-id>
+    <remote-id type="cpan-module">B::Module::Info</remote-id>
+    <remote-id type="cpan-module">Module::Info</remote-id>
+    <remote-id type="cpan-module">Module::Info::Safe</remote-id>
+    <remote-id type="cpan-module">Module::Info::Unsafe</remote-id>
+    <remote-id type="cpan-module">Module::Info::_version</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/mogilefs-server/metadata.xml b/dev-perl/mogilefs-server/metadata.xml
index 7868ff7b8d26..1302aeac0d31 100644
--- a/dev-perl/mogilefs-server/metadata.xml
+++ b/dev-perl/mogilefs-server/metadata.xml
@@ -8,5 +8,65 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">MogileFS-Server</remote-id>
+    <remote-id type="cpan-module">Mgd</remote-id>
+    <remote-id type="cpan-module">MogPath</remote-id>
+    <remote-id type="cpan-module">MogileFS</remote-id>
+    <remote-id type="cpan-module">MogileFS::Checksum</remote-id>
+    <remote-id type="cpan-module">MogileFS::Class</remote-id>
+    <remote-id type="cpan-module">MogileFS::Config</remote-id>
+    <remote-id type="cpan-module">MogileFS::Connection::Client</remote-id>
+    <remote-id type="cpan-module">MogileFS::Connection::Mogstored</remote-id>
+    <remote-id type="cpan-module">MogileFS::Connection::Worker</remote-id>
+    <remote-id type="cpan-module">MogileFS::DevFID</remote-id>
+    <remote-id type="cpan-module">MogileFS::Device</remote-id>
+    <remote-id type="cpan-module">MogileFS::DeviceState</remote-id>
+    <remote-id type="cpan-module">MogileFS::Domain</remote-id>
+    <remote-id type="cpan-module">MogileFS::Exception</remote-id>
+    <remote-id type="cpan-module">MogileFS::FID</remote-id>
+    <remote-id type="cpan-module">MogileFS::Factory</remote-id>
+    <remote-id type="cpan-module">MogileFS::Factory::Class</remote-id>
+    <remote-id type="cpan-module">MogileFS::Factory::Device</remote-id>
+    <remote-id type="cpan-module">MogileFS::Factory::Domain</remote-id>
+    <remote-id type="cpan-module">MogileFS::Factory::Host</remote-id>
+    <remote-id type="cpan-module">MogileFS::HTTPFile</remote-id>
+    <remote-id type="cpan-module">MogileFS::Host</remote-id>
+    <remote-id type="cpan-module">MogileFS::IOStatWatch::Client</remote-id>
+    <remote-id type="cpan-module">MogileFS::IOStatWatcher</remote-id>
+    <remote-id type="cpan-module">MogileFS::ProcManager</remote-id>
+    <remote-id type="cpan-module">MogileFS::Rebalance</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationPolicy</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationPolicy::MultipleHosts</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationPolicy::Union</remote-id>
+    <remote-id type="cpan-module">MogileFS::ReplicationRequest</remote-id>
+    <remote-id type="cpan-module">MogileFS::Server</remote-id>
+    <remote-id type="cpan-module">MogileFS::Store</remote-id>
+    <remote-id type="cpan-module">MogileFS::Store::MySQL</remote-id>
+    <remote-id type="cpan-module">MogileFS::Store::Postgres</remote-id>
+    <remote-id type="cpan-module">MogileFS::Store::SQLite</remote-id>
+    <remote-id type="cpan-module">MogileFS::Test</remote-id>
+    <remote-id type="cpan-module">MogileFS::Util</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Delete</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Fsck</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::JobMaster</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Monitor</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Query</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Reaper</remote-id>
+    <remote-id type="cpan-module">MogileFS::Worker::Replicate</remote-id>
+    <remote-id type="cpan-module">Mogstored::ChildProcess</remote-id>
+    <remote-id type="cpan-module">Mogstored::ChildProcess::DiskUsage</remote-id>
+    <remote-id type="cpan-module">Mogstored::ChildProcess::IOStat</remote-id>
+    <remote-id type="cpan-module">Mogstored::FIDStatter</remote-id>
+    <remote-id type="cpan-module">Mogstored::HTTPServer</remote-id>
+    <remote-id type="cpan-module">Mogstored::HTTPServer::Apache</remote-id>
+    <remote-id type="cpan-module">Mogstored::HTTPServer::Lighttpd</remote-id>
+    <remote-id type="cpan-module">Mogstored::HTTPServer::None</remote-id>
+    <remote-id type="cpan-module">Mogstored::HTTPServer::Perlbal</remote-id>
+    <remote-id type="cpan-module">Mogstored::SideChannelClient</remote-id>
+    <remote-id type="cpan-module">Mogstored::SideChannelListener</remote-id>
+    <remote-id type="cpan-module">Mogstored::TaskQueue</remote-id>
+    <remote-id type="cpan-module">MogstoredHandle</remote-id>
+    <remote-id type="cpan-module">ProcessHandle</remote-id>
+    <remote-id type="cpan-module">TrackerHandle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/namespace-autoclean/metadata.xml b/dev-perl/namespace-autoclean/metadata.xml
index ce7883335f6f..d2597ad3fff2 100644
--- a/dev-perl/namespace-autoclean/metadata.xml
+++ b/dev-perl/namespace-autoclean/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">namespace-autoclean</remote-id>
+    <remote-id type="cpan-module">namespace::autoclean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/namespace-clean/metadata.xml b/dev-perl/namespace-clean/metadata.xml
index c55fea069fa3..2f366eb02b38 100644
--- a/dev-perl/namespace-clean/metadata.xml
+++ b/dev-perl/namespace-clean/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">namespace-clean</remote-id>
+    <remote-id type="cpan-module">namespace::clean</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/net-server/metadata.xml b/dev-perl/net-server/metadata.xml
index a7b80a78d6e8..b035755cd47c 100644
--- a/dev-perl/net-server/metadata.xml
+++ b/dev-perl/net-server/metadata.xml
@@ -4,5 +4,29 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Server</remote-id>
+    <remote-id type="cpan-module">Net::Server</remote-id>
+    <remote-id type="cpan-module">Net::Server::Daemonize</remote-id>
+    <remote-id type="cpan-module">Net::Server::Fork</remote-id>
+    <remote-id type="cpan-module">Net::Server::HTTP</remote-id>
+    <remote-id type="cpan-module">Net::Server::INET</remote-id>
+    <remote-id type="cpan-module">Net::Server::INET::Handle</remote-id>
+    <remote-id type="cpan-module">Net::Server::Log::Log::Log4perl</remote-id>
+    <remote-id type="cpan-module">Net::Server::Log::Sys::Syslog</remote-id>
+    <remote-id type="cpan-module">Net::Server::MultiType</remote-id>
+    <remote-id type="cpan-module">Net::Server::Multiplex</remote-id>
+    <remote-id type="cpan-module">Net::Server::Multiplex::MUX</remote-id>
+    <remote-id type="cpan-module">Net::Server::PSGI</remote-id>
+    <remote-id type="cpan-module">Net::Server::PreFork</remote-id>
+    <remote-id type="cpan-module">Net::Server::PreForkSimple</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::SSL</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::SSLEAY</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::TCP</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::UDP</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::UNIX</remote-id>
+    <remote-id type="cpan-module">Net::Server::Proto::UNIXDGRAM</remote-id>
+    <remote-id type="cpan-module">Net::Server::SIG</remote-id>
+    <remote-id type="cpan-module">Net::Server::Single</remote-id>
+    <remote-id type="cpan-module">Net::Server::TiedHandle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/net-sftp/metadata.xml b/dev-perl/net-sftp/metadata.xml
index bab92094f62e..cdc1b11a1f4b 100644
--- a/dev-perl/net-sftp/metadata.xml
+++ b/dev-perl/net-sftp/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SFTP</remote-id>
+    <remote-id type="cpan-module">Net::SFTP</remote-id>
+    <remote-id type="cpan-module">Net::SFTP::Attributes</remote-id>
+    <remote-id type="cpan-module">Net::SFTP::Buffer</remote-id>
+    <remote-id type="cpan-module">Net::SFTP::Constants</remote-id>
+    <remote-id type="cpan-module">Net::SFTP::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/net-ssh-perl/metadata.xml b/dev-perl/net-ssh-perl/metadata.xml
index c9f10b40a684..2622d19a95de 100644
--- a/dev-perl/net-ssh-perl/metadata.xml
+++ b/dev-perl/net-ssh-perl/metadata.xml
@@ -4,5 +4,57 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-SSH-Perl</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Agent</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::ChallengeResponse</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::KeyboardInt</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::Password</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::PublicKey</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::RSA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::Rhosts</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Auth::Rhosts_RSA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::AuthMgr</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Buffer</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Channel</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::ChannelMgr</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::Blowfish</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::CBC</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::CFB</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::DES</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::DES3</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::DES3::EDE3</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::IDEA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Cipher::RC4</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Comp</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Comp::Zlib</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Config</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Constants</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Handle</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Handle::SSH1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Handle::SSH2</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Kex</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Kex::DH1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Key</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Key::DSA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Key::RSA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Key::RSA1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Mac</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Mac::MD5</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Mac::SHA1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Packet</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::SSH1</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::SSH2</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Subsystem::Client</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Subsystem::Server</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::Authfile</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::Hosts</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::RSA</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::SSH1MP</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::SSH1Misc</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::SSH2MP</remote-id>
+    <remote-id type="cpan-module">Net::SSH::Perl::Util::Term</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/ogg-vorbis-header/metadata.xml b/dev-perl/ogg-vorbis-header/metadata.xml
index caacd3123139..1c1f6a19f650 100644
--- a/dev-perl/ogg-vorbis-header/metadata.xml
+++ b/dev-perl/ogg-vorbis-header/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Ogg-Vorbis-Header</remote-id>
+    <remote-id type="cpan-module">Ogg::Vorbis::Header</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/p5-Palm/metadata.xml b/dev-perl/p5-Palm/metadata.xml
index 45cd45375b20..dd90c652ff34 100644
--- a/dev-perl/p5-Palm/metadata.xml
+++ b/dev-perl/p5-Palm/metadata.xml
@@ -4,5 +4,16 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">p5-Palm</remote-id>
+    <remote-id type="cpan-module">Palm</remote-id>
+    <remote-id type="cpan-module">Palm::Address</remote-id>
+    <remote-id type="cpan-module">Palm::DateTime</remote-id>
+    <remote-id type="cpan-module">Palm::Datebook</remote-id>
+    <remote-id type="cpan-module">Palm::Mail</remote-id>
+    <remote-id type="cpan-module">Palm::Memo</remote-id>
+    <remote-id type="cpan-module">Palm::PDB</remote-id>
+    <remote-id type="cpan-module">Palm::Raw</remote-id>
+    <remote-id type="cpan-module">Palm::StdAppInfo</remote-id>
+    <remote-id type="cpan-module">Palm::ToDo</remote-id>
+    <remote-id type="cpan-module">Palm::ZirePhoto</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/perl-PBS/metadata.xml b/dev-perl/perl-PBS/metadata.xml
index 60a01dfcdf9f..4a4aba8e0204 100644
--- a/dev-perl/perl-PBS/metadata.xml
+++ b/dev-perl/perl-PBS/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>perl</herd>
-	<herd>cluster</herd>
+<herd>perl</herd>
+<herd>cluster</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
diff --git a/dev-perl/perl-ldap/metadata.xml b/dev-perl/perl-ldap/metadata.xml
index 703714fd63c5..167a06c44685 100644
--- a/dev-perl/perl-ldap/metadata.xml
+++ b/dev-perl/perl-ldap/metadata.xml
@@ -4,5 +4,55 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">perl-ldap</remote-id>
+    <remote-id type="cpan-module">Bundle::Net::LDAP</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::ldap</remote-id>
+    <remote-id type="cpan-module">LWP::Protocol::ldaps</remote-id>
+    <remote-id type="cpan-module">Net::LDAP</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::ASN</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Bind</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Constant</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::Assertion</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::EntryChange</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::ManageDsaIT</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::MatchedValues</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::Paged</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::PasswordPolicy</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::PersistentSearch</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::PostRead</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::PreRead</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::ProxyAuth</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::Sort</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::SortResult</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::SyncDone</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::SyncRequest</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::SyncState</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::VLV</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Control::VLVResponse</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::DSML</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::DSML::output</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::DSML::pp</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Entry</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extension</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extension::Cancel</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extension::Refresh</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extension::SetPassword</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extension::WhoAmI</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Extra</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Filter</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::FilterList</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::FilterMatch</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Intermediate</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Intermediate::SyncInfo</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::LDIF</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Message</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Message::Dummy</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Reference</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::RootDSE</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Schema</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Search</remote-id>
+    <remote-id type="cpan-module">Net::LDAP::Util</remote-id>
+    <remote-id type="cpan-module">Net::LDAPI</remote-id>
+    <remote-id type="cpan-module">Net::LDAPS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/perl-tk/metadata.xml b/dev-perl/perl-tk/metadata.xml
index 90c3d1d53879..38709a6646e7 100644
--- a/dev-perl/perl-tk/metadata.xml
+++ b/dev-perl/perl-tk/metadata.xml
@@ -4,5 +4,130 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tk</remote-id>
+    <remote-id type="cpan-module">Tie::Watch</remote-id>
+    <remote-id type="cpan-module">Tie::Watch::Array</remote-id>
+    <remote-id type="cpan-module">Tie::Watch::Hash</remote-id>
+    <remote-id type="cpan-module">Tie::Watch::Scalar</remote-id>
+    <remote-id type="cpan-module">Tk</remote-id>
+    <remote-id type="cpan-module">Tk::Adjuster</remote-id>
+    <remote-id type="cpan-module">Tk::Adjuster::Item</remote-id>
+    <remote-id type="cpan-module">Tk::After</remote-id>
+    <remote-id type="cpan-module">Tk::Animation</remote-id>
+    <remote-id type="cpan-module">Tk::Balloon</remote-id>
+    <remote-id type="cpan-module">Tk::Bitmap</remote-id>
+    <remote-id type="cpan-module">Tk::BrowseEntry</remote-id>
+    <remote-id type="cpan-module">Tk::Button</remote-id>
+    <remote-id type="cpan-module">Tk::Canvas</remote-id>
+    <remote-id type="cpan-module">Tk::Checkbutton</remote-id>
+    <remote-id type="cpan-module">Tk::Clipboard</remote-id>
+    <remote-id type="cpan-module">Tk::CmdLine</remote-id>
+    <remote-id type="cpan-module">Tk::ColorDialog</remote-id>
+    <remote-id type="cpan-module">Tk::ColorEditor</remote-id>
+    <remote-id type="cpan-module">Tk::ColorSelect</remote-id>
+    <remote-id type="cpan-module">Tk::Compound</remote-id>
+    <remote-id type="cpan-module">Tk::Configure</remote-id>
+    <remote-id type="cpan-module">Tk::Derived</remote-id>
+    <remote-id type="cpan-module">Tk::Dialog</remote-id>
+    <remote-id type="cpan-module">Tk::DialogBox</remote-id>
+    <remote-id type="cpan-module">Tk::DirTree</remote-id>
+    <remote-id type="cpan-module">Tk::DirTreeDialog</remote-id>
+    <remote-id type="cpan-module">Tk::Dirlist</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::Common</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::Local</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::Rect</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::SunConst</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::SunDrop</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::SunSite</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::Win32Drop</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::Win32Site</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::XDNDDrop</remote-id>
+    <remote-id type="cpan-module">Tk::DragDrop::XDNDSite</remote-id>
+    <remote-id type="cpan-module">Tk::DropSite</remote-id>
+    <remote-id type="cpan-module">Tk::DummyEncode</remote-id>
+    <remote-id type="cpan-module">Tk::DummyEncode::iso8859_1</remote-id>
+    <remote-id type="cpan-module">Tk::English</remote-id>
+    <remote-id type="cpan-module">Tk::Entry</remote-id>
+    <remote-id type="cpan-module">Tk::ErrorDialog</remote-id>
+    <remote-id type="cpan-module">Tk::Event</remote-id>
+    <remote-id type="cpan-module">Tk::Event::IO</remote-id>
+    <remote-id type="cpan-module">Tk::FBox</remote-id>
+    <remote-id type="cpan-module">Tk::FileSelect</remote-id>
+    <remote-id type="cpan-module">Tk::FloatEntry</remote-id>
+    <remote-id type="cpan-module">Tk::Font</remote-id>
+    <remote-id type="cpan-module">Tk::Frame</remote-id>
+    <remote-id type="cpan-module">Tk::HList</remote-id>
+    <remote-id type="cpan-module">Tk::IO</remote-id>
+    <remote-id type="cpan-module">Tk::IconList</remote-id>
+    <remote-id type="cpan-module">Tk::Image</remote-id>
+    <remote-id type="cpan-module">Tk::InputO</remote-id>
+    <remote-id type="cpan-module">Tk::ItemStyle</remote-id>
+    <remote-id type="cpan-module">Tk::JPEG</remote-id>
+    <remote-id type="cpan-module">Tk::LabEntry</remote-id>
+    <remote-id type="cpan-module">Tk::LabFrame</remote-id>
+    <remote-id type="cpan-module">Tk::LabRadiobutton</remote-id>
+    <remote-id type="cpan-module">Tk::Label</remote-id>
+    <remote-id type="cpan-module">Tk::LabeledEntryLabeledRadiobutton</remote-id>
+    <remote-id type="cpan-module">Tk::Labelframe</remote-id>
+    <remote-id type="cpan-module">Tk::Listbox</remote-id>
+    <remote-id type="cpan-module">Tk::MMtry</remote-id>
+    <remote-id type="cpan-module">Tk::MMutil</remote-id>
+    <remote-id type="cpan-module">Tk::MainWindow</remote-id>
+    <remote-id type="cpan-module">Tk::MakeDepend</remote-id>
+    <remote-id type="cpan-module">Tk::Menu</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Button</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Cascade</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Checkbutton</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Item</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Radiobutton</remote-id>
+    <remote-id type="cpan-module">Tk::Menu::Separator</remote-id>
+    <remote-id type="cpan-module">Tk::Menubar</remote-id>
+    <remote-id type="cpan-module">Tk::Menubutton</remote-id>
+    <remote-id type="cpan-module">Tk::Message</remote-id>
+    <remote-id type="cpan-module">Tk::MsgBox</remote-id>
+    <remote-id type="cpan-module">Tk::Mwm</remote-id>
+    <remote-id type="cpan-module">Tk::NBFrame</remote-id>
+    <remote-id type="cpan-module">Tk::NoteBook</remote-id>
+    <remote-id type="cpan-module">Tk::Optionmenu</remote-id>
+    <remote-id type="cpan-module">Tk::PNG</remote-id>
+    <remote-id type="cpan-module">Tk::Pane</remote-id>
+    <remote-id type="cpan-module">Tk::Panedwindow</remote-id>
+    <remote-id type="cpan-module">Tk::Photo</remote-id>
+    <remote-id type="cpan-module">Tk::Pixmap</remote-id>
+    <remote-id type="cpan-module">Tk::Pretty</remote-id>
+    <remote-id type="cpan-module">Tk::ProgressBar</remote-id>
+    <remote-id type="cpan-module">Tk::ROText</remote-id>
+    <remote-id type="cpan-module">Tk::Radiobutton</remote-id>
+    <remote-id type="cpan-module">Tk::Region</remote-id>
+    <remote-id type="cpan-module">Tk::Reindex</remote-id>
+    <remote-id type="cpan-module">Tk::ReindexedROText</remote-id>
+    <remote-id type="cpan-module">Tk::ReindexedText</remote-id>
+    <remote-id type="cpan-module">Tk::Scale</remote-id>
+    <remote-id type="cpan-module">Tk::Scrollbar</remote-id>
+    <remote-id type="cpan-module">Tk::Spinbox</remote-id>
+    <remote-id type="cpan-module">Tk::Stats</remote-id>
+    <remote-id type="cpan-module">Tk::Submethods</remote-id>
+    <remote-id type="cpan-module">Tk::TList</remote-id>
+    <remote-id type="cpan-module">Tk::Table</remote-id>
+    <remote-id type="cpan-module">Tk::Text</remote-id>
+    <remote-id type="cpan-module">Tk::Text::Tag</remote-id>
+    <remote-id type="cpan-module">Tk::TextEdit</remote-id>
+    <remote-id type="cpan-module">Tk::TextList</remote-id>
+    <remote-id type="cpan-module">Tk::TextUndo</remote-id>
+    <remote-id type="cpan-module">Tk::Tiler</remote-id>
+    <remote-id type="cpan-module">Tk::TixGrid</remote-id>
+    <remote-id type="cpan-module">Tk::Toplevel</remote-id>
+    <remote-id type="cpan-module">Tk::Trace</remote-id>
+    <remote-id type="cpan-module">Tk::Tree</remote-id>
+    <remote-id type="cpan-module">Tk::Widget</remote-id>
+    <remote-id type="cpan-module">Tk::WinPhoto</remote-id>
+    <remote-id type="cpan-module">Tk::Wm</remote-id>
+    <remote-id type="cpan-module">Tk::X</remote-id>
+    <remote-id type="cpan-module">Tk::X11Font</remote-id>
+    <remote-id type="cpan-module">Tk::Xlib</remote-id>
+    <remote-id type="cpan-module">Tk::Xrm</remote-id>
+    <remote-id type="cpan-module">Tk::install</remote-id>
+    <remote-id type="cpan-module">Tk::widgets</remote-id>
+    <remote-id type="cpan-module">WidgetDemo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/pgperl/metadata.xml b/dev-perl/pgperl/metadata.xml
index 5932ff0292d4..36ee0f08c67c 100644
--- a/dev-perl/pgperl/metadata.xml
+++ b/dev-perl/pgperl/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>
-<!--
-  <upstream>
-    <remote-id type="cpan">pgsql_perl5</remote-id>
-  </upstream>
--->
 </pkgmetadata>
diff --git a/dev-perl/prefork/metadata.xml b/dev-perl/prefork/metadata.xml
index dedb69cc2a26..74cc7d93945d 100644
--- a/dev-perl/prefork/metadata.xml
+++ b/dev-perl/prefork/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">prefork</remote-id>
+    <remote-id type="cpan-module">prefork</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/regexp-common/metadata.xml b/dev-perl/regexp-common/metadata.xml
index 2c11b4f6fead..bc4ef93a132f 100644
--- a/dev-perl/regexp-common/metadata.xml
+++ b/dev-perl/regexp-common/metadata.xml
@@ -4,5 +4,39 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Regexp-Common</remote-id>
+    <remote-id type="cpan-module">Regexp::Common</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::CC</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::Entry</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::SEN</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC1035</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC1738</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC1808</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC2384</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC2396</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::RFC2806</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::fax</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::file</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::ftp</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::gopher</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::http</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::news</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::pop</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::prospero</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::tel</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::telnet</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::tv</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::URI::wais</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::_support</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::balanced</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::comment</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::delimited</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::lingua</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::list</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::net</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::number</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::profanity</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::whitespace</remote-id>
+    <remote-id type="cpan-module">Regexp::Common::zip</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/self/metadata.xml b/dev-perl/self/metadata.xml
index 5e85de8c2e33..c5b8524c085b 100644
--- a/dev-perl/self/metadata.xml
+++ b/dev-perl/self/metadata.xml
@@ -7,5 +7,8 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">self</remote-id>
+    <remote-id type="cpan-module">DB</remote-id>
+    <remote-id type="cpan-module">self</remote-id>
+    <remote-id type="cpan-module">self::implicit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/set-scalar/metadata.xml b/dev-perl/set-scalar/metadata.xml
index 1fd70c73ad4d..8a2ab454975f 100644
--- a/dev-perl/set-scalar/metadata.xml
+++ b/dev-perl/set-scalar/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Set-Scalar</remote-id>
+    <remote-id type="cpan-module">Set::Scalar</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Base</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Null</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Real</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Universe</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Valued</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::ValuedUniverse</remote-id>
+    <remote-id type="cpan-module">Set::Scalar::Virtual</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/strictures/metadata.xml b/dev-perl/strictures/metadata.xml
index 1b844824bbf6..3887b57fecb9 100644
--- a/dev-perl/strictures/metadata.xml
+++ b/dev-perl/strictures/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">strictures</remote-id>
+		<remote-id type="cpan-module">strictures</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/string-crc32/metadata.xml b/dev-perl/string-crc32/metadata.xml
index c4ed1b0659ae..c2250391070d 100644
--- a/dev-perl/string-crc32/metadata.xml
+++ b/dev-perl/string-crc32/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">String-CRC32</remote-id>
+    <remote-id type="cpan-module">String::CRC32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/text-autoformat/metadata.xml b/dev-perl/text-autoformat/metadata.xml
index cda16e701336..95db1020808d 100644
--- a/dev-perl/text-autoformat/metadata.xml
+++ b/dev-perl/text-autoformat/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Autoformat</remote-id>
+    <remote-id type="cpan-module">Hang</remote-id>
+    <remote-id type="cpan-module">NullHang</remote-id>
+    <remote-id type="cpan-module">Text::Autoformat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/text-reform/metadata.xml b/dev-perl/text-reform/metadata.xml
index 322a7f48a0ad..e01a2546e01e 100644
--- a/dev-perl/text-reform/metadata.xml
+++ b/dev-perl/text-reform/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Reform</remote-id>
+    <remote-id type="cpan-module">Text::Reform</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/text-template/metadata.xml b/dev-perl/text-template/metadata.xml
index 8ad598bb7a2c..580f7783a33a 100644
--- a/dev-perl/text-template/metadata.xml
+++ b/dev-perl/text-template/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Template</remote-id>
+    <remote-id type="cpan-module">Text::Template</remote-id>
+    <remote-id type="cpan-module">Text::Template::Preprocess</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/text-wrapper/metadata.xml b/dev-perl/text-wrapper/metadata.xml
index 423ed5173c37..5593d20012be 100644
--- a/dev-perl/text-wrapper/metadata.xml
+++ b/dev-perl/text-wrapper/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Wrapper</remote-id>
+    <remote-id type="cpan-module">Text::Wrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/tie-encryptedhash/metadata.xml b/dev-perl/tie-encryptedhash/metadata.xml
index 4f00b84f77b1..dde200155cea 100644
--- a/dev-perl/tie-encryptedhash/metadata.xml
+++ b/dev-perl/tie-encryptedhash/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Tie-EncryptedHash</remote-id>
+    <remote-id type="cpan-module">Tie::EncryptedHash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/wxperl/metadata.xml b/dev-perl/wxperl/metadata.xml
index e156a2532ab7..497fd72cd6cb 100644
--- a/dev-perl/wxperl/metadata.xml
+++ b/dev-perl/wxperl/metadata.xml
@@ -4,5 +4,295 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Wx</remote-id>
+    <remote-id type="cpan-module">MY</remote-id>
+    <remote-id type="cpan-module">Wx</remote-id>
+    <remote-id type="cpan-module">Wx::AUI</remote-id>
+    <remote-id type="cpan-module">Wx::App</remote-id>
+    <remote-id type="cpan-module">Wx::ArchiveFSHandler</remote-id>
+    <remote-id type="cpan-module">Wx::ArrayStringProperty</remote-id>
+    <remote-id type="cpan-module">Wx::ArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::AuiManager</remote-id>
+    <remote-id type="cpan-module">Wx::AuiManagerEvent</remote-id>
+    <remote-id type="cpan-module">Wx::AuiNotebook</remote-id>
+    <remote-id type="cpan-module">Wx::AuiNotebookEvent</remote-id>
+    <remote-id type="cpan-module">Wx::BesthelpController</remote-id>
+    <remote-id type="cpan-module">Wx::BitmapDataObject</remote-id>
+    <remote-id type="cpan-module">Wx::BoolProperty</remote-id>
+    <remote-id type="cpan-module">Wx::CHMHelpController</remote-id>
+    <remote-id type="cpan-module">Wx::Calendar</remote-id>
+    <remote-id type="cpan-module">Wx::CalendarCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::CalendarEvent</remote-id>
+    <remote-id type="cpan-module">Wx::ColourProperty</remote-id>
+    <remote-id type="cpan-module">Wx::ColourPropertyValue</remote-id>
+    <remote-id type="cpan-module">Wx::ContextHelpButton</remote-id>
+    <remote-id type="cpan-module">Wx::CursorProperty</remote-id>
+    <remote-id type="cpan-module">Wx::DND</remote-id>
+    <remote-id type="cpan-module">Wx::DataObject</remote-id>
+    <remote-id type="cpan-module">Wx::DataObjectComposite</remote-id>
+    <remote-id type="cpan-module">Wx::DataObjectSimple</remote-id>
+    <remote-id type="cpan-module">Wx::DataView</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewBitmapRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewCustomRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewDateRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewEvent</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewIconTextRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewIndexListModel</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewModel</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewProgressRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewTextRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewTextRendererAttr</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewToggleRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewTreeCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::DataViewTreeStore</remote-id>
+    <remote-id type="cpan-module">Wx::DatagramSocket</remote-id>
+    <remote-id type="cpan-module">Wx::DateEvent</remote-id>
+    <remote-id type="cpan-module">Wx::DatePickerCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::DateProperty</remote-id>
+    <remote-id type="cpan-module">Wx::DateTime</remote-id>
+    <remote-id type="cpan-module">Wx::DirProperty</remote-id>
+    <remote-id type="cpan-module">Wx::DocChildFrame</remote-id>
+    <remote-id type="cpan-module">Wx::DocMDIChildFrame</remote-id>
+    <remote-id type="cpan-module">Wx::DocMDIParentFrame</remote-id>
+    <remote-id type="cpan-module">Wx::DocManager</remote-id>
+    <remote-id type="cpan-module">Wx::DocParentFrame</remote-id>
+    <remote-id type="cpan-module">Wx::DocPrintout</remote-id>
+    <remote-id type="cpan-module">Wx::DocView</remote-id>
+    <remote-id type="cpan-module">Wx::Document</remote-id>
+    <remote-id type="cpan-module">Wx::DropFilesEvent</remote-id>
+    <remote-id type="cpan-module">Wx::DropSource</remote-id>
+    <remote-id type="cpan-module">Wx::DropTarget</remote-id>
+    <remote-id type="cpan-module">Wx::Droptarget</remote-id>
+    <remote-id type="cpan-module">Wx::EditEnumProperty</remote-id>
+    <remote-id type="cpan-module">Wx::EnumProperty</remote-id>
+    <remote-id type="cpan-module">Wx::Event</remote-id>
+    <remote-id type="cpan-module">Wx::ExtHelpController</remote-id>
+    <remote-id type="cpan-module">Wx::FS</remote-id>
+    <remote-id type="cpan-module">Wx::FileDataObject</remote-id>
+    <remote-id type="cpan-module">Wx::FileDropTarget</remote-id>
+    <remote-id type="cpan-module">Wx::FileProperty</remote-id>
+    <remote-id type="cpan-module">Wx::FileSystemHandler</remote-id>
+    <remote-id type="cpan-module">Wx::FlagsProperty</remote-id>
+    <remote-id type="cpan-module">Wx::FloatProperty</remote-id>
+    <remote-id type="cpan-module">Wx::Font</remote-id>
+    <remote-id type="cpan-module">Wx::FontProperty</remote-id>
+    <remote-id type="cpan-module">Wx::GDIObject</remote-id>
+    <remote-id type="cpan-module">Wx::GenericMDIChildFrame</remote-id>
+    <remote-id type="cpan-module">Wx::GenericMDIClientWindow</remote-id>
+    <remote-id type="cpan-module">Wx::GenericMDIParentFrame</remote-id>
+    <remote-id type="cpan-module">Wx::GenericPageSetupDialog</remote-id>
+    <remote-id type="cpan-module">Wx::GenericPrintDialog</remote-id>
+    <remote-id type="cpan-module">Wx::GnomePrintDC</remote-id>
+    <remote-id type="cpan-module">Wx::Grid</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellAutoWrapStringEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellAutoWrapStringRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellBoolEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellBoolRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellChoiceEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellDateTimeRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellEditorEvtHandler</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellEnumEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellEnumRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellFloatEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellFloatRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellNumberEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellNumberRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellStringRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::GridCellTextEditor</remote-id>
+    <remote-id type="cpan-module">Wx::GridEditorCreatedEvent</remote-id>
+    <remote-id type="cpan-module">Wx::GridEvent</remote-id>
+    <remote-id type="cpan-module">Wx::GridRangeSelectEvent</remote-id>
+    <remote-id type="cpan-module">Wx::GridSizeEvent</remote-id>
+    <remote-id type="cpan-module">Wx::GridTableBase</remote-id>
+    <remote-id type="cpan-module">Wx::GridWindow</remote-id>
+    <remote-id type="cpan-module">Wx::Help</remote-id>
+    <remote-id type="cpan-module">Wx::HelpController</remote-id>
+    <remote-id type="cpan-module">Wx::HelpControllerBase</remote-id>
+    <remote-id type="cpan-module">Wx::HelpControllerHelpProvider</remote-id>
+    <remote-id type="cpan-module">Wx::HelpControllerHtml</remote-id>
+    <remote-id type="cpan-module">Wx::Html</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlCell</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlCellEvent</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlColourCell</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlContainerCell</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlFontCell</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlHelpController</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlLinkEvent</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlListBox</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlParser</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlTag</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlTagHandler</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlWidgetCell</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlWinParser</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlWinTagHandler</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlWindow</remote-id>
+    <remote-id type="cpan-module">Wx::HtmlWordCell</remote-id>
+    <remote-id type="cpan-module">Wx::IPV4address</remote-id>
+    <remote-id type="cpan-module">Wx::IPV6address</remote-id>
+    <remote-id type="cpan-module">Wx::IPaddress</remote-id>
+    <remote-id type="cpan-module">Wx::ImageFileProperty</remote-id>
+    <remote-id type="cpan-module">Wx::IntProperty</remote-id>
+    <remote-id type="cpan-module">Wx::InternetFSHandler</remote-id>
+    <remote-id type="cpan-module">Wx::Loader::Standard</remote-id>
+    <remote-id type="cpan-module">Wx::Locale</remote-id>
+    <remote-id type="cpan-module">Wx::Locale::T</remote-id>
+    <remote-id type="cpan-module">Wx::LongStringProperty</remote-id>
+    <remote-id type="cpan-module">Wx::MDI</remote-id>
+    <remote-id type="cpan-module">Wx::MDIChildFrame</remote-id>
+    <remote-id type="cpan-module">Wx::MDIClientWindow</remote-id>
+    <remote-id type="cpan-module">Wx::MDIParentFrame</remote-id>
+    <remote-id type="cpan-module">Wx::Media</remote-id>
+    <remote-id type="cpan-module">Wx::MediaCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::MediaEvent</remote-id>
+    <remote-id type="cpan-module">Wx::Menu</remote-id>
+    <remote-id type="cpan-module">Wx::Mini</remote-id>
+    <remote-id type="cpan-module">Wx::MultiChoiceProperty</remote-id>
+    <remote-id type="cpan-module">Wx::Object</remote-id>
+    <remote-id type="cpan-module">Wx::ObjectRefData</remote-id>
+    <remote-id type="cpan-module">Wx::Overload::Driver</remote-id>
+    <remote-id type="cpan-module">Wx::Overload::Handle</remote-id>
+    <remote-id type="cpan-module">Wx::PGArrayEditorDialog</remote-id>
+    <remote-id type="cpan-module">Wx::PGArrayStringEditorDialog</remote-id>
+    <remote-id type="cpan-module">Wx::PGCell</remote-id>
+    <remote-id type="cpan-module">Wx::PGCellRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::PGCheckBoxEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGChoiceAndButtonEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGChoiceEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGChoicesData</remote-id>
+    <remote-id type="cpan-module">Wx::PGComboBoxEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGDatePickerCtrlEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGDefaultRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::PGEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGFileDialogAdapter</remote-id>
+    <remote-id type="cpan-module">Wx::PGInDialogValidator</remote-id>
+    <remote-id type="cpan-module">Wx::PGLongStringDialogAdapter</remote-id>
+    <remote-id type="cpan-module">Wx::PGMultiButton</remote-id>
+    <remote-id type="cpan-module">Wx::PGProperty</remote-id>
+    <remote-id type="cpan-module">Wx::PGSpinCtrlEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGTextCtrlAndButtonEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PGTextCtrlEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PageSetupDialog</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::Carp</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::SplashFast</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::SplashFast::App</remote-id>
+    <remote-id type="cpan-module">Wx::Perl::TextValidator</remote-id>
+    <remote-id type="cpan-module">Wx::PlArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::PlCommand</remote-id>
+    <remote-id type="cpan-module">Wx::PlDataObjectSimple</remote-id>
+    <remote-id type="cpan-module">Wx::PlDataViewIndexListModel</remote-id>
+    <remote-id type="cpan-module">Wx::PlDropTarget</remote-id>
+    <remote-id type="cpan-module">Wx::PlFSFile</remote-id>
+    <remote-id type="cpan-module">Wx::PlFileSystemHandler</remote-id>
+    <remote-id type="cpan-module">Wx::PlGridCellEditor</remote-id>
+    <remote-id type="cpan-module">Wx::PlGridCellRenderer</remote-id>
+    <remote-id type="cpan-module">Wx::PlGridTable</remote-id>
+    <remote-id type="cpan-module">Wx::PlHtmlListBox</remote-id>
+    <remote-id type="cpan-module">Wx::PlHtmlTag</remote-id>
+    <remote-id type="cpan-module">Wx::PlHtmlTagHandler</remote-id>
+    <remote-id type="cpan-module">Wx::PlHtmlWinTagHandler</remote-id>
+    <remote-id type="cpan-module">Wx::PlPreviewControlBar</remote-id>
+    <remote-id type="cpan-module">Wx::PlPreviewFrame</remote-id>
+    <remote-id type="cpan-module">Wx::PlThreadEvent</remote-id>
+    <remote-id type="cpan-module">Wx::PlXmlResourceHandler</remote-id>
+    <remote-id type="cpan-module">Wx::PliXmlSubclassFactory</remote-id>
+    <remote-id type="cpan-module">Wx::PostScriptDC</remote-id>
+    <remote-id type="cpan-module">Wx::PostScriptPrintPreview</remote-id>
+    <remote-id type="cpan-module">Wx::PostScriptPrinter</remote-id>
+    <remote-id type="cpan-module">Wx::PreviewCanvas</remote-id>
+    <remote-id type="cpan-module">Wx::PreviewControlBar</remote-id>
+    <remote-id type="cpan-module">Wx::PreviewFrame</remote-id>
+    <remote-id type="cpan-module">Wx::Print</remote-id>
+    <remote-id type="cpan-module">Wx::PrintDialog</remote-id>
+    <remote-id type="cpan-module">Wx::PrintPaperType</remote-id>
+    <remote-id type="cpan-module">Wx::PrintPreview</remote-id>
+    <remote-id type="cpan-module">Wx::PrintPreviewBase</remote-id>
+    <remote-id type="cpan-module">Wx::PrinterDC</remote-id>
+    <remote-id type="cpan-module">Wx::Printout</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyCategory</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyGrid</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyGridIterator</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyGridIteratorBase</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyGridManager</remote-id>
+    <remote-id type="cpan-module">Wx::PropertyGridPage</remote-id>
+    <remote-id type="cpan-module">Wx::RadioBox</remote-id>
+    <remote-id type="cpan-module">Wx::Ribbon</remote-id>
+    <remote-id type="cpan-module">Wx::RibbonAUIArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::RibbonArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::RibbonDefaultArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::RibbonMSWArtProvider</remote-id>
+    <remote-id type="cpan-module">Wx::RichText</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextBox</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextBuffer</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextCharacterStyleDefinition</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextCompositeObject</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextEvent</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextFormattingDialog</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextHTMLHandler</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextHeaderFooterData</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextListStyleDefinition</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextObject</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextParagraphLayoutBox</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextParagraphStyleDefinition</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextPrinting</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextStyleComboCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextStyleDefinition</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextStyleListBox</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextStyleListCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextStyleOrganiserDialog</remote-id>
+    <remote-id type="cpan-module">Wx::RichTextXMLHandler</remote-id>
+    <remote-id type="cpan-module">Wx::STC</remote-id>
+    <remote-id type="cpan-module">Wx::SimpleApp</remote-id>
+    <remote-id type="cpan-module">Wx::SimpleHelpProvider</remote-id>
+    <remote-id type="cpan-module">Wx::SimpleHtmlListBox</remote-id>
+    <remote-id type="cpan-module">Wx::Socket</remote-id>
+    <remote-id type="cpan-module">Wx::Socket::Event</remote-id>
+    <remote-id type="cpan-module">Wx::SocketClient</remote-id>
+    <remote-id type="cpan-module">Wx::SocketEvent</remote-id>
+    <remote-id type="cpan-module">Wx::SocketServer</remote-id>
+    <remote-id type="cpan-module">Wx::StringProperty</remote-id>
+    <remote-id type="cpan-module">Wx::StyledTextCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::StyledTextEvent</remote-id>
+    <remote-id type="cpan-module">Wx::SymbolPickerDialog</remote-id>
+    <remote-id type="cpan-module">Wx::SystemColourProperty</remote-id>
+    <remote-id type="cpan-module">Wx::TextAttrEx</remote-id>
+    <remote-id type="cpan-module">Wx::TextDataObject</remote-id>
+    <remote-id type="cpan-module">Wx::TextDropTarget</remote-id>
+    <remote-id type="cpan-module">Wx::TimePickerCtrl</remote-id>
+    <remote-id type="cpan-module">Wx::Timer</remote-id>
+    <remote-id type="cpan-module">Wx::TimerRunner</remote-id>
+    <remote-id type="cpan-module">Wx::TreeItemId</remote-id>
+    <remote-id type="cpan-module">Wx::UIntProperty</remote-id>
+    <remote-id type="cpan-module">Wx::UNIXaddress</remote-id>
+    <remote-id type="cpan-module">Wx::URLDataObject</remote-id>
+    <remote-id type="cpan-module">Wx::View</remote-id>
+    <remote-id type="cpan-module">Wx::WebView</remote-id>
+    <remote-id type="cpan-module">Wx::WebViewArchiveHandler</remote-id>
+    <remote-id type="cpan-module">Wx::WebViewEvent</remote-id>
+    <remote-id type="cpan-module">Wx::WebViewHandler</remote-id>
+    <remote-id type="cpan-module">Wx::WinHelpController</remote-id>
+    <remote-id type="cpan-module">Wx::WindowsPrintPreview</remote-id>
+    <remote-id type="cpan-module">Wx::WindowsPrinter</remote-id>
+    <remote-id type="cpan-module">Wx::XRC</remote-id>
+    <remote-id type="cpan-module">Wx::ZipFSHandler</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Any_OS</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Any_wx_config</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Core</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Core::Dummy</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Hacks</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::MacOSX_GCC</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Win32</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Win32_MSVC</remote-id>
+    <remote-id type="cpan-module">Wx::build::MakeMaker::Win32_MinGW</remote-id>
+    <remote-id type="cpan-module">Wx::build::Options</remote-id>
+    <remote-id type="cpan-module">Wx::build::Utils</remote-id>
+    <remote-id type="cpan-module">build::Wx::XSP::Enum</remote-id>
+    <remote-id type="cpan-module">build::Wx::XSP::Event</remote-id>
+    <remote-id type="cpan-module">build::Wx::XSP::Overload</remote-id>
+    <remote-id type="cpan-module">build::Wx::XSP::Virtual</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/yaml/metadata.xml b/dev-perl/yaml/metadata.xml
index 83e12763f883..9e1dc7552712 100644
--- a/dev-perl/yaml/metadata.xml
+++ b/dev-perl/yaml/metadata.xml
@@ -4,5 +4,29 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">YAML</remote-id>
+    <remote-id type="cpan-module">Test::YAML</remote-id>
+    <remote-id type="cpan-module">Test::YAML::Filter</remote-id>
+    <remote-id type="cpan-module">YAML</remote-id>
+    <remote-id type="cpan-module">YAML::Any</remote-id>
+    <remote-id type="cpan-module">YAML::Dumper</remote-id>
+    <remote-id type="cpan-module">YAML::Dumper::Base</remote-id>
+    <remote-id type="cpan-module">YAML::Error</remote-id>
+    <remote-id type="cpan-module">YAML::Loader</remote-id>
+    <remote-id type="cpan-module">YAML::Loader::Base</remote-id>
+    <remote-id type="cpan-module">YAML::Marshall</remote-id>
+    <remote-id type="cpan-module">YAML::Mo</remote-id>
+    <remote-id type="cpan-module">YAML::Node</remote-id>
+    <remote-id type="cpan-module">YAML::Tag</remote-id>
+    <remote-id type="cpan-module">YAML::Type::blessed</remote-id>
+    <remote-id type="cpan-module">YAML::Type::code</remote-id>
+    <remote-id type="cpan-module">YAML::Type::glob</remote-id>
+    <remote-id type="cpan-module">YAML::Type::ref</remote-id>
+    <remote-id type="cpan-module">YAML::Type::regexp</remote-id>
+    <remote-id type="cpan-module">YAML::Type::undef</remote-id>
+    <remote-id type="cpan-module">YAML::Types</remote-id>
+    <remote-id type="cpan-module">YAML::Warning</remote-id>
+    <remote-id type="cpan-module">yaml_mapping</remote-id>
+    <remote-id type="cpan-module">yaml_scalar</remote-id>
+    <remote-id type="cpan-module">yaml_sequence</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/yaml/yaml-0.810.0.ebuild b/dev-perl/yaml/yaml-0.810.0.ebuild
index 653dbfff4fa8..07b9263eb569 100644
--- a/dev-perl/yaml/yaml-0.810.0.ebuild
+++ b/dev-perl/yaml/yaml-0.810.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/yaml/yaml-0.810.0.ebuild,v 1.1 2012/04/19 18:41:37 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.810.0.ebuild,v 1.2 2012/06/24 10:54:07 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 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"
+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=""
 
 SRC_TEST="do"
diff --git a/dev-php/DBUnit/DBUnit-1.0.1.ebuild b/dev-php/DBUnit/DBUnit-1.0.1.ebuild
index 19d6fc517b98..0b5ec0221f30 100644
--- a/dev-php/DBUnit/DBUnit-1.0.1.ebuild
+++ b/dev-php/DBUnit/DBUnit-1.0.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/dev-php/DBUnit/DBUnit-1.0.1.ebuild,v 1.1 2012/03/10 16:37:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/DBUnit/DBUnit-1.0.1.ebuild,v 1.2 2012/06/24 18:36:12 olemarkus Exp $
 
 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@@ -16,7 +16,6 @@ IUSE=""
 HOMEPAGE="http://www.phpunit.de"
 
 RDEPEND="${RDEPEND}
-	>=dev-php/ezc-ConsoleTools-1.6
 	>=dev-php/File_Iterator-1.2.2
 	dev-php/PHP_TokenStream
 	dev-php/Text_Template"
diff --git a/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild b/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild
index 3eb0c3f9ef33..56c070961285 100644
--- a/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild
+++ b/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild
@@ -1,8 +1,11 @@
-# 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-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild,v 1.1 2012/03/10 15:24:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.0.ebuild,v 1.2 2012/06/24 18:17:51 olemarkus Exp $
 
 EAPI="2"
+PHP_PEAR_PN="PHPUnit_Selenium"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+
 inherit php-pear-lib-r1
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild b/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild
index 6064641e7137..b640a1cbdda4 100644
--- a/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild
+++ b/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild
@@ -1,10 +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-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild,v 1.1 2012/03/10 15:24:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild,v 1.2 2012/06/24 18:17:51 olemarkus Exp $
 
 EAPI="2"
 inherit php-pear-lib-r1
 
+PHP_PEAR_PN="PHPUnit_Selenium"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+
 KEYWORDS="amd64 x86"
 
 DESCRIPTION="Selenium RC integration for PHPUnit"
diff --git a/dev-php/PHPUnit_Selenium/files/channel.xml b/dev-php/PHPUnit_Selenium/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/PHPUnit_Selenium/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+    <name>pear.phpunit.de</name>
+    <summary>PHPUnit PEAR Channel</summary>
+    <suggestedalias>phpunit</suggestedalias>
+    <servers>
+        <primary>
+            <rest>
+                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+            </rest>
+        </primary>
+    </servers>
+</channel>
\ No newline at end of file
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index f00b1b5e86b0..4830663a1eaf 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -1,3 +1,2 @@
 DIST PHP_CodeCoverage-1.0.4.tgz 115029 RMD160 d97c80a367160c34305038ac48bcfcaf02f06dac SHA1 eec17abdef0a580f53eb80795795c087680dd1ad SHA256 705213d2967fb96bfbf862072ab6936f8b78338d0fca76e21b42c17e33f4251f
-DIST PHP_CodeCoverage-1.1.0.tgz 132037 RMD160 9e5acc1bd87987ee27568067f6f48299a45ba78f SHA1 f0cdf652b99392e1176fa8d76c6e14311303510b SHA256 21f0354dd308f8c25ffb44e5aac0a56b7c3aef3c29ba6ccc063f450e2d05c1d1
 DIST PHP_CodeCoverage-1.1.2.tgz 132552 RMD160 be5e27c6588edf5c2874c0a1023a160270399e8b SHA1 d56c359e6fdbc29d039dea0b2c37298f266a7170 SHA256 42b3aefe23034bce0653460a4e6a79908de17e2d8674c013a116937449dcfe80
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.0.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.0.ebuild
deleted file mode 100644
index 10600afb2844..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.0.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-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.0.ebuild,v 1.2 2012/03/10 15:28:43 olemarkus Exp $
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_URI="pear.phpunit.de"
-PHP_PEAR_PN="PHP_CodeCoverage"
-inherit php-pear-lib-r1
-
-DESCRIPTION="Library that provides collection, processing, and rendering functionality for PHP code coverage"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://pear.phpunit.de"
-
-RDEPEND="${RDEPEND}
-	>=dev-php/ezc-ConsoleTools-1.6
-	>=dev-php/File_Iterator-1.3.0
-	>=dev-php/PHP_TokenStream-1.1.0
-	>=dev-php/Text_Template-1.1.1"
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.8.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.8.ebuild
new file mode 100644
index 000000000000..86a8d8e0e504
--- /dev/null
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/CoverageTestRunner/CoverageTestRunner-1.8.ebuild,v 1.1 2012/06/24 15:09:38 mschiff Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6:2.7"
+
+inherit distutils python
+
+MY_PN="python-coverage-test-runner"
+DESCRIPTION="fail Python program unit tests unless they test everything"
+HOMEPAGE="http://liw.fi/coverage-test-runner/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/coverage"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/Manifest b/dev-python/CoverageTestRunner/Manifest
new file mode 100644
index 000000000000..96d891486dde
--- /dev/null
+++ b/dev-python/CoverageTestRunner/Manifest
@@ -0,0 +1 @@
+DIST python-coverage-test-runner_1.8.orig.tar.gz 19475 RMD160 a539b483484b48d21d90a16e3e1d84c11d07819c SHA1 0e23e2e544ece13887a72bed632c48ab74402814 SHA256 89088a491dac7edd522c00f45263abefc7f9f12c0fca1c122c2c5585573649dc
diff --git a/app-text/kiwix/metadata.xml b/dev-python/CoverageTestRunner/metadata.xml
similarity index 66%
rename from app-text/kiwix/metadata.xml
rename to dev-python/CoverageTestRunner/metadata.xml
index 8a9b49eec325..ea7bd021a21e 100644
--- a/app-text/kiwix/metadata.xml
+++ b/dev-python/CoverageTestRunner/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>chithanh@gentoo.org</email>
-		<name>Chí-Thanh Christopher Nguyễn</name>
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/dev-python/PyQt4/PyQt4-4.9.2.ebuild b/dev-python/PyQt4/PyQt4-4.9.2.ebuild
index 40312282592b..07fca39b1b5e 100644
--- a/dev-python/PyQt4/PyQt4-4.9.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.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-python/PyQt4/PyQt4-4.9.2.ebuild,v 1.1 2012/06/21 18:42:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.2.ebuild,v 1.2 2012/06/23 17:44:58 hwoarang Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-python/sip-4.13.1
+	>=dev-python/sip-4.13.3
 	>=x11-libs/qt-core-${QT_VER}:4
 	>=x11-libs/qt-script-${QT_VER}:4
 	X? (
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index ab73bbc15ab3..6209fe6d06a1 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,5 @@
 DIST apsw-3.7.10-r1.zip 619967 RMD160 d198353402f9ac7757b98308cef49657fadac1f5 SHA1 948f28897e20168a0db159ca2ba4d993df43f831 SHA256 5a2be6baeb3dc58df53169979a5c27cea8a1db24ca9b174f8e18b81a46bd2406
 DIST apsw-3.7.11-r1.zip 630985 RMD160 398ee96783b2f2df4dfc94e1e49ac9de9757e047 SHA1 aea455ea2e5f8091af61332a5ea394994970212f SHA256 24fb23531500a5a34102d59c3f404735d2123b7eff7e24176db4a7a777df56c4
 DIST apsw-3.7.12-r1.zip 631956 RMD160 3374e32feb2d8c89f3debb025a5468b98a8f2407 SHA1 0368658a9bb62d539977f23f09ea645e9f142a89 SHA256 4f2be24f42114df4d2b0054b4938c79aaa6b45e3ed5c7582cb57669c1872e3a7
+DIST apsw-3.7.13-r1.zip 632647 RMD160 68792ed759afb14536c78f102f7f869f167f05a4 SHA1 58c2596ca1801ce210fe593893935ecf84d73d50 SHA256 5f26b670069b1bde2635a219db2314c674bb7d7d9ffffd24fd8a32ee637eda2c
 DIST apsw-3.7.6.2-r1.zip 597673 RMD160 7a7e50432bd6cf5785e6f98f1edeec20a0c0a0ae SHA1 fa4aec08e59fa5964197f59ba42408d64031675b SHA256 cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb
diff --git a/dev-python/apsw/apsw-3.7.13.1.ebuild b/dev-python/apsw/apsw-3.7.13.1.ebuild
new file mode 100644
index 000000000000..98b688cffdf6
--- /dev/null
+++ b/dev-python/apsw/apsw-3.7.13.1.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/dev-python/apsw/apsw-3.7.13.1.ebuild,v 1.1 2012/06/24 07:05:19 radhermit Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+
+inherit distutils eutils versionator
+
+MY_PV="$(replace_version_separator 3 -r)"
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="http://code.google.com/p/apsw/"
+SRC_URI="http://apsw.googlecode.com/files/${PN}-${MY_PV}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-$(get_version_component_range 1-3)[extensions]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch"
+}
+
+src_compile() {
+	distutils_src_compile --enable=load_extension
+}
+
+src_test() {
+	echo "$(PYTHON -f)" setup.py build_test_extension
+	"$(PYTHON -f)" setup.py build_test_extension || die "Building of test loadable extension failed"
+
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" tests.py -v
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc ; then
+		dohtml -r doc/*
+	fi
+}
diff --git a/dev-python/cliapp/cliapp-0.29.ebuild b/dev-python/cliapp/cliapp-0.29.ebuild
index f1f111b294db..5b0be0277759 100644
--- a/dev-python/cliapp/cliapp-0.29.ebuild
+++ b/dev-python/cliapp/cliapp-0.29.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/cliapp/cliapp-0.29.ebuild,v 1.1 2012/06/15 10:16:15 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-0.29.ebuild,v 1.2 2012/06/24 15:13:58 mschiff Exp $
 
 EAPI=4
 
@@ -17,7 +17,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="test? ( dev-python/CoverageTestRunner )"
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
+
+src_test() {
+	# remove build directory so tests will not fail
+	# due to tests defined twice
+	rm -rf "${S}"/build
+	default
+}
diff --git a/dev-python/netaddr/netaddr-0.7.7.ebuild b/dev-python/netaddr/netaddr-0.7.7.ebuild
index 00f97e3b8474..a986a0e6681f 100644
--- a/dev-python/netaddr/netaddr-0.7.7.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.7.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-python/netaddr/netaddr-0.7.7.ebuild,v 1.1 2012/06/22 08:20:11 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.7.ebuild,v 1.2 2012/06/23 22:50:34 radhermit Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.* *-jython"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
 
 inherit distutils
 
@@ -20,13 +20,6 @@ IUSE="cli"
 DEPEND=""
 RDEPEND="cli? ( dev-python/ipython )"
 
-src_prepare() {
-	distutils_src_prepare
-
-	# https://github.com/drkjam/netaddr/issues/20
-	sed -e "s/AddrFormatError/netaddr.core.AddrFormatError/" -i netaddr/tests/3.x/ip/{platform_linux2.txt,platform_win32.txt}
-}
-
 src_test() {
 	testing() {
 		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" netaddr/tests/__init__.py
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index c42cbfe2a952..c309512fc294 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,3 +1,5 @@
 DIST py3dns-3.0.1.tar.gz 28693 RMD160 45197730463a7b8c89fa4bb2f573d1117b15a0a6 SHA1 09831f052b26cf0688b3eca708ae88b1551c4152 SHA256 4524cdb058795108c3835bfbbfea7595cd2d8a37ee477ea9f552360f24ed63b7
+DIST py3dns-3.0.2.tar.gz 29375 RMD160 cecba43a3bc39ae84325b563f3e53e2d473422f2 SHA1 68d4abba4ad5f6501d2c62faeed63f1fe445730c SHA256 c0eb897b847a539f8eef734b5aa4decaa4d7c777cb6a4ac85777549971399ad2
 DIST pydns-2.3.4.tar.gz 24513 RMD160 43d63deeda868a8295ddb7125bea38fb8504cd02 SHA1 544e3c0e64d58f556c53fb1eba44d0cc652801d7 SHA256 2d6ced52ad1e893d0ed6eca76b4b1eccdafbd76c54b41d2fa9cdaacd702853ea
 DIST pydns-2.3.5.tar.gz 27473 RMD160 d7cc7c2e97ac9c7b4ae051860301880609439e2a SHA1 d924787c42c86124774f0b54a85983570e925265 SHA256 c2385c17625bd19b1891c1c96319e8f5c2b2e8ba5d9d7bfd6459bbf10067c940
+DIST pydns-2.3.6.tar.gz 28220 RMD160 6b9e79b8b4bed84f9e121d764a65ba1a1c6f4c4b SHA1 1e0c11248071d3fac0a2d7516b1d2894388edbac SHA256 d3cf6fc4ec088e934cf2dd4d71080efdb5c09ae79cbb2512427eb0fc393f2417
diff --git a/dev-python/pydns/pydns-2.3.5.ebuild b/dev-python/pydns/pydns-2.3.6.ebuild
similarity index 58%
rename from dev-python/pydns/pydns-2.3.5.ebuild
rename to dev-python/pydns/pydns-2.3.6.ebuild
index 8e0eb3592b44..f8a7b406aa54 100644
--- a/dev-python/pydns/pydns-2.3.5.ebuild
+++ b/dev-python/pydns/pydns-2.3.6.ebuild
@@ -1,26 +1,28 @@
-# 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-python/pydns/pydns-2.3.5.ebuild,v 1.1 2011/07/10 00:51:10 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-2.3.6.ebuild,v 1.1 2012/06/24 12:22:55 sbriesen Exp $
 
-EAPI="2"
+EAPI="4"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils
 
 DESCRIPTION="Python module for DNS (Domain Name Service)"
 HOMEPAGE="http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/${P}/${P}.tar.gz"
+SRC_URI="http://downloads.sourceforge.net/project/pydns/pydns/${P}/${P}.tar.gz"
 
 LICENSE="CNRI"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="virtual/libiconv"
+DEPEND="!dev-python/pydns:0
+	virtual/libiconv"
 RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
 
-DOCS="CREDITS.txt"
+DOCS="CREDITS"
 PYTHON_MODNAME="DNS"
 
 src_prepare() {
@@ -30,10 +32,15 @@ src_prepare() {
 	done
 
 	# Don't compile bytecode.
-	sed -i -e 's:^\(compile\).*:\1 = 0:g' -e 's:^\(optimize\).*:\1 = 0:g' setup.cfg
+	sed -i -e 's:^\(compile\|optimize\).*:\1 = 0:g' setup.cfg
 
 	# Fix Python shebangs in examples.
-	sed -i -e 's:#!/.*\(python\).*/*$:#!/usr/bin/\12:g' {tests,tools}/*.py
+	python_convert_shebangs -r 2 .
+
+	# cleanup docs
+	rm -f -- "README-guido.txt"
+	mv -f -- "README.txt" "README"
+	mv -f -- "CREDITS.txt" "CREDITS"
 }
 
 src_install(){
@@ -41,6 +48,7 @@ src_install(){
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
 		doins tests/*.py tools/*.py
 	fi
 }
diff --git a/dev-python/pydns/pydns-3.0.2.ebuild b/dev-python/pydns/pydns-3.0.2.ebuild
new file mode 100644
index 000000000000..28b6db9267f9
--- /dev/null
+++ b/dev-python/pydns/pydns-3.0.2.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-python/pydns/pydns-3.0.2.ebuild,v 1.1 2012/06/24 12:22:55 sbriesen Exp $
+
+EAPI="4"
+PYTHON_DEPEND="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.*"
+
+inherit distutils
+
+DESCRIPTION="Python module for DNS (Domain Name Service)"
+HOMEPAGE="http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns"
+SRC_URI="http://downloads.sourceforge.net/project/pydns/py3dns/${P/py/py3}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="!dev-python/py3dns
+	virtual/libiconv"
+RDEPEND=""
+
+DOCS="CHANGES CREDITS"
+PYTHON_MODNAME="DNS"
+
+S="${WORKDIR}/${P/py/py3}"
+
+src_prepare() {
+	# Don't compile bytecode.
+	sed -i -e 's:^\(compile\|optimize\).*:\1 = 0:g' setup.cfg
+
+	# cleanup docs
+	rm -f -- "README-guido.txt"
+	mv -f -- "README.txt" "README"
+	mv -f -- "CREDITS.txt" "CREDITS"
+}
+
+src_install(){
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
+		doins tests/*.py tools/*.py
+	fi
+}
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index c798924ac6d0..8cfb6c778103 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,2 +1,3 @@
 DIST pyxdg-0.19.tar.gz 38170 RMD160 8029086a3db742493dcbbd00dc9893fef1c0d50b SHA1 71162cf78c2fd0152d795ebe57984fc48226249b SHA256 99cf27e00f1484eeeea31aa47de52644284dca34adf73b715e87fb0a3b8d4ad5
 DIST pyxdg-0.20_rc1-snapshot.tar.gz 39714 RMD160 6c405188858bf2b8eb2881696f0535fae4dd3ee0 SHA1 0eab2abc14aeff5b12c17c2417549374ea46ad82 SHA256 5e7675f011d807413d2db14ae05e1ff7a1d20e723a8ea7aafa92501bbfd66192
+DIST pyxdg-0.20_rc1_p20120624.tar.xz 34744 RMD160 79ba8281b52321519182cef903902e0429d181fd SHA1 d1a0914ae027d2c28a263dcd953d612d57362452 SHA256 a6bb07559de9f10bbe9ad06303896b73fb8b0f7ccfc89ffe632c8d67cb5ba37f
diff --git a/dev-python/pyxdg/pyxdg-0.20_rc1_p20120624.ebuild b/dev-python/pyxdg/pyxdg-0.20_rc1_p20120624.ebuild
new file mode 100644
index 000000000000..7389fd8a8ad1
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.20_rc1_p20120624.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.20_rc1_p20120624.ebuild,v 1.1 2012/06/24 16:01:53 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6 3:3.2"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.5 3.1 *-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples"
+
+PYTHON_MODNAME=xdg
+
+DOCS="AUTHORS ChangeLog README TODO"
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc test/*.py
+	fi
+}
diff --git a/dev-python/subunit/subunit-0.0.8.ebuild b/dev-python/subunit/subunit-0.0.8.ebuild
index c4a50ee0957f..8b5e97886575 100644
--- a/dev-python/subunit/subunit-0.0.8.ebuild
+++ b/dev-python/subunit/subunit-0.0.8.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.8.ebuild,v 1.2 2012/05/20 14:14:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.8.ebuild,v 1.3 2012/06/24 14:27:17 floppym Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-pypy-*" # mis-detected sitedir
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
+# Automake build does not genereate the correct value for site-packages
+# with pypy.
+RESTRICT_PYTHON_ABIS="*-pypy-*"
+
 inherit python
 
 DESCRIPTION="A streaming protocol for test results"
diff --git a/dev-ruby/right_http_connection/right_http_connection-1.3.0.ebuild b/dev-ruby/right_http_connection/right_http_connection-1.3.0.ebuild
index 406c65c900b4..1d2689584e6d 100644
--- a/dev-ruby/right_http_connection/right_http_connection-1.3.0.ebuild
+++ b/dev-ruby/right_http_connection/right_http_connection-1.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-ruby/right_http_connection/right_http_connection-1.3.0.ebuild,v 1.2 2012/05/01 18:24:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_http_connection/right_http_connection-1.3.0.ebuild,v 1.3 2012/06/24 05:12:36 graaff Exp $
 
 EAPI=4
 
@@ -23,8 +23,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
+RESTRICT="test"
+#USE_RUBY="ruby19 ree18" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
 all_ruby_prepare() {
 	rm Gemfile Gemfile.lock || die
+	sed -i -e '/bundler/ s:^:#:' features/support/env.rb || die
 }
 
 each_ruby_test() {
@@ -34,7 +38,7 @@ each_ruby_test() {
 		*jruby)
 			;;
 		*)
-			each_fakegem_test
+			${RUBY} -S cucumber features || die
 			;;
 	esac
 }
diff --git a/dev-util/ccache/ccache-3.1.7.ebuild b/dev-util/ccache/ccache-3.1.7.ebuild
index 84a7f8a2af7b..ebe31ca83bdc 100644
--- a/dev-util/ccache/ccache-3.1.7.ebuild
+++ b/dev-util/ccache/ccache-3.1.7.ebuild
@@ -1,8 +1,10 @@
 # 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.6 2012/06/07 22:15:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.7.ebuild,v 1.7 2012/06/24 03:28:03 vapier Exp $
 
-inherit multilib
+EAPI="4"
+
+inherit multilib eutils
 
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
@@ -16,19 +18,20 @@ IUSE=""
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# make sure we always use system zlib
 	rm -rf zlib
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	sed \
+		-e "/^LIBDIR=/s:lib:$(get_libdir):" \
+		"${FILESDIR}"/ccache-config > ccache-config || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
 
-	dobin "${FILESDIR}"/ccache-config || die
-	dosed "/^LIBDIR=/s:lib:$(get_libdir):" /usr/bin/ccache-config
+	dobin ccache-config
 
 	diropts -m0700
 	dodir /root/.ccache
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
new file mode 100644
index 000000000000..5abd15e1aaff
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
@@ -0,0 +1,15 @@
+avoid weak perl usage in tests
+
+https://bugs.gentoo.org/421609
+
+--- a/test.sh
++++ b/test.sh
+@@ -1466,7 +1466,7 @@
+     mkdir -p $dir
+     i=0
+     while [ $i -lt 10 ]; do
+-        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+         touch $dir/result$i-4017.stderr
+         touch $dir/result$i-4017.d
+         if [ $i -gt 5 ]; then
diff --git a/dev-util/google-perftools/google-perftools-1.8.3.ebuild b/dev-util/google-perftools/google-perftools-1.8.3.ebuild
index 66c6cc24306d..564df3b6bcba 100644
--- a/dev-util/google-perftools/google-perftools-1.8.3.ebuild
+++ b/dev-util/google-perftools/google-perftools-1.8.3.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-util/google-perftools/google-perftools-1.8.3.ebuild,v 1.2 2011/08/28 15:22:40 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.8.3.ebuild,v 1.3 2012/06/24 10:39:50 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 IUSE="largepages +debug minimal" # test"
 
 DEPEND="sys-libs/libunwind"
diff --git a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
new file mode 100644
index 000000000000..80eb29a46f05
--- /dev/null
+++ b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
@@ -0,0 +1,178 @@
+From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Tue, 22 May 2012 16:25:37 -0700
+Subject: [PATCH] aapl: fix building with gcc-4.7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with GCC 4.7, you have to explicit methods inherited from
+base templates, otherwise it will refuse to build.
+
+---
+
+The URL reported in the README is no longer registered, so I couldn't
+find a way to report this to an upstream project.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aapl/avlcommon.h  |   12 ++++++------
+ aapl/bstcommon.h  |   16 ++++++++--------
+ aapl/bubblesort.h |    2 +-
+ aapl/mergesort.h  |    2 +-
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
+index 06983bc..2e3c190 100644
+--- a/aapl/avlcommon.h
++++ b/aapl/avlcommon.h
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()),
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
+index 888717f..7c53ff3 100644
+--- a/aapl/bstcommon.h
++++ b/aapl/bstcommon.h
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
+index bcc2fb6..f0f4ce5 100644
+--- a/aapl/bubblesort.h
++++ b/aapl/bubblesort.h
+@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
+diff --git a/aapl/mergesort.h b/aapl/mergesort.h
+index 68b8426..8cefa73 100644
+--- a/aapl/mergesort.h
++++ b/aapl/mergesort.h
+@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );
+-- 
+1.7.8.6
+
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
index c19345568469..f9b93cf8ae8f 100644
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ b/dev-util/kelbt/kelbt-0.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-util/kelbt/kelbt-0.15.ebuild,v 1.1 2012/05/22 23:46:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kelbt/kelbt-0.15.ebuild,v 1.2 2012/06/24 07:56:56 flameeyes Exp $
 
 EAPI=4
 
@@ -21,10 +21,12 @@ src_prepare() {
 	find "${S}" -iname "Makefile*" -exec sed -i \
 		-e '/\$(CXX)/s:CFLAGS:CXXFLAGS:' \
 		{} \;
+
+	epatch "${FILESDIR}"/ragel-6.7+gcc-4.7.patch
 }
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
@@ -33,11 +35,11 @@ src_test() {
 }
 
 src_install() {
-	dobin kelbt/kelbt || die
-	dodoc TODO CREDITS ChangeLog || die
+	dobin kelbt/kelbt
+	dodoc TODO CREDITS ChangeLog
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ${PN}.vim || die
+		doins ${PN}.vim
 	fi
 }
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 454083d5c77d..5ad51225eb99 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -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/eclass/flag-o-matic.eclass,v 1.176 2012/06/18 06:45:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.177 2012/06/23 22:21:50 vapier Exp $
 
 # @ECLASS: flag-o-matic.eclass
 # @MAINTAINER:
@@ -197,7 +197,7 @@ append-ldflags() {
 	local flag
 	for flag in "$@"; do
 		[[ ${flag} == -l* ]] && \
-			ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
+			eqawarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
 	done
 
 	export LDFLAGS="${LDFLAGS} $*"
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 6ee9bd3529a6..9f0ff7435b4a 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -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/eclass/kernel-2.eclass,v 1.276 2012/06/06 17:00:09 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.277 2012/06/24 17:52:38 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -415,7 +415,8 @@ if [[ ${ETYPE} == sources ]]; then
 	DEPEND="!build? ( sys-apps/sed
 					  >=sys-devel/binutils-2.11.90.0.31 )"
 	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
-					   sys-devel/make )"
+					   sys-devel/make 
+					   dev-lang/perl )"
 	PDEPEND="!build? ( virtual/dev-manager )"
 
 	SLOT="${PVR}"
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 2694cd652e16..7a5427e7b854 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,3 +1,4 @@
 DIST desmume-0.9.4.tar.gz 1035843 RMD160 c86eab6727331a45403325facc0add968275de6d SHA1 06eb3cb9c57547d3c43e272648d176a252143e43 SHA256 5fc50e746e6c42ae64602338605b5a6890098b2819df90399908ac30ff6d9533
 DIST desmume-0.9.5.tar.gz 935073 RMD160 9eb537cde87cdba78b39480c6196f60702fcf208 SHA1 27174becda0551ec231ff18c5e95266a95825524 SHA256 a709127d52d76bf5a9411bcf0b115d74f10907fb142104b7ef01c9f8cc2e3101
 DIST desmume-0.9.7.tar.gz 1142550 RMD160 8770addf1ae5aab9b15a70de7c4b0511b245220d SHA1 18e00f675d3e6217474a6bbf3c554aade9aceee5 SHA256 0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523
+DIST desmume-0.9.8.tar.gz 3677290 RMD160 68ee9cf026df5a3d301f12630cceaebd7fd2caed SHA1 de72f0a634d5904eced1491d2aeed96705168f65 SHA256 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01
diff --git a/games-emulation/desmume/desmume-0.9.8.ebuild b/games-emulation/desmume/desmume-0.9.8.ebuild
new file mode 100644
index 000000000000..2d36db7d9d81
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.8.ebuild,v 1.1 2012/06/23 21:58:43 hanno Exp $
+
+EAPI="2"
+
+inherit games
+
+DESCRIPTION="Nintendo DS emulator"
+HOMEPAGE="http://desmume.org/"
+SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.8.0:2
+	gnome-base/libglade
+	x11-libs/gtkglext
+	virtual/opengl
+	sys-libs/zlib
+	dev-libs/zziplib
+	media-libs/libsdl[joystick]
+	x11-libs/agg"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	egamesconf --datadir=/usr/share || die "egamesconf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	dodoc AUTHORS ChangeLog README README.LIN
+	prepgamesdirs
+}
diff --git a/games-emulation/xmess/xmess-0.106.ebuild b/games-emulation/xmess/xmess-0.106.ebuild
index ed4e2b6662ea..584e6d23622c 100644
--- a/games-emulation/xmess/xmess-0.106.ebuild
+++ b/games-emulation/xmess/xmess-0.106.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/games-emulation/xmess/xmess-0.106.ebuild,v 1.14 2012/03/18 13:14:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.106.ebuild,v 1.15 2012/06/24 16:18:25 tupone Exp $
 EAPI=2
 
 inherit flag-o-matic toolchain-funcs eutils games
@@ -146,11 +146,17 @@ EOF
 src_compile() {
 	local disp=0
 	if use sdl ; then
-		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)"
+		emake -j1 DISPLAY_METHOD=SDL \
+			CC=$(tc-getCC) \
+			LD=$(tc-getCC) \
+			|| die "emake failed (SDL)"
 		disp=1
 	fi
 	if use svga ; then
-		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
+		emake -j1 DISPLAY_METHOD=svgalib \
+			CC=$(tc-getCC) \
+			LD=$(tc-getCC) \
+			|| die "emake failed (svgalib)"
 		disp=1
 	fi
 	if use ggi ; then
@@ -159,7 +165,10 @@ src_compile() {
 		ewarn "GGI support is currently (${PV}) broken :("
 	fi
 	if  [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
-		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)"
+		emake -j1 DISPLAY_METHOD=x11 \
+			CC=$(tc-getCC) \
+			LD=$(tc-getCC) \
+			|| die "emake failed (x11)"
 	fi
 }
 
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
index 3228ab2adbeb..32997eef0e83 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-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/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild,v 1.1 2012/03/02 18:28:24 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild,v 1.3 2012/06/24 13:11:45 rich0 Exp $
 
 EAPI=2
-inherit eutils flag-o-matic games
+inherit eutils flag-o-matic gnome2-utils games
 
 DESCRIPTION="An online MMORPG written in C and SDL"
 HOMEPAGE="http://www.eternal-lands.com"
@@ -118,7 +118,7 @@ src_compile() {
 }
 
 src_install() {
-	doicon "${DISTDIR}/eternal-lands.png" ${PN}.png
+	newicon -s 64 "${DISTDIR}/eternal-lands.png" ${PN}.png
 
 	newgamesbin el.x86.linux.bin el \
 		|| die "newgamesbin failed"
@@ -137,8 +137,14 @@ src_install() {
 	prepgamesdirs
 }
 
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	games_pkg_postinst
+	gnome2_icon_cache_update
 	elog "Auto Update is now enabled in Eternal Lands"
 	elog "If an update occurs then the client will suddenly exit"
 	elog "Updates only happen when the game first loads"
@@ -150,5 +156,8 @@ pkg_postinst() {
 
 	# Make sure new files stay in games group
 	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+}
 
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
new file mode 100644
index 000000000000..bf01d588d83c
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.2 2012/06/24 16:17:30 rich0 Exp $
+
+EAPI=4
+inherit eutils flag-o-matic gnome2-utils games
+
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
+	http://dev.gentoo.org/~rich0/distfiles/${PN}.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc kernel_linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl[X]
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/libpng
+	>=games-rpg/eternal-lands-data-1.9.3"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )"
+
+S="${WORKDIR}/elc"
+
+src_prepare() {
+	local BROWSER="firefox"
+
+	sed -i \
+		-e 's/#browser/browser/g' \
+		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
+		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
+		el.ini || die "sed failed"
+
+	# Finally, update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-1.9.2-glext.patch"
+	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
+
+	cp Makefile.linux Makefile
+
+	# Fix for Gentoo zlib OF redefine
+	sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		DEBUG="$(usex debug "yes" "no")" \
+		BSD_KERNEL="$(usex !kernel_linux)" \
+		DATADIR="${GAMES_DATADIR}/${PN}/"
+
+	if use doc; then
+		emake docs
+		mv ./docs/html/ ../client || die "Failed to move documentation directory"
+	fi
+}
+
+src_install() {
+	dogamesbin el
+	make_desktop_entry el "Eternal Lands"
+
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	doins -r *.ini *.txt commands.lst
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	doicon -s 64 "${DISTDIR}/${PN}.png"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	elog "Auto Update is now enabled in Eternal Lands"
+	elog "If an update occurs then the client will suddenly exit"
+	elog "Updates only happen when the game first loads"
+	elog "Please don't report this behaviour as a bug"
+
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
new file mode 100644
index 000000000000..989bf2700d88
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
@@ -0,0 +1,314 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jun 24 13:32:38 UTC 2012
+Subject: build system
+
+respect all flags
+respect compiler
+add options for DATADIR, BSD_KERNEL and DEBUG
+use proper pkgconfig calls
+remove needless build types
+rename EXE to "el"
+
+--- elc/Makefile.linux
++++ elc/Makefile.linux
+@@ -3,16 +3,54 @@
+ -include make.conf
+ 
+ # basic compiling and linking - rarely changed
+-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-
+-PNG_SCREENSHOT_LIBS = -lpng
+-LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
+-_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
++CC ?= gcc
++CXX ?= g++
++
++# some options
++DATADIR ?= /usr/share/games/eternal-lands
++
++CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
++	    -DLINUX \
++	    -DELC \
++	    $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
++	    -D_7ZIP_ST
++
++ifeq ($(BSD_KERNEL),yes)
++CPPFLAGS += -DBSD
++endif
++
++ifeq ($(DEBUG),yes)
++CPPFLAGS += -DMEMORY_DEBUG
++endif
++
++CFLAGS += $(shell sdl-config --cflags) \
++	  $(shell xml2-config --cflags) \
++	  -fno-strict-aliasing \
++	  $(EXTRA_INCLUDES)
++
++CXXFLAGS += $(shell sdl-config --cflags) \
++	    $(shell xml2-config --cflags) \
++	    -fno-strict-aliasing \
++	    $(EXTRA_INCLUDES)
++
++LIBS += $(shell pkg-config --libs x11) \
++	$(shell sdl-config --libs) \
++	$(shell xml2-config --libs) \
++	$(shell pkg-config --libs SDL_net) \
++	$(shell pkg-config --libs SDL_image) \
++	$(shell pkg-config --libs openal) \
++	$(shell pkg-config --libs freealut) \
++	$(shell pkg-config --libs gl) \
++	$(shell pkg-config --libs glu) \
++	$(shell pkg-config --libs cal3d) \
++	$(shell pkg-config --libs libpng) \
++	$(shell pkg-config --libs vorbis) \
++	$(shell pkg-config --libs vorbisfile) \
++	$(shell pkg-config --libs zlib) \
++	-lm \
++	$(EXTRA_LIBS) \
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
++	-lstdc++
+ 
+ # This works on Ubuntu 8.04 (LTS) at least
+ # Install these packages in addition to those required for a standard build
+@@ -59,7 +97,7 @@
+ 	xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o	\
+ 	xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o	\
+ 	xz/XzEnc.o	\
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
+ 	
+ CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o	\
+ 	exceptions/extendedexception.o xml/xmlhelper.o quest_log.o	\
+@@ -80,7 +118,7 @@
+ 	eye_candy/effect_mines.o eye_candy/effect_missile.o \
+ 	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
+ 	eye_candy/effect_staff.o \
+-	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
++	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
+ 
+ OBJS=$(COBJS) $(CXXOBJS)
+ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+@@ -89,24 +127,13 @@
+ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
+ #(shell echo $OBJ |sed s/\.o/\.P/))
+ 
+-EXE=el.x86.linux.bin
+-
+-ifndef CC
+-CC=gcc
+-endif
+-ifndef CXX
+-CXX=g++
+-endif
+-ifndef LINK
+-LINK=gcc
+-endif
++EXE=el
+ 
+ all: $(EXE)
+ 
+ # the compile targets
+ $(EXE): $(OBJS)
+-	@echo "  LINK $(EXE)"
+-	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
+ 
+ #recompile on Makefile or conf change
+ #.depend $(OBJS): Makefile.linux make.conf
+@@ -114,25 +141,19 @@
+ DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
+ 
+ $(COBJS): %.o: %.c Makefile.linux make.conf
+-	@echo "  CC   $@"
+-	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
++	@echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
++	@if $(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+ $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
+-	@echo "  CXX  $@"
+-	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
++	@echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
++	@if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+-release:
+-	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
+-
+-static:
+-	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
+-
+ clean:
+ 	rm -f $(OBJS) $(EXE) 
+ 
+@@ -140,8 +161,8 @@
+ 	cd docs && doxygen Doxyfile
+ 
+ .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
+-	$(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
+-	$(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
++	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
+ 
+ make.conf: make.defaults
+ 	@if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
+@@ -161,7 +182,7 @@
+ 	echo "\t#endinput" >> $@; \
+ 	echo "#endif" >> $@; \
+ 	echo "#define _features_included" >> $@; \
+-	for feature in $(FEATURES); do \
++	for feature in $(EL_FEATURES); do \
+ 		echo "#define $$feature" >> $@; \
+ 	done
+ 
+--- elc/make.defaults
++++ elc/make.defaults
+@@ -1,71 +1,82 @@
+ # set this to "no" if you don't want this file to be overwritten
+ UPDATE_CONF=yes
+ 
++# set to 'yes' for BSD support
++BSD_KERNEL=no
++
++# set to 'yes' to enable debug support
++DEBUG=no
++
+ # tune these for your setup & compile options
+ # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
+ 
+ ### Current release default options ###
+-FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
+-FEATURES += CUSTOM_LOOK			# allows you to customize your look.
+-FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
+-FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
+-FEATURES += NEW_SOUND			# Enables extended sound effects system
+-FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
+-FEATURES += TEXT_ALIASES		# Text aliases
+-FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
++EL_FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
++EL_FEATURES += CUSTOM_LOOK			# allows you to customize your look.
++EL_FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
++EL_FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
++EL_FEATURES += NEW_SOUND			# Enables extended sound effects system
++EL_FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
++EL_FEATURES += TEXT_ALIASES		# Text aliases
++EL_FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
+ # new for 1.9.0 release
+-FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
++EL_FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
+ # new for 1.9.2 release
+-FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
+-FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
+-FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
+-FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
+-FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
++EL_FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
++EL_FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
++EL_FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
++EL_FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
++EL_FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
+ # new for 1.9.3 release
+-FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
+-FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
+-FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
++EL_FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
++EL_FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
++EL_FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
+ 
+ ### Testing options (these options are possible for the next release and should be tested) ###
+-#FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
+-#FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
+-#FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
+-#FEATURES += NEW_ALPHA			# (undocumented)
+-#FEATURES += USE_SIMD			# Enables usage of simd instructions
++#EL_FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
++#EL_FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
++#EL_FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
++#EL_FEATURES += NEW_ALPHA			# (undocumented)
++#EL_FEATURES += USE_SIMD			# Enables usage of simd instructions
+ 
+ ### Machine specific options (fixes or performance enhancements) ###
+-#FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
+-#FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
+-#FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
++#EL_FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
++#EL_FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
++#EL_FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
+ 
+ 
+ ### Debug options ###
+-#FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
+-#FEATURES += DEBUG			# (undocumented)
+-#FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
+-#FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
+-#FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
+-#FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
+-#FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
+-#FEATURES += EXTRA_DEBUG		# (undocumented)
+-#FEATURES += MEMORY_DEBUG		# gather information about memory allocation and freeing
+-#FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
+-#FEATURES += MUTEX_DEBUG		# (undocumented)
+-#FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
+-#FEATURES += TIMER_CHECK		# (undocumented)
+-#FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
++#EL_FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
++#EL_FEATURES += DEBUG			# (undocumented)
++#EL_FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
++#EL_FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
++#EL_FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
++#EL_FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
++#EL_FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
++#EL_FEATURES += EXTRA_DEBUG		# (undocumented)
++
++# gather information about memory allocation and freeing
++ifeq ($(DEBUG),yes)
++EL_FEATURES += MEMORY_DEBUG
++endif
++
++#EL_FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
++#EL_FEATURES += MUTEX_DEBUG		# (undocumented)
++#EL_FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
++#EL_FEATURES += TIMER_CHECK		# (undocumented)
++#EL_FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
+ 
+ 
+ ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
+-#FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
+-#FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
+-#FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
+-#FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
+-#FEATURES += USE_BOOST
+-#FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
+-#FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
+-#FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
+-#FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
++#EL_FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
++#EL_FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
++#EL_FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
++#EL_FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
++#EL_FEATURES += USE_BOOST
++#EL_FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
++#EL_FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
++#EL_FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
++#EL_FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
+ 
+ 
+ 
+@@ -86,7 +97,3 @@
+ #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
+ #EXTRA_LIBS=-lz
+ #EXTRA_STATICLIBS=libs/zlib.a
+-
+-CC=gcc
+-CXX=g++
+-LINK=gcc
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
index d9c2d9477de6..83b8339e702e 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.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/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild,v 1.2 2012/06/02 16:47:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild,v 1.3 2012/06/23 22:10:51 hasufell Exp $
 
 EAPI=4
 
@@ -20,11 +20,9 @@ RDEPEND="media-libs/libsdl[X,audio,video]
 	cdinstall? ( games-strategy/ja2-stracciatella-data )
 	zlib? ( sys-libs/zlib )"
 
-LANGS="en de fr it nl pl ru ru_gold"
-for l in ${LANGS}; do
-	IUSE="$IUSE linguas_${l}"
-done
-unset l
+LANGS="linguas_de +linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold"
+IUSE="$IUSE $LANGS"
+REQUIRED_USE="^^ ( ${LANGS//+/} )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
@@ -39,24 +37,19 @@ src_prepare() {
 }
 
 src_compile() {
-	local myconf i
-
-	for i in ${LANGS} ; do
-		if has ${i} ${LINGUAS} ; then
-			case ${i} in
-				de) myconf="LNG=GERMAN" ;;
-				nl) myconf="LNG=DUTCH" ;;
-				fr) myconf="LNG=FRENCH" ;;
-				it) myconf="LNG=ITALIAN" ;;
-				pl) myconf="LNG=POLISH" ;;
-				ru) myconf="LNG=RUSSIAN" ;;
-				ru_gold) myconf="LNG=RUSSIAN_GOLD" ;;
-				en) myconf="LNG=ENGLISH" ;;
-				*) die "wat" ;;
-			esac
-			break
-		fi
-	done
+	local myconf
+
+	case ${LINGUAS} in
+		de) myconf="LNG=GERMAN" ;;
+		nl) myconf="LNG=DUTCH" ;;
+		fr) myconf="LNG=FRENCH" ;;
+		it) myconf="LNG=ITALIAN" ;;
+		pl) myconf="LNG=POLISH" ;;
+		ru) myconf="LNG=RUSSIAN" ;;
+		ru_gold) myconf="LNG=RUSSIAN_GOLD" ;;
+		en) myconf="LNG=ENGLISH" ;;
+		*) die "wat" ;;
+	esac
 	elog "Chosen language is ${myconf#LNG=}"
 
 	use editor && myconf+=" JA2EDITOR=yes JA2BETAVERSION=yes"
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6d0395a9887e..0eacbdb60db9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,3 +3,4 @@ DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426
 DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
 DIST evolution-data-server-3.4.1.tar.xz 3877120 RMD160 6c21f67daf5504d7a3dbb2333c08b2a5285fc109 SHA1 cd04235696a793f9fda54dfb68c9789e589be06e SHA256 378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298
 DIST evolution-data-server-3.4.2.tar.xz 3879040 RMD160 01be750debfb5e3daf2b92ab0f01a25791fa9cb3 SHA1 fe1cba6f54b18eefae2472d6588496873ac5c0be SHA256 9020337a8ce02ae13c2bcbab80784bfbc6b73803d91a3cacc6362426036f6285
+DIST evolution-data-server-3.4.3.tar.xz 3645752 RMD160 9b33dc19e572db7bee292e38e73d36135fa148a8 SHA1 40fc66ca36977a5a35fcebfb9997c3a5fe86ef18 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild
new file mode 100644
index 000000000000..2badf2e1711e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.3.ebuild,v 1.1 2012/06/24 08:45:02 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit db-use eutils flag-o-matic gnome2 versionator virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 BSD DB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+
+RDEPEND=">=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.2:3
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libgdata-0.10
+	>=gnome-base/gnome-keyring-2.20.1
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libical-0.43
+	>=net-libs/libsoup-2.31.2:2.4
+	>=dev-libs/libxml2-2
+	>=sys-libs/db-4
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
+
+	sys-libs/zlib
+	virtual/libiconv
+
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.1.1
+		>=net-libs/liboauth-0.9.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	weather? ( >=dev-libs/libgweather-2.90.0:2 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gperf
+	>=dev-util/intltool-0.35.5
+	sys-devel/bison
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+#	>=dev-util/gtk-doc-am-1.9
+
+REQUIRED_USE="vala? ( introspection )"
+
+# FIXME
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+	# Uh, what to do about dbus-call-timeout ?
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		VALAC=$(type -P valac-0.14)
+		VAPIGEN=$(type -P vapigen-0.14)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable introspection)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
+		$(use_with ldap openldap)
+		$(use_enable vala vala-bindings)
+		$(use_enable weather)
+		--enable-nntp
+		--enable-largefile
+		--enable-smime
+		--with-libdb=${EPREFIX}/usr"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# GNOME bug 611353 (skips failing test atm)
+	# XXX: uncomment when there's a proper fix
+	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
+	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+	#	-i addressbook/tests/Makefile.{am,in} \
+	#	|| die "failing test sed 1 failed"
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	# Touch configure.ac if doing eautoreconf
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "sed failed"
+}
+
+src_install() {
+	# Prevent this evolution-data-server from linking to libs in the installed
+	# evolution-data-server libraries by adding -L arguments for build dirs to
+	# every .la file's relink_command field, forcing libtool to look there
+	# first during relinking. This will mangle the .la files installed by
+	# make install, but we don't care because we will be punting them anyway.
+	perl "${FILESDIR}/fix_relink_command.pl" . ||
+		die "fix_relink_command.pl failed"
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	export XDG_DATA_HOME="${T}"
+	unset DISPLAY
+	Xemake check || die "Tests failed."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index cabcc27f6373..da1f11b9d84c 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1 +1,2 @@
 DIST evolution-ews-3.4.1.tar.xz 429548 RMD160 ae8d21506935a844aee0bea2f2b1c476c26a49c0 SHA1 a4a897daaef2366f077afdc3e199988e16963cea SHA256 afa56ce08a8bfb9878f5303308aa5c68eab4ffe67a70ba3bd54b0c4f868053ef
+DIST evolution-ews-3.4.3.tar.xz 429728 RMD160 e83a9b140d1102d0ab2f3b9e93b009e8db5754d4 SHA1 d7e367e99782892f8ec1fbea86967164691af5c6 SHA256 3239fcd0f66ab416ceff66b829e3e287599320fcd747f4e2d68a9b094469615d
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild
new file mode 100644
index 000000000000..7aa9e2717f7a
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.4.3.ebuild,v 1.1 2012/06/24 08:44:48 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit db-use eutils flag-o-matic gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="" # doc
+
+RDEPEND=">=mail-client/evolution-${PV}:2.0
+	>=gnome-extra/evolution-data-server-${PV}
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2:2
+	>=net-libs/libsoup-2.30:2.4
+	>=x11-libs/gtk+-2.90.4:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+# For now, this package has no gtk-doc documentation to build
+#	doc? ( >=dev-util/gtk-doc-1.9 )
+
+RESTRICT="test" # tests require connecting to an Exchange server
+
+pkg_setup() {
+	DOCS="ChangeLog NEWS README" # AUTHORS is empty
+}
diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest
index b48440a14594..9e197cebf2a9 100644
--- a/gnome-extra/evolution-exchange/Manifest
+++ b/gnome-extra/evolution-exchange/Manifest
@@ -2,3 +2,4 @@ DIST evolution-exchange-2.32.2.tar.bz2 1306445 RMD160 f692c066a1a881b2a3ed0753b7
 DIST evolution-exchange-2.32.3.tar.bz2 1308675 RMD160 cffad254aa2fd31ae1bd2655cbdbb4186a5ca31c SHA1 b7b6896d98eb3dba9d2a675afcc2b984804f6cc4 SHA256 2993d08d16fd8aac2ba0a397455a43ca39398037b49ffc158bb6d2e700771621
 DIST evolution-exchange-3.2.3.tar.xz 1139076 RMD160 abf0ffc7ade6dce1599e38f317639f95af6a9a74 SHA1 a43a65c5a994e4a523b9d04ef6bed25e43e7d833 SHA256 759a73c7c49aaf45a5ea9d846b44e1314e13e78d4bfe959fc3ded311c1c690a2
 DIST evolution-exchange-3.4.1.tar.xz 1147924 RMD160 d1448a23730276d5f002c029d50ff3dcbd5b61dd SHA1 c08947266d222e509e3836fa5e207d86a0dec911 SHA256 a123b943e5a7128435b65219bfcd2a8f71223f8d7ef0319ec06011fbd392ea80
+DIST evolution-exchange-3.4.3.tar.xz 1117344 RMD160 083ccb9756deceaa0797ba48eae60ecb39d380cc SHA1 86dc3a989acf2bd16d81f8960914a0d5563b1040 SHA256 28b2b47bfdae097b13722dfd0aae6e1335de8d98bd10534a3c7675489352f7b7
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild
new file mode 100644
index 000000000000..4bcccc061a1b
--- /dev/null
+++ b/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild,v 1.1 2012/06/24 08:45:00 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+IUSE="debug doc static"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=mail-client/evolution-${PV}:2.0
+	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
+	>=gnome-base/gconf-2:2
+	>=dev-libs/libical-0.43
+	dev-libs/libxml2:2
+	net-libs/libsoup:2.4
+	>=net-nds/openldap-2.1.30-r2
+	virtual/krb5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-krb5=${EPREFIX}/usr
+		--with-openldap
+		--disable-static
+		$(use_enable debug e2k-debug)
+		$(use_with static static-ldap)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
diff --git a/gnome-extra/evolution-groupwise/Manifest b/gnome-extra/evolution-groupwise/Manifest
index 1d6df103ff2e..cc961811b219 100644
--- a/gnome-extra/evolution-groupwise/Manifest
+++ b/gnome-extra/evolution-groupwise/Manifest
@@ -1,2 +1,3 @@
 DIST evolution-groupwise-3.2.3.tar.xz 406116 RMD160 97193a64ff07bab44d896ef494f8c0179e7bfecb SHA1 c5cbac34b2e61a5acb3cbc849f18ffa51c88322b SHA256 9972cf6ab05168e2364f7d7af1a5d9dd2bb994ab833fc2aaf926a4390e6b8062
 DIST evolution-groupwise-3.4.0.tar.xz 409652 RMD160 5e3bb6d13f83459c2de140742ff9665e16264b9b SHA1 156957de715fa3b221b293d4ff234ab89073a4c0 SHA256 b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717
+DIST evolution-groupwise-3.4.2.tar.xz 412368 RMD160 a96de337deba1c8e7985eb06753eaa28de1996da SHA1 f758a8cd74109a9516253e373484219ae1fa9662 SHA256 e26e08eb065df21118c92f29be4cfa2ce2faa52c950210e15a3efbdc9cace2aa
diff --git a/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.2.ebuild b/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.2.ebuild
new file mode 100644
index 000000000000..3c54cda02f07
--- /dev/null
+++ b/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-groupwise/evolution-groupwise-3.4.2.ebuild,v 1.1 2012/06/24 08:44:54 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit db-use eutils flag-o-matic gnome2
+
+DESCRIPTION="Evolution module for connecting to Novell Groupwise"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="" # doc
+
+RDEPEND=">=mail-client/evolution-${PV}:2.0
+	>=gnome-extra/evolution-data-server-${PV}
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2:2
+	gnome-extra/gtkhtml:4.0
+	>=net-libs/libsoup-2.3:2.4
+	sys-libs/db
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.4:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+# For now, this package has no gtk-doc documentation to build
+#	doc? ( >=dev-util/gtk-doc-1.9 )
+
+pkg_setup() {
+	DOCS="ChangeLog NEWS" # AUTHORS, README are empty
+}
+
+src_prepare() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
index 9796adabe886..65af8292db3e 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r200.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/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.8 2012/06/06 17:45:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.9 2012/06/24 15:58:09 ssuominen Exp $
 
 # git clone git://git.gnome.org/yelp
 # cd yelp
@@ -15,7 +15,7 @@ MY_P=${P}+webkit
 
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://projects.gnome.org/yelp/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.xz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 0e89bdb78b75..a99979940924 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -5,3 +5,4 @@ DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124f
 DIST evolution-3.2.3.tar.xz 12419112 RMD160 9e7f770e3fa778c0742a6d9f3d35169772355ebe SHA1 847f4657250008f1963b94718e2377687961bb3b SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d
 DIST evolution-3.4.1.tar.xz 12713576 RMD160 6e047fc3ed3cecc303c6530e68e1492d363040ec SHA1 56f1f57e0d9d6e95bb05317f268494234a7b4d4c SHA256 43311bc38302fc26efff98852d72981b791941622d32a2e6e346377341c1814d
 DIST evolution-3.4.2.tar.xz 12724300 RMD160 6de781919d1cf263b3fb8468d51cc0735b0cb129 SHA1 896e82fc32defabefbadde51af0b6e36486d4ea8 SHA256 aa08c5e5abf75b3d617d6ab17d16c5a5b1775558a3cd4415554d5bcd78d1914d
+DIST evolution-3.4.3.tar.xz 11899616 RMD160 9166a7bcc6a4993d4a25e1bd2952f8d3347d93cc SHA1 1d7e6be740a157a5660f54a6b23c84c3d87391cf SHA256 3b57f6c1f61993771f0b63c11287ced17ae44b5007ba1a27f14fcb0a1ec0dfcc
diff --git a/mail-client/evolution/evolution-3.4.3.ebuild b/mail-client/evolution/evolution-3.4.3.ebuild
new file mode 100644
index 000000000000..8155cf1cbb6c
--- /dev/null
+++ b/mail-client/evolution/evolution-3.4.3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.3.ebuild,v 1.1 2012/06/24 08:45:05 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit eutils flag-o-matic gnome2 python
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="GPL-2 LGPL-2 OPENLDAP"
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
+	>=x11-libs/cairo-1.9.15[glib]
+	>=x11-libs/gtk+-3.2.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=dev-libs/libgweather-2.90.0:2
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7
+	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+	>=gnome-extra/gtkhtml-4.1.2:4.0
+	>=gnome-base/gconf-2:2
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.31.2:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	clutter? (
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		x11-libs/mx:1.0 )
+	connman? ( net-misc/connman )
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	map? (
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/gnome-doc-utils-0.20.10
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40.0
+	sys-devel/bison
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+#	>=dev-util/gtk-doc-am-1.9
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/evolution-exchange-2.32"
+
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--without-glade-catalog
+		--without-kde-applnk-path
+		--enable-plugins=experimental
+		--disable-image-inline
+		--disable-mono
+		--disable-pst-import
+		--enable-canberra
+		--enable-weather
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable networkmanager nm)
+		$(use_enable connman)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
+		$(use_enable python)
+		$(use_with clutter)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)"
+
+	# dang - I've changed this to do --enable-plugins=experimental.  This will
+	# autodetect new-mail-notify and exchange, but that cannot be helped for the
+	# moment.  They should be changed to depend on a --enable-<foo> like mono
+	# is.  This cleans up a ton of crap from this ebuild.
+
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF}
+			--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes"
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, edit"
+	elog "~/.local/share/applications/mimeapps.list so it includes the"
+	elog "following content:"
+	elog ""
+	elog "[Default Applications]"
+	elog "x-scheme-handler/http=firefox.desktop"
+	elog "x-scheme-handler/https=firefox.desktop"
+	elog ""
+	elog "(replace firefox.desktop with the name of the appropriate .desktop"
+	elog "file from /usr/share/applications if you use a different browser)."
+	elog ""
+	elog "Junk filters are now a run-time choice. You will get a choice of"
+	elog "bogofilter or spamassassin based on which you have installed"
+	elog ""
+	elog "You have to install one of these for the spam filtering to actually work"
+}
diff --git a/media-fonts/font-util/font-util-1.3.0.ebuild b/media-fonts/font-util/font-util-1.3.0.ebuild
index b12523a8da32..634bb27fff94 100644
--- a/media-fonts/font-util/font-util-1.3.0.ebuild
+++ b/media-fonts/font-util/font-util-1.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/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.3 2012/06/22 20:18:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.4 2012/06/24 18:39:42 ago Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
 DESCRIPTION="X.Org font utilities"
 
-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"
+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"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/mix-mplus-ipa/Manifest b/media-fonts/mix-mplus-ipa/Manifest
index 2b7c05379fc5..9cf8f77fc22c 100644
--- a/media-fonts/mix-mplus-ipa/Manifest
+++ b/media-fonts/mix-mplus-ipa/Manifest
@@ -8,10 +8,18 @@ DIST Migu-1VS-20110825.zip 4835029 RMD160 3a4928520106d5ef41b1625dc18eb1bd3623e4
 DIST Migu-2DS-20110825.zip 4644604 RMD160 60e63b9454a1ddad1203ed59b74892aaf184a906 SHA1 54ef1703dbce100f009ed247159ff79011511bbd SHA256 bc0d57d5006a187959432904fc00ad892a6f1bbae171c0e0ac382ca6f0bb65ec
 DIST Migu-2M-20110825.zip 4335267 RMD160 6ca8b3fea69cd33c75b40382520cea1ae9e7138b SHA1 735de466d1828cbfe9dcd54aecfa5ae2346f6aeb SHA256 fada067587008a7223f58778939028f0bc1b2f62ad124ddb1be7ca28e01d4459
 DIST migmix-1m-20111002.zip 4326677 RMD160 145ec5b8b61cac2e5128d772e833f2e672558ad9 SHA1 805a84032784b668e5322201b6ed48b4ea19913c SHA256 419f385808fa014e65c710ce0181f5fc6b80a7bf24ebe1337388c87d863b87bc
+DIST migmix-1m-20120411-2.zip 4318638 RMD160 d5d9c0a81bd801e1c0f2f9007be33fcb7d8d203f SHA1 89277cfc0cc6a48af41ddbd42aeb343fbfca1cff SHA256 5f934732222543eaea0561ef188624c4dc35464356ed3bd6f69b6f45ebed1da6
 DIST migmix-1p-20111002.zip 4428269 RMD160 a9d23918dfcc64b1a8eb0018fd2b76ca9bd20448 SHA1 9290c7c8ea6db13fa5994d3e180cd6d526fd6dcb SHA256 de57bc978d766ad2fcec2c02258efc6a4c83a24b6a707bf4635217dacfbfb068
+DIST migmix-1p-20120411-2.zip 4419548 RMD160 f146dc2e0db04718ee4e218e225a34706daf6b05 SHA1 6b00fa09a969202824039a679b8792451d2bc69c SHA256 4f1a66c9e6d1ee2ab11b589adee8ecafa05fdc063550b11bd6d535e4393f7a36
 DIST migmix-2m-20111002.zip 4324338 RMD160 3d627490c29fe5f8ef65498cc31e97517048fc3c SHA1 5d7412c712e97d59cdd185c8c2bbf627abd451f2 SHA256 3c17da19c2ea23c81973269a396be886d77d72d89e551f0099e2216fd19deae4
+DIST migmix-2m-20120411-2.zip 4316236 RMD160 df08c5682d310fe6d4b613f589dd35cc17de3fe6 SHA1 c0d9819ee1438328b80b598ae803b55f0157ce25 SHA256 b999ce4fc2806c23a3a528da1e3d7515da011916472a45c8f85729f7c92590bc
 DIST migmix-2p-20111002.zip 4427314 RMD160 a7e26f7fcb3c6897d15ec07a27be40d6e50dd38c SHA1 e903ce178656fb708e7a54789e6b4449427c9c8d SHA256 bb5b63186ffafe32efe66a6bb9ff5de5dd964cb674a2fc1aad96ebaea9cf35d7
+DIST migmix-2p-20120411-2.zip 4419141 RMD160 5e0b23d03aa69dfbdf4e7bc1d868cfa7f8c6fa2a SHA1 426ab39d614eed2a1d75eabc545eae2ba5366d82 SHA256 299da96b63ab30f307d130e855bc85ea584346874bb4bb747383bd04e5c8e662
 DIST migu-1c-20111002.zip 4436245 RMD160 f119df19d172b20040b8215d6031f73f7773895c SHA1 314c403e3f2775863a937edfaa485a81a0516ea2 SHA256 95c4e2749794e0c4420e5dbd5ab7f6af927fb9e5c71b74ed717f546e14a6e65c
+DIST migu-1c-20120411-2.zip 4428093 RMD160 ab89ae131ef3835d0e7bceb23db4d36bb445d862 SHA1 04b1119fdc95cc6cc9e177b5ebe370de83cfa969 SHA256 fe1083b085fbc732ea92c798cbb2ac0ab5ecd8c6ff6f002744f8604cedecfca7
 DIST migu-1m-20111002.zip 4334677 RMD160 519043556e546e5de9702c41a13db2ab3ded124b SHA1 79ff84da65fa66880f4da54e4acd6947cc113ee8 SHA256 347f987bd13591368e3af57735d19ff12b2e82eca9b142c07f76a84bab0a0395
+DIST migu-1m-20120411-2.zip 4326597 RMD160 1ae7c076a43b0ba3c4bd0614a26075792fadcec4 SHA1 d73732429f1b7034506f599637e54dbd1e8b1cae SHA256 4d9f97decdf0e16c9ab2924f42025b625dc5bcd76292fb27a0d8aeab128a0bdd
 DIST migu-1p-20111002.zip 4428331 RMD160 7bbd7f9c985ff7c2ba786f2d20b3812b74e36a21 SHA1 a4c743352fb21285525a1effa1c4a985c2c0e02f SHA256 b87d8ca914817c9af0c0550aafa814420eea92e539ad2c2671a50ead0419ab59
+DIST migu-1p-20120411-2.zip 4419857 RMD160 6915861cb52cdfe09a205759779922563d09a7e3 SHA1 aec287bf86fc09fd49e74afda30ece3ee9e60225 SHA256 eed439be7a5414080e5bd692ea85120afe2506e51db056db8178ea0955b2b76d
 DIST migu-2m-20111002.zip 4332395 RMD160 c7e0680a762bdc2da711a85897f830c86b597970 SHA1 50f9db4e40f7539d5df26915ee5c201e2de2db02 SHA256 d39cab84a5d9efb078b76a0608f7c4852d685591fa64654319f1a01fb01b85f8
+DIST migu-2m-20120411-2.zip 4324280 RMD160 b358d50492f08974e9efaf8af06076ac0367aafd SHA1 52d5160ef28236a145ac553ce14eb547e9c947ee SHA256 ef5224ea5978605919fa56155b89b1f84f9d6251062652c40ff066b341dd1391
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
new file mode 100644
index 000000000000..ec84b220ae3d
--- /dev/null
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20120411_p2.ebuild,v 1.1 2012/06/23 22:06:21 matsuu Exp $
+
+EAPI="4"
+inherit font
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Mixing mplus and IPA fonts"
+HOMEPAGE="http://mix-mplus-ipa.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1m-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1p-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2m-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2p-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1p-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1c-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1m-${MY_PV}.zip
+	mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-2m-${MY_PV}.zip"
+
+LICENSE="mplus-fonts IPAfont"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_prepare() {
+	mv */*.${FONT_SUFFIX} "${FONT_S}" || die
+}
diff --git a/media-fonts/ricty/Manifest b/media-fonts/ricty/Manifest
index e397e1fc256b..33dc39a7f869 100644
--- a/media-fonts/ricty/Manifest
+++ b/media-fonts/ricty/Manifest
@@ -1,2 +1,3 @@
 DIST Ricty-3.1.1.tar.gz 5286 RMD160 15f969030c2a4272a84d1a084dca75f1b7aca313 SHA1 d6c6271e3f15214371bea544076379518e608f2a SHA256 c51f02af543b413110c16eb02b54ceb9e2b693c0833ef95bd021adc58a8a8478
 DIST Ricty-3.1.3.tar.gz 9698 RMD160 aab13a2f29d7318d80e4fbfbfbf1d70d0f7eb34e SHA1 4dcca80e01c7bceaf58b8fad37d407093076a542 SHA256 90dd9fd807af3c4721a1fa2d8fa5ae3ffbc0779fcc0ef69c58a30b62f13cee15
+DIST Ricty-3.2.0.tar.gz 13286 RMD160 2817699be804c03bbf8fd26d9b2a61b4e96c5410 SHA1 7441f310620d94e55020c9b15683c9a27e6902e7 SHA256 bb2bf6d7762b5e6e13d237bd82ba43d6faffc17b7e6d541db89d58a73a8a319e
diff --git a/media-fonts/ricty/ricty-3.2.0.ebuild b/media-fonts/ricty/ricty-3.2.0.ebuild
new file mode 100644
index 000000000000..7a2c482f2bde
--- /dev/null
+++ b/media-fonts/ricty/ricty-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/ricty/ricty-3.2.0.ebuild,v 1.1 2012/06/23 22:36:53 matsuu Exp $
+
+EAPI=4
+inherit font
+
+MY_PN="Ricty"
+DESCRIPTION="A beautiful sans-serif monotype Japanese font designed for code listings"
+HOMEPAGE="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html"
+#SRC_URI="http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty/${MY_PN}-${PV}.tar.gz"
+SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-fonts/inconsolata
+	>=media-fonts/mix-mplus-ipa-20111002
+	media-gfx/fontforge"
+RDEPEND=""
+
+#S="${WORKDIR}/yascentur-${MY_PN}-*"
+S="${WORKDIR}/yascentur-${MY_PN}-b9d8b9c"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}"
+
+# Only installs fonts.
+RESTRICT="strip binchecks"
+
+src_compile() {
+	sh ricty_generator.sh \
+		"${EPREFIX}/usr/share/fonts/inconsolata/Inconsolata.otf" \
+		"${EPREFIX}/usr/share/fonts/mix-mplus-ipa/migu-1m-regular.ttf" \
+		"${EPREFIX}/usr/share/fonts/mix-mplus-ipa/migu-1m-bold.ttf" || die
+}
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 91b89642528b..eb3f144f8ad9 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,2 +1 @@
-DIST sxiv-0.9.tar.gz 27363 RMD160 d4a7176aac975f7dba768dcb72227e29ae361132 SHA1 81d2b80830c5360a4d18d93205e54b422ad352a1 SHA256 5a6fc847e67936c05f70f539376450de3a588bbd619d14b5829e41ae5e69ff8a
 DIST sxiv-1.0.tar.gz 33568 RMD160 d2bef62119b691cbb5ec8e81de5d53e09e573e64 SHA1 e29e33c38fd2a6c8a2cb3b270776859328aa8e0e SHA256 fa49189d7bc139bd3dc50aa4e939fe4480c524117ed89dba7a3f54da5013885f
diff --git a/media-gfx/sxiv/sxiv-0.9-r1.ebuild b/media-gfx/sxiv/sxiv-0.9-r1.ebuild
deleted file mode 100644
index 2a96e018afb5..000000000000
--- a/media-gfx/sxiv/sxiv-0.9-r1.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/media-gfx/sxiv/sxiv-0.9-r1.ebuild,v 1.2 2012/04/23 20:25:56 mgorny Exp $
-
-EAPI=4
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-SRC_URI="mirror://github/muennich/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s:^\(\(C\|LD\)FLAGS\) =:\1 +=:" \
-		-e "s:-O2 ::" Makefile || die
-
-	restore_config config.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="${EPREFIX}"/usr install
-	dodoc README.md
-
-	save_config config.h
-}
diff --git a/media-libs/edje/edje-1.2.1.ebuild b/media-libs/edje/edje-1.2.1.ebuild
index aa418ee847a6..2db17012e327 100644
--- a/media-libs/edje/edje-1.2.1.ebuild
+++ b/media-libs/edje/edje-1.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/media-libs/edje/edje-1.2.1.ebuild,v 1.1 2012/06/17 12:59:51 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/edje/edje-1.2.1.ebuild,v 1.2 2012/06/23 17:57:49 tommy Exp $
 
 EAPI=1
 
@@ -16,7 +16,7 @@ IUSE="debug +cache static-libs vim-syntax"
 DEPEND="dev-lang/lua
 	>=dev-libs/eet-1.6.0
 	>=dev-libs/eina-1.2.0
-	>=dev-libs/embryo-1.0.0_beta
+	>=dev-libs/embryo-1.2.0
 	>=media-libs/evas-1.2.0
 	>=dev-libs/ecore-1.2.0"
 RDEPEND=${DEPEND}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e091c85de993..0112a396bce2 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,4 +1,7 @@
 DIST freetype-1.4_pre20080316.tar.bz2 1199805 RMD160 5fb5b0737de968602008991c80dac827ea6fdca0 SHA1 73d4289f509213361b040dc9b649e27f810b133a SHA256 b88e8827dfeebcd0c663cac19c798acbd2f1129eaf89172eb26c3594700316a2
+DIST freetype-2.4.10.tar.bz2 1508927 RMD160 9da7fcde9c42f81c399201d055d85109b2ae7814 SHA1 73b2c28fcaf1ff5b8beef3af4c5abe4cb1ecb7dc SHA256 0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f
 DIST freetype-2.4.9.tar.bz2 1504819 RMD160 a420df999f2c73ddd44641462281ae86845472bb SHA1 5cb80ab9d369c4e81a2221bcf45adcea2c996b9b SHA256 c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9
+DIST freetype-doc-2.4.10.tar.bz2 106697 RMD160 8272137b331e0396023d33d495358c82bddf1fbe SHA1 20ad2d1c80f813c9ea44f04428763c16cf2d6e75 SHA256 b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8
 DIST freetype-doc-2.4.9.tar.bz2 106690 RMD160 df6cdc55cc822770a1690c989a147c382223a190 SHA1 6d6775172b203e05298433d53dc75581269d129e SHA256 138ec5c5081c2c0d1d4624e83bf3797a27271fdb5218deff6599f2d23b66438a
+DIST ft2demos-2.4.10.tar.bz2 163949 RMD160 5584ea73a00553e93c6113a1bf1f01258dbcf74b SHA1 68e18dde0417e03915c759f4cdd79cce16c29865 SHA256 3fb7e97f35c0f59ecd967577a3e77fbcca10d84c00129a74e5da45bf3625cc45
 DIST ft2demos-2.4.9.tar.bz2 163748 RMD160 10b0477d8b2c99ae49e5a284d09f8d9fd4c7b39b SHA1 01163feb104bad54b215f4560e5ee39d074b18cf SHA256 7a67ac6dff11078464c5b9dc68fa2f62c8f05067e0fd15645f5cb7efb05413f9
diff --git a/media-libs/freetype/freetype-2.4.9.ebuild b/media-libs/freetype/freetype-2.4.10.ebuild
similarity index 84%
rename from media-libs/freetype/freetype-2.4.9.ebuild
rename to media-libs/freetype/freetype-2.4.10.ebuild
index 023d2c66d528..e611ee9f4101 100644
--- a/media-libs/freetype/freetype-2.4.9.ebuild
+++ b/media-libs/freetype/freetype-2.4.10.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/freetype/freetype-2.4.9.ebuild,v 1.8 2012/03/17 17:38:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.10.ebuild,v 1.1 2012/06/24 03:34:36 dirtyepic Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="FTL GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils"
 
 DEPEND="sys-libs/zlib
@@ -30,7 +30,7 @@ src_prepare() {
 		sed -i -e "/#define $1/a #define $1" \
 			include/freetype/config/ftoption.h \
 			|| die "unable to enable option $1"
-	}
+}
 
 	disable_option() {
 		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
@@ -94,6 +94,7 @@ src_compile() {
 	emake
 
 	if use utils; then
+		einfo "Building utils"
 		cd "${WORKDIR}/ft2demos-${PV}"
 		# fix for Prefix, bug #339334
 		emake X11_PATH="${EPREFIX}/usr/$(get_libdir)"
@@ -103,12 +104,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc ChangeLog README
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
-
-	use doc && dohtml -r docs/*
-
 	if use utils; then
+		einfo "Installing utils"
 		rm "${WORKDIR}"/ft2demos-${PV}/bin/README
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
 			./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
@@ -125,10 +122,12 @@ src_install() {
 			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
 		done
 	fi
-}
 
-pkg_postinst() {
-	elog "The TrueType bytecode interpreter is no longer patented and thus no"
-	elog "longer controlled by the bindist USE flag.  Enable the auto-hinter"
-	elog "USE flag if you want the old USE="bindist" hinting behavior."
+	prune_libtool_files
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
+
+	use doc && dohtml -r docs/*
+
 }
diff --git a/media-libs/gluon/Manifest b/media-libs/gluon/Manifest
index 03b62634d044..5c28a06c7da0 100644
--- a/media-libs/gluon/Manifest
+++ b/media-libs/gluon/Manifest
@@ -1 +1,2 @@
 DIST gluon-0.70.0.tar.gz 8234641 RMD160 9988dcc7a4ac55a54fb1d71db2e579264e4b8866 SHA1 41fbfcb6118b7e7839e35f9fda44bbf9524aeaf9 SHA256 952a0012de51086075560930305a2897b8bb889aa4bb925ac637c12abd1ce84a
+DIST gluon-0.71.0.tar.gz 14739398 RMD160 324bff3c19eebd05d2e50facd9a20820ae96b097 SHA1 e6cb829bff998b38d8c97ccc810342adcf5e667a SHA256 76d1c43eac52563541e0502d50450ddb5c2d1841b882f5f652202ff0ebd21ab3
diff --git a/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch b/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch
new file mode 100644
index 000000000000..5f54687f3527
--- /dev/null
+++ b/media-libs/gluon/files/gluon-0.71.0-gcc-4.7.patch
@@ -0,0 +1,30 @@
+commit bccbda88a6bc53ac20091bb6aefd2f1b501ba31a
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Mar 23 23:35:09 2012 +0100
+
+    Fix includes
+
+diff --git a/input/linux/detectlinux.cpp b/input/linux/detectlinux.cpp
+index 632249a..6ae85a4 100644
+--- a/input/linux/detectlinux.cpp
++++ b/input/linux/detectlinux.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <QtCore/QDir>
+ 
++#include <unistd.h>
+ // #include <libudev.h>
+ 
+ using namespace GluonInput;
+diff --git a/input/linux/inputthread.cpp b/input/linux/inputthread.cpp
+index f92b104..202745e 100644
+--- a/input/linux/inputthread.cpp
++++ b/input/linux/inputthread.cpp
+@@ -30,6 +30,7 @@
+ // #include <QtCore/QStringList>
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <linux/input.h>
diff --git a/media-libs/gluon/gluon-0.71.0.ebuild b/media-libs/gluon/gluon-0.71.0.ebuild
new file mode 100644
index 000000000000..a706dc4b27de
--- /dev/null
+++ b/media-libs/gluon/gluon-0.71.0.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/media-libs/gluon/gluon-0.71.0.ebuild,v 1.1 2012/06/24 17:13:48 kensington Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+inherit kde4-base versionator
+
+DESCRIPTION="Gluon is a Free and Open Source framework for creating and distributing games."
+HOMEPAGE="http://gluon.tuxfamily.org/"
+SRC_URI="mirror://kde/unstable/${PN}/$(get_version_component_range 1-2)/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+SLOT="4"
+IUSE="debug examples"
+
+DEPEND="
+	media-libs/alure
+	media-libs/libsndfile
+	media-libs/openal
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-declarative:4
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use examples INSTALL_EXAMPLES)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-libs/leptonica/leptonica-1.68.ebuild b/media-libs/leptonica/leptonica-1.68.ebuild
index eac6d0a25f83..1b80f38baf27 100644
--- a/media-libs/leptonica/leptonica-1.68.ebuild
+++ b/media-libs/leptonica/leptonica-1.68.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/leptonica/leptonica-1.68.ebuild,v 1.1 2012/02/16 00:06:55 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.2 2012/06/24 12:14:05 sbriesen Exp $
 
 EAPI=4
 
@@ -25,28 +25,31 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README version-notes )
 
+# see bug 297101, error when enabling png and zlib
+PATCHES=( "${FILESDIR}/${P}-zlib-include.patch" )
+
 src_prepare() {
 	# unhtmlize docs
 	local X
 	for X in ${DOCS[@]}; do
 		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
 			"${X}.html" > "${X}" || die 'awk failed'
-		rm -f "${X}.html"
+		rm -f -- "${X}.html"
 	done
-
-	# see bug 297101, error when enabling png and zlib
-	epatch "${FILESDIR}/${P}-zlib-include.patch"
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	# $(use_with webp libwebp) -> unknown
 	# so use-flag just for pulling dependencies
-	econf \
-		$(use_with gif giflib) \
-		$(use_with jpeg) \
-		$(use_with png libpng) \
-		$(use_with tiff libtiff) \
-		$(use_with zlib) \
-		$(use_enable utils programs) \
+	local myeconfargs=(
+		$(use_with gif giflib)
+		$(use_with jpeg)
+		$(use_with png libpng)
+		$(use_with tiff libtiff)
+		$(use_with zlib)
+		$(use_enable utils programs)
 		$(use_enable static-libs static)
+	)
+	autotools-utils_src_configure
 }
diff --git a/media-libs/libao/libao-1.1.0-r1.ebuild b/media-libs/libao/libao-1.1.0-r1.ebuild
index f31355a3d952..4ed1596cf537 100644
--- a/media-libs/libao/libao-1.1.0-r1.ebuild
+++ b/media-libs/libao/libao-1.1.0-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/media-libs/libao/libao-1.1.0-r1.ebuild,v 1.2 2012/05/05 08:02:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.1.0-r1.ebuild,v 1.4 2012/06/24 10:55:08 ago Exp $
 
 EAPI=4
 
-inherit libtool multilib
+inherit libtool multilib eutils
 
 DESCRIPTION="The Audio Output library"
 HOMEPAGE="http://www.xiph.org/ao/"
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
@@ -30,7 +30,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
 		--disable-esd \
 		$(use_enable alsa alsa) \
 		$(use_enable mmap alsa-mmap) \
@@ -42,5 +41,5 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
 	dodoc AUTHORS CHANGES README TODO
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 }
diff --git a/media-libs/libao/libao-1.1.0.ebuild b/media-libs/libao/libao-1.1.0.ebuild
deleted file mode 100644
index b331b4555150..000000000000
--- a/media-libs/libao/libao-1.1.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/media-libs/libao/libao-1.1.0.ebuild,v 1.4 2012/05/05 08:02:41 jdhore Exp $
-
-EAPI=3
-inherit libtool
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="http://www.xiph.org/ao/"
-SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio static-libs"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's:-O20::' configure || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		--disable-esd \
-		$(use_enable alsa alsa) \
-		$(use_enable mmap alsa-mmap) \
-		--disable-arts \
-		$(use_enable nas) \
-		$(use_enable pulseaudio pulse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install || die
-	dodoc AUTHORS CHANGES README TODO
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libmatroska/libmatroska-1.3.0.ebuild b/media-libs/libmatroska/libmatroska-1.3.0.ebuild
index 67593189ba32..67b60e47ebee 100644
--- a/media-libs/libmatroska/libmatroska-1.3.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.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/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.3 2012/06/09 00:07:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.4 2012/06/24 10:41:15 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/media-libs/mesa/mesa-8.0.3.ebuild b/media-libs/mesa/mesa-8.0.3.ebuild
index 714dbc9d605d..00d385a829f5 100644
--- a/media-libs/mesa/mesa-8.0.3.ebuild
+++ b/media-libs/mesa/mesa-8.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/media-libs/mesa/mesa-8.0.3.ebuild,v 1.3 2012/06/22 20:19:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.3.ebuild,v 1.4 2012/06/24 18:40:34 ago Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ fi
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
 LICENSE="MIT LGPL-3 SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="i915 i965 intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon"
diff --git a/media-libs/tiff/tiff-4.0.2.ebuild b/media-libs/tiff/tiff-4.0.2.ebuild
index 2a9d47e80eae..f67f7bfdeeaf 100644
--- a/media-libs/tiff/tiff-4.0.2.ebuild
+++ b/media-libs/tiff/tiff-4.0.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-libs/tiff/tiff-4.0.2.ebuild,v 1.4 2012/06/21 15:40:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.2.ebuild,v 1.5 2012/06/23 17:23:44 armin76 Exp $
 
 EAPI=4
 inherit libtool
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 7f98af2e8952..fc9da1aeb784 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,2 +1 @@
-DIST sonic-visualiser-1.8.tar.gz 1853221 RMD160 a29785459009678fa2105727451ae643daf6b7cc SHA1 c5e8a25cf81d01c0262445e1d08657ab2346e04a SHA256 07b671528c6e14a7d54cae99db7b1cd78f9dd6f7f06c86ed96948b641336339a
 DIST sonic-visualiser-1.9.tar.gz 1867608 RMD160 4f52130920674ff0f7242abe4bf4d361ea0fe989 SHA1 b33d7885e41210febf0c6139299be560c70a331a SHA256 d899c219403d96c415809521ff71b7f326bf3c5015af496df7ae236de4712f02
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
deleted file mode 100644
index 1012fa9d6295..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild,v 1.3 2012/05/05 08:50:44 mgorny Exp $
-
-EAPI=4
-inherit eutils qt4-r2 autotools fdo-mime
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="mirror://sourceforge/sv1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw id3tag jack mad ogg osc portaudio pulseaudio"
-
-RDEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	fftw? ( sci-libs/fftw:3.0 )
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	dev-libs/redland
-	media-libs/ladspa-sdk
-	osc? ( media-libs/liblo )
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in sonic-visualiser svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	# remove unnecessary check for raptor: http://code.soundsoftware.ac.uk/issues/136
-	sv_disable_opt raptor
-
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	cd svcore
-	epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch
-
-	use fftw || sv_disable_opt fftw3f
-	use fftw || sv_disable_opt fftw3
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	for i in sonic-visualiser svapp svcore svgui ; do
-	   pushd "${S}"/$i > /dev/null
-	   eautoreconf
-	   popd > /dev/null
-	done
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
index 69bd7b133102..8807760f9d63 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.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/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild,v 1.3 2012/05/31 15:23:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild,v 1.4 2012/06/24 04:10:22 radhermit Exp $
 
 EAPI=4
 inherit eutils qt4-r2 autotools fdo-mime
@@ -12,7 +12,7 @@ SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/194/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fftw id3tag jack mad ogg osc portaudio pulseaudio"
+IUSE="fftw id3tag jack mad ogg osc +portaudio pulseaudio"
 
 RDEPEND="x11-libs/qt-core:4
 	x11-libs/qt-gui:4
diff --git a/media-tv/mythtv-status/mythtv-status-0.10.1.ebuild b/media-tv/mythtv-status/mythtv-status-0.10.1.ebuild
index a850d8e946b9..fa3ecc8e516c 100644
--- a/media-tv/mythtv-status/mythtv-status-0.10.1.ebuild
+++ b/media-tv/mythtv-status/mythtv-status-0.10.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-tv/mythtv-status/mythtv-status-0.10.1.ebuild,v 1.1 2012/06/23 05:15:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv-status/mythtv-status-0.10.1.ebuild,v 1.2 2012/06/24 00:15:31 cardoe Exp $
 
 EAPI=4
 
@@ -18,6 +18,7 @@ DEPEND="dev-perl/libwww-perl
 	dev-perl/DateManip
 	dev-perl/MIME-tools
 	dev-perl/Sys-SigAction
+	dev-perl/Config-Auto
 	media-tv/mythtv[perl]"
 RDEPEND="${DEPEND}"
 
diff --git a/media-tv/mythtv/mythtv-0.25.1.ebuild b/media-tv/mythtv/mythtv-0.25.1.ebuild
index 4142ea5ece7b..54d5eff5ea53 100644
--- a/media-tv/mythtv/mythtv-0.25.1.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.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-tv/mythtv/mythtv-0.25.1.ebuild,v 1.7 2012/06/23 03:19:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1.ebuild,v 1.8 2012/06/23 22:26:31 cardoe Exp $
 
 EAPI=4
 
@@ -188,7 +188,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "install failed"
+	emake INSTALL_ROOT="${D}" install || die "install failed"
 	dodoc AUTHORS FAQ UPGRADING  README
 
 	insinto /usr/share/mythtv/database
diff --git a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild b/media-video/ffmpeg/ffmpeg-0.10.3.ebuild
index 5cf6dfe2cad0..daa01ae20b8d 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.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/media-video/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.8 2012/06/17 20:00:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.9 2012/06/23 17:10:06 armin76 Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.0.1-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.0.1-r1.ebuild
index a9e4898b019d..e7478286b0b8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-5.0.1-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.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/media-video/mkvtoolnix/mkvtoolnix-5.0.1-r1.ebuild,v 1.1 2012/05/29 05:34:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.0.1-r1.ebuild,v 1.2 2012/06/24 15:15:42 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="bzip2 debug lzo pch wxwidgets"
 
 RDEPEND="
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 78cb9e521f09..5485fc4143f5 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,2 +1,3 @@
 DIST ogmrip-0.13.6.tar.gz 3242380 RMD160 6116e7c22e747bd8ecd6444575537f2ebc16d062 SHA1 41917a11a44fb73c73daaa8ac29ae3dddb478b67 SHA256 f1b70fc68951401dbd43c9b1016fd2c37b1fda004d76cf6bb82c8a44742a5d24
 DIST ogmrip-0.13.7.tar.gz 3246395 RMD160 d7822afd1d300ebc9786ea2d3cc6420668ce19b8 SHA1 a0097636b2e24b5b40107cad04b10c207c45437b SHA256 362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a
+DIST ogmrip-0.13.8.tar.gz 3254176 RMD160 c6f4867790b07c32c4f8b4693ed576844afa83b2 SHA1 4f8c80b31b69ec2fe27dccbb8b010495265bcff5 SHA256 ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423
diff --git a/media-video/ogmrip/ogmrip-0.13.8.ebuild b/media-video/ogmrip/ogmrip-0.13.8.ebuild
new file mode 100644
index 000000000000..47a1f2028077
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.13.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.8.ebuild,v 1.1 2012/06/24 18:38:46 hanno Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+inherit gnome2
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2
+	>=app-i18n/enca-1.9
+	dev-libs/libxml2
+	media-libs/libdvdread
+	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+	aac? ( >=media-libs/faac-1.24 )
+	gtk? (
+		>=x11-libs/gtk+-2.12:2
+		gnome-base/libglade
+		gnome-base/gconf
+		dbus? ( dev-libs/dbus-glib )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		media-video/mplayer[jpeg]
+		)
+	matroska? ( media-video/mkvtoolnix )
+	mp3? ( media-sound/lame )
+	mp4? ( >=media-video/gpac-0.4.2 )
+	ogm? ( media-sound/ogmtools )
+	spell? ( >=app-text/enchant-1.1.0 )
+	srt? ( ||
+		(
+			( >=app-text/tesseract-2 media-libs/tiff )
+			>=app-text/gocr-0.39
+			>=app-text/ocrad-0.15
+		)
+		media-libs/libpng )
+	theora? ( media-libs/libtheora )
+	vorbis? ( media-sound/vorbis-tools )"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+
+	G2CONF="
+		$(use_enable gtk gtk-support)
+		$(use_enable dbus dbus-support)
+		$(use_enable spell enchant-support)
+		$(use_enable ogm ogm-support)
+		$(use_enable matroska mkv-support)
+		$(use_enable mp4 mp4-support)
+		$(use_enable xvid xvid-support)
+		$(use_enable x264 x264-support)
+		$(use_enable theora theora-support)
+		$(use_enable vorbis vorbis-support)
+		$(use_enable mp3 mp3-support)
+		$(use_enable aac aac-support)
+		$(use_enable srt srt-support)
+		$(use_enable static-libs static)
+		$(use_enable libnotify libnotify-support)
+		$(use_enable nls)
+		--with-html-dir=/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	# bug #317607
+	MAKEOPTS="${MAKEOPTS} -j1" \
+		gnome2_src_install
+	find "${D}" -name '*.la' -delete
+}
diff --git a/metadata/cache/app-admin/eselect-opengl-1.2.5-r1 b/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
index 69e11196a33d..8cf80c149251 100644
--- a/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
+++ b/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
@@ -6,7 +6,7 @@ http://dev.gentooexperimental.org/~scarabeus//glext.h.75.xz http://dev.gentooexp
 http://www.gentoo.org/
 GPL-2
 Utility to change the OpenGL interface being used
-~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
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/app-antivirus/clamav-0.97.5 b/metadata/cache/app-antivirus/clamav-0.97.5
new file mode 100644
index 000000000000..a385aebfdc21
--- /dev/null
+++ b/metadata/cache/app-antivirus/clamav-0.97.5
@@ -0,0 +1,22 @@
+bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool virtual/pkgconfig
+bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
+0
+mirror://sourceforge/clamav/clamav-0.97.5.tar.gz
+test
+http://www.clamav.net/
+GPL-2
+Clam Anti-Virus Scanner
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
+bzip2 clamdtop iconv ipv6 milter selinux static-libs
+
+
+
+4
+
+compile configure install postinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/app-arch/hardlink++-0.02 b/metadata/cache/app-arch/hardlink++-0.02
deleted file mode 100644
index 185fafe290e1..000000000000
--- a/metadata/cache/app-arch/hardlink++-0.02
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-mirror://gentoo/hardlink++-0.02.tgz
-
-http://www.sodarock.com/hardlink/
-GPL-2
-Save disk space by hardlinking identical files
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/app-arch/lha-114i-r7 b/metadata/cache/app-arch/lha-114i-r7
index c2e96644ba22..171fce5cd710 100644
--- a/metadata/cache/app-arch/lha-114i-r7
+++ b/metadata/cache/app-arch/lha-114i-r7
@@ -7,12 +7,12 @@ http://lha.sourceforge.jp
 lha
 Utility for creating and opening lzh archives
 alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
+autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
 
 
 
 
-3
+4
 
 configure install prepare
 
diff --git a/metadata/cache/app-arch/rpm-4.9.1.3 b/metadata/cache/app-arch/rpm-4.9.1.3
index 335ecc6ead0a..b7ca93f90307 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 multiprocessing perl-module python toolchain-funcs user
 nls python doc caps lua acl
 
diff --git a/metadata/cache/app-arch/xz-utils-5.0.4 b/metadata/cache/app-arch/xz-utils-5.0.4
new file mode 100644
index 000000000000..4a352385a4ed
--- /dev/null
+++ b/metadata/cache/app-arch/xz-utils-5.0.4
@@ -0,0 +1,22 @@
+!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+0
+http://tukaani.org/xz/xz-5.0.4.tar.gz
+
+http://tukaani.org/xz/
+LGPL-2.1
+utils for managing LZMA compressed files
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+eutils multilib toolchain-funcs user
+nls static-libs +threads
+
+
+
+2
+
+configure install postinst preinst
+
+
+
+
+
diff --git a/metadata/cache/app-backup/bacula-5.2.9 b/metadata/cache/app-backup/bacula-5.2.9
new file mode 100644
index 000000000000..47b6891bf2dd
--- /dev/null
+++ b/metadata/cache/app-backup/bacula-5.2.9
@@ -0,0 +1,22 @@
+>=sys-libs/zlib-1.1.4 dev-libs/gmp !bacula-clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( x11-libs/qt-svg:4 x11-libs/qwt:5 ) ssl? ( dev-libs/openssl ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( >=sys-libs/readline-4.1 ) dev-libs/lzo sys-libs/ncurses python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+>=sys-libs/zlib-1.1.4 dev-libs/gmp !bacula-clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( x11-libs/qt-svg:4 x11-libs/qwt:5 ) ssl? ( dev-libs/openssl ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( >=sys-libs/readline-4.1 ) dev-libs/lzo sys-libs/ncurses !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+0
+mirror://sourceforge/bacula/bacula-5.2.9.tar.gz
+
+http://www.bacula.org/
+AGPL-3
+Featureful client/server network backup suite
+~amd64 ~hppa ~ppc ~sparc ~x86
+base eutils multilib python qt4-r2 toolchain-funcs user
+bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X
+|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )
+
+
+4
+
+compile configure install postinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-crypt/eid-mw-4.0.2_p1188 b/metadata/cache/app-crypt/eid-mw-4.0.2_p1188
index ec8b9006cd09..4d93b89153b3 100644
--- a/metadata/cache/app-crypt/eid-mw-4.0.2_p1188
+++ b/metadata/cache/app-crypt/eid-mw-4.0.2_p1188
@@ -14,7 +14,7 @@ eutils mozextension multilib toolchain-funcs user versionator
 
 4
 
-configure install
+configure install prepare
 
 
 
diff --git a/metadata/cache/app-crypt/gnupg-2.0.19 b/metadata/cache/app-crypt/gnupg-2.0.19
index 417059f5dcd2..a3460372cdd7 100644
--- a/metadata/cache/app-crypt/gnupg-2.0.19
+++ b/metadata/cache/app-crypt/gnupg-2.0.19
@@ -6,7 +6,7 @@ mirror://gnupg/gnupg/gnupg-2.0.19.tar.bz2
 http://www.gnupg.org/
 GPL-3
 The GNU Privacy Guard, a GPL pgp replacement
-~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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils flag-o-matic multilib toolchain-funcs user
 adns bzip2 doc ldap nls readline static selinux smartcard usb
 smartcard? ( !static )
diff --git a/metadata/cache/app-editors/vile-9.8e b/metadata/cache/app-editors/vile-9.8e
deleted file mode 100644
index ad091b4830dc..000000000000
--- a/metadata/cache/app-editors/vile-9.8e
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) sys-devel/flex app-admin/eselect-vi
->=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
-0
-ftp://invisible-island.net/vile/current/vile-9.8e.tgz
-
-http://invisible-island.net/vile/
-GPL-2
-VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-
-perl
-
-
-
-4
-
-configure install postinst postrm
-
-
-
-
-
diff --git a/metadata/cache/app-editors/vile-9.8f b/metadata/cache/app-editors/vile-9.8f
deleted file mode 100644
index 17eddbcdfd7d..000000000000
--- a/metadata/cache/app-editors/vile-9.8f
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) sys-devel/flex app-admin/eselect-vi
->=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
-0
-ftp://invisible-island.net/vile/current/vile-9.8f.tgz
-
-http://invisible-island.net/vile/
-GPL-2
-VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-
-perl
-
-
-
-4
-
-configure install postinst postrm
-
-
-
-
-
diff --git a/metadata/cache/app-editors/vile-9.8g b/metadata/cache/app-editors/vile-9.8g
index f94be9d3c4d7..72f3cef76ffa 100644
--- a/metadata/cache/app-editors/vile-9.8g
+++ b/metadata/cache/app-editors/vile-9.8g
@@ -6,7 +6,7 @@ ftp://invisible-island.net/vile/current/vile-9.8g.tgz
 http://invisible-island.net/vile/
 GPL-2
 VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 
 perl
 
diff --git a/metadata/cache/app-editors/xvile-9.8e b/metadata/cache/app-editors/xvile-9.8e
deleted file mode 100644
index b8493cce62d4..000000000000
--- a/metadata/cache/app-editors/xvile-9.8e
+++ /dev/null
@@ -1,22 +0,0 @@
-perl? ( dev-lang/perl ) =app-editors/vile-9.8e >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
-perl? ( dev-lang/perl ) =app-editors/vile-9.8e >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
-0
-ftp://invisible-island.net/vile/current/vile-9.8e.tgz
-
-http://invisible-island.net/vile/
-GPL-2
-VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-eutils multilib toolchain-funcs user versionator
-perl
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/app-editors/xvile-9.8f b/metadata/cache/app-editors/xvile-9.8f
deleted file mode 100644
index ae04377f35e8..000000000000
--- a/metadata/cache/app-editors/xvile-9.8f
+++ /dev/null
@@ -1,22 +0,0 @@
-perl? ( dev-lang/perl ) =app-editors/vile-9.8f >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
-perl? ( dev-lang/perl ) =app-editors/vile-9.8f >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
-0
-ftp://invisible-island.net/vile/current/vile-9.8f.tgz
-
-http://invisible-island.net/vile/
-GPL-2
-VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-eutils multilib toolchain-funcs user versionator
-perl
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/app-editors/xvile-9.8g b/metadata/cache/app-editors/xvile-9.8g
index 5e0fa9ebdbf8..3cc9788d89f3 100644
--- a/metadata/cache/app-editors/xvile-9.8g
+++ b/metadata/cache/app-editors/xvile-9.8g
@@ -6,7 +6,7 @@ ftp://invisible-island.net/vile/current/vile-9.8g.tgz
 http://invisible-island.net/vile/
 GPL-2
 VI Like Emacs -- yet another full-featured vi clone
-~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+~alpha amd64 ~ia64 ppc ~sparc ~x86
 eutils multilib toolchain-funcs user versionator
 perl
 
diff --git a/metadata/cache/app-emulation/simh-3.9.0 b/metadata/cache/app-emulation/simh-3.9.0-r1
similarity index 100%
rename from metadata/cache/app-emulation/simh-3.9.0
rename to metadata/cache/app-emulation/simh-3.9.0-r1
diff --git a/metadata/cache/app-laptop/thinkfan-0.8_alpha2 b/metadata/cache/app-laptop/thinkfan-0.8_alpha2
deleted file mode 100644
index 00c3d39d9249..000000000000
--- a/metadata/cache/app-laptop/thinkfan-0.8_alpha2
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-mirror://sourceforge/thinkfan/thinkfan-0.8_alpha2.tar.gz
-
-http://thinkfan.sourceforge.net
-GPL-3
-simple fan control program for thinkpads
-amd64 x86
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/app-misc/ranger-1.5.4 b/metadata/cache/app-misc/ranger-1.5.4
index a663da3d7a22..a90074839e5b 100644
--- a/metadata/cache/app-misc/ranger-1.5.4
+++ b/metadata/cache/app-misc/ranger-1.5.4
@@ -7,7 +7,7 @@ http://ranger.nongnu.org/
 GPL-3
 A vim-inspired file manager for the console
 ~amd64 ~x86
-distutils eutils multilib python toolchain-funcs user
+distutils multilib python toolchain-funcs
 
 
 
diff --git a/metadata/cache/app-misc/ranger-9999 b/metadata/cache/app-misc/ranger-9999
new file mode 100644
index 000000000000..5329107cbec6
--- /dev/null
+++ b/metadata/cache/app-misc/ranger-9999
@@ -0,0 +1,22 @@
+|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] ) dev-vcs/git
+virtual/pager || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] )
+0
+
+
+http://ranger.nongnu.org/
+GPL-3
+A vim-inspired file manager for the console
+
+distutils git-2 multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/calligra-2.4.1 b/metadata/cache/app-office/calligra-2.4.1
deleted file mode 100644
index 26b226230fc7..000000000000
--- a/metadata/cache/app-office/calligra-2.4.1
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-4
-mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
-test
-http://www.calligra.org/
-GPL-2
-KDE Office Suite
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
->=app-office/calligra-l10n-2.4
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-2.4.2 b/metadata/cache/app-office/calligra-2.4.2
index a03d3ac78b95..f489adbe3285 100644
--- a/metadata/cache/app-office/calligra-2.4.2
+++ b/metadata/cache/app-office/calligra-2.4.2
@@ -6,7 +6,7 @@ test
 http://www.calligra.org/
 GPL-2
 KDE Office Suite
-~amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
diff --git a/metadata/cache/app-office/calligra-2.4.90 b/metadata/cache/app-office/calligra-2.4.90
deleted file mode 100644
index 19c742e0c0e1..000000000000
--- a/metadata/cache/app-office/calligra-2.4.90
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-4
-mirror://kde/unstable/calligra-2.4.90/calligra-2.4.90.tar.bz2
-test
-http://www.calligra.org/
-GPL-2
-KDE Office Suite
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
->=app-office/calligra-l10n-2.4
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-2.4.91 b/metadata/cache/app-office/calligra-2.4.91
index 69ddb57e138f..1ca632d24818 100644
--- a/metadata/cache/app-office/calligra-2.4.91
+++ b/metadata/cache/app-office/calligra-2.4.91
@@ -1,5 +1,5 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 4
 mirror://kde/unstable/calligra-2.4.91/calligra-2.4.91.tar.bz2
 test
@@ -8,7 +8,7 @@ GPL-2
 KDE Office Suite
 ~amd64 ~x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 >=app-office/calligra-l10n-2.4
 
diff --git a/metadata/cache/app-office/calligra-9999 b/metadata/cache/app-office/calligra-9999
index e43019ec430d..92d57a4804c1 100644
--- a/metadata/cache/app-office/calligra-9999
+++ b/metadata/cache/app-office/calligra-9999
@@ -1,5 +1,5 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 4
 
 test
@@ -8,7 +8,7 @@ GPL-2
 KDE Office Suite
 
 base cmake-utils eutils fdo-mime flag-o-matic git-2 gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 >=app-office/calligra-l10n-2.4
 
diff --git a/metadata/cache/app-office/calligra-l10n-2.4.1 b/metadata/cache/app-office/calligra-l10n-2.4.1
deleted file mode 100644
index 1f58a0742788..000000000000
--- a/metadata/cache/app-office/calligra-l10n-2.4.1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-!app-office/koffice-l10n >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca-2.4.1.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca@valencia-2.4.1.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-cs-2.4.1.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-da-2.4.1.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-de-2.4.1.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-el-2.4.1.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-en_GB-2.4.1.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-es-2.4.1.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-et-2.4.1.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fi-2.4.1.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fr-2.4.1.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-hu-2.4.1.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-it-2.4.1.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-kk-2.4.1.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nb-2.4.1.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nds-2.4.1.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nl-2.4.1.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pl-2.4.1.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt-2.4.1.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt_BR-2.4.1.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ru-2.4.1.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sk-2.4.1.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sv-2.4.1.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-uk-2.4.1.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_CN-2.4.1.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_TW-2.4.1.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-Calligra localization package
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-l10n-2.4.2 b/metadata/cache/app-office/calligra-l10n-2.4.2
index 3de5c53134c9..36234a0e8025 100644
--- a/metadata/cache/app-office/calligra-l10n-2.4.2
+++ b/metadata/cache/app-office/calligra-l10n-2.4.2
@@ -6,7 +6,7 @@ linguas_ca? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-ca
 http://www.kde.org/
 GPL-2
 Calligra localization package
-~amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
diff --git a/metadata/cache/app-office/karbon-2.3.3-r1 b/metadata/cache/app-office/karbon-2.3.3-r1
deleted file mode 100644
index f6ba2d19c481..000000000000
--- a/metadata/cache/app-office/karbon-2.3.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libart_lgpl pstoedit? ( media-gfx/pstoedit ) wpg? ( app-text/libwpg[tools(+)] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-media-libs/libart_lgpl pstoedit? ( media-gfx/pstoedit ) wpg? ( app-text/libwpg[tools(+)] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/karbon:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice vector drawing application.
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-+pstoedit wpg aqua debug
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/kexi-2.3.3 b/metadata/cache/app-office/kexi-2.3.3
deleted file mode 100644
index 152e71c88e3a..000000000000
--- a/metadata/cache/app-office/kexi-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/readline app-arch/bzip2 ~app-office/kspread-2.3.3:2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) postgres? ( >=dev-libs/libpqxx-3 ) reports? ( ~app-office/koffice-libs-2.3.3:2[reports] ) xbase? ( dev-db/xbase ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-sys-libs/readline app-arch/bzip2 ~app-office/kspread-2.3.3:2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) postgres? ( >=dev-libs/libpqxx-3 ) reports? ( ~app-office/koffice-libs-2.3.3:2[reports] ) xbase? ( dev-db/xbase ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kexi:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice integrated environment for database management
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-freetds mysql postgres reports xbase aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/koffice-data-2.3.3 b/metadata/cache/app-office/koffice-data-2.3.3
deleted file mode 100644
index 889dedd3e825..000000000000
--- a/metadata/cache/app-office/koffice-data-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/lcms:0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-media-libs/lcms:0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-data:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-Shared KOffice data files
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-aqua
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/koffice-l10n-2.3.3 b/metadata/cache/app-office/koffice-l10n-2.3.3
deleted file mode 100644
index 15230d4c3a86..000000000000
--- a/metadata/cache/app-office/koffice-l10n-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-2
-linguas_ca? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ca-2.3.2.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ca@valencia-2.3.2.tar.bz2 ) linguas_da? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-da-2.3.2.tar.bz2 ) linguas_de? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-de-2.3.2.tar.bz2 ) linguas_el? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-el-2.3.2.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-en_GB-2.3.2.tar.bz2 ) linguas_es? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-es-2.3.2.tar.bz2 ) linguas_et? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-et-2.3.2.tar.bz2 ) linguas_fr? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-fr-2.3.2.tar.bz2 ) linguas_gl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-gl-2.3.2.tar.bz2 ) linguas_hu? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-hu-2.3.2.tar.bz2 ) linguas_it? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-it-2.3.2.tar.bz2 ) linguas_ja? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ja-2.3.2.tar.bz2 ) linguas_kk? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-kk-2.3.2.tar.bz2 ) linguas_nb? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nb-2.3.2.tar.bz2 ) linguas_nds? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nds-2.3.2.tar.bz2 ) linguas_nl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nl-2.3.2.tar.bz2 ) linguas_pl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pl-2.3.2.tar.bz2 ) linguas_pt? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pt-2.3.2.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pt_BR-2.3.2.tar.bz2 ) linguas_ru? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ru-2.3.2.tar.bz2 ) linguas_sv? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-sv-2.3.2.tar.bz2 ) linguas_tr? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-tr-2.3.2.tar.bz2 ) linguas_uk? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-uk-2.3.2.tar.bz2 ) linguas_wa? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-wa-2.3.2.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-zh_CN-2.3.2.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-zh_TW-2.3.2.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-KOffice localization package
-amd64 ~ppc ~ppc64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/koffice-libs-2.3.3-r1 b/metadata/cache/app-office/koffice-libs-2.3.3-r1
deleted file mode 100644
index 6ba795bf83ac..000000000000
--- a/metadata/cache/app-office/koffice-libs-2.3.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
->=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-libs:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-test
-http://www.koffice.org/
-GPL-2
-Shared KOffice libraries
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-crypt openexr reports opengl test aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/koffice-libs-2.3.3-r2 b/metadata/cache/app-office/koffice-libs-2.3.3-r2
deleted file mode 100644
index 80d5ec5617f2..000000000000
--- a/metadata/cache/app-office/koffice-libs-2.3.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
->=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-libs:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-test
-http://www.koffice.org/
-GPL-2
-Shared KOffice libraries
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-crypt openexr reports opengl test aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/koffice-meta-2.3.3 b/metadata/cache/app-office/koffice-meta-2.3.3
deleted file mode 100644
index ef23e9416b2c..000000000000
--- a/metadata/cache/app-office/koffice-meta-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=app-office/karbon-2.3.3:2 >=app-office/kexi-2.3.3:2 >=app-office/koffice-data-2.3.3:2 >=app-office/koffice-libs-2.3.3:2[reports?] >=app-office/kpresenter-2.3.3:2 >=app-office/krita-2.3.3:2 >=app-office/kspread-2.3.3:2 >=app-office/kword-2.3.3:2 nls? ( >=app-office/koffice-l10n-2.3.3:2 ) reports? ( >=app-office/kplato-2.3.3:2 ) !app-office/kchart
-2
-
-
-http://www.koffice.org/
-GPL-2
-KOffice - merge this to pull in all KOffice-derived packages
-amd64 x86
-
-nls reports
-
-
-
-3
-
--
-
-
-
-
-
diff --git a/metadata/cache/app-office/kplato-2.3.3 b/metadata/cache/app-office/kplato-2.3.3
deleted file mode 100644
index 7f6e584d882c..000000000000
--- a/metadata/cache/app-office/kplato-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-~app-office/koffice-libs-2.3.3:2[reports] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-~app-office/koffice-libs-2.3.3:2[reports] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kplato:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice project management application
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-python test aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/kpresenter-2.3.3 b/metadata/cache/app-office/kpresenter-2.3.3
deleted file mode 100644
index bc747b7fa248..000000000000
--- a/metadata/cache/app-office/kpresenter-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/boost-1.35.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
->=dev-libs/boost-1.35.0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kpresenter:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice presentation program
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/krita-2.3.3 b/metadata/cache/app-office/krita-2.3.3
deleted file mode 100644
index 74425a5458ad..000000000000
--- a/metadata/cache/app-office/krita-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-office/koffice-libs-2.3.3:2[openexr=] >=dev-cpp/eigen-2.0.3:2 >=media-libs/qimageblitz-0.0.4 >=media-gfx/exiv2-0.16 sci-libs/fftw:3.0 sys-devel/gcc[openmp] gmm? ( sci-mathematics/gmm ) kdcraw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) opengl? ( media-libs/glew ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
->=app-office/koffice-libs-2.3.3:2[openexr=] >=dev-cpp/eigen-2.0.3:2 >=media-libs/qimageblitz-0.0.4 >=media-gfx/exiv2-0.16 sci-libs/fftw:3.0 sys-devel/gcc[openmp] gmm? ( sci-mathematics/gmm ) kdcraw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) opengl? ( media-libs/glew ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/krita:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice image manipulation program.
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-gmm +kdcraw openexr +pdf +tiff opengl aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/kspread-2.3.3 b/metadata/cache/app-office/kspread-2.3.3
deleted file mode 100644
index 94b3534cdfac..000000000000
--- a/metadata/cache/app-office/kspread-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-cpp/eigen:2 solver? ( sci-libs/gsl ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-dev-cpp/eigen:2 solver? ( sci-libs/gsl ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kspread:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-
-http://www.koffice.org/
-GPL-2
-KOffice spreadsheet application
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-+solver aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/kword-2.3.3 b/metadata/cache/app-office/kword-2.3.3
deleted file mode 100644
index 5426c1d5e87c..000000000000
--- a/metadata/cache/app-office/kword-2.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-wpd? ( app-text/libwpd ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-wpd? ( app-text/libwpd ) !app-text/wv2 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kword:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-test
-http://www.koffice.org/
-GPL-2
-KOffice word processor
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-wpd aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/kword-2.3.3-r1 b/metadata/cache/app-office/kword-2.3.3-r1
deleted file mode 100644
index 6b7f3763d9dd..000000000000
--- a/metadata/cache/app-office/kword-2.3.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib gnome-extra/libgsf wpd? ( app-text/libwpd ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-dev-libs/glib gnome-extra/libgsf wpd? ( app-text/libwpd ) !app-text/wv2 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kword:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-2
-mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2
-test
-http://www.koffice.org/
-GPL-2
-KOffice word processor
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib toolchain-funcs user versionator virtualx
-wpd aqua debug
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-text/kiwix-0.9_beta5 b/metadata/cache/app-text/kiwix-0.9_beta5
deleted file mode 100644
index b208fbd9cbf5..000000000000
--- a/metadata/cache/app-text/kiwix-0.9_beta5
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils =dev-cpp/clucene-0.9* dev-lang/perl dev-libs/icu dev-libs/xapian net-libs/libmicrohttpd =net-libs/xulrunner-1.9* >=net-misc/aria2-1.10 !!<app-text/kiwix-0.9_beta virtual/pkgconfig
-app-arch/xz-utils =dev-cpp/clucene-0.9* dev-lang/perl dev-libs/icu dev-libs/xapian net-libs/libmicrohttpd =net-libs/xulrunner-1.9* >=net-misc/aria2-1.10 !!<app-text/kiwix-0.9_beta
-0
-mirror://sourceforge/kiwix/kiwix-0.9-beta5-src.tar.bz2
-
-http://www.kiwix.org/
-GPL-3
-A ZIM reader, especially for offline web content retrieved from Wikipedia
-~amd64 ~x86
-eutils multilib toolchain-funcs user versionator
-
-
-
-
-3
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-text/pandoc-1.9.4.1 b/metadata/cache/app-text/pandoc-1.9.4.1-r1
similarity index 99%
rename from metadata/cache/app-text/pandoc-1.9.4.1
rename to metadata/cache/app-text/pandoc-1.9.4.1-r1
index cafdf274d605..cc086b1c0f87 100644
--- a/metadata/cache/app-text/pandoc-1.9.4.1
+++ b/metadata/cache/app-text/pandoc-1.9.4.1-r1
@@ -2,7 +2,7 @@
 =dev-haskell/base64-bytestring-0.1*[profile?] =dev-haskell/blaze-html-0.5*[profile?] >=dev-haskell/citeproc-hs-0.3.4[profile?] <dev-haskell/citeproc-hs-0.4[profile?] >=dev-haskell/highlighting-kate-0.5.1[profile?] <dev-haskell/highlighting-kate-0.6[profile?] >=dev-haskell/http-4000.0.5[profile?] <dev-haskell/http-4000.3[profile?] >=dev-haskell/json-0.4[profile?] <dev-haskell/json-0.6[profile?] >=dev-haskell/mtl-1.1[profile?] <dev-haskell/mtl-2.2[profile?] >=dev-haskell/network-2[profile?] <dev-haskell/network-2.4[profile?] >=dev-haskell/pandoc-types-1.9.0.2[profile?] <dev-haskell/pandoc-types-1.10[profile?] =dev-haskell/parsec-3.1*[profile?] >=dev-haskell/random-1[profile?] <dev-haskell/random-1.1[profile?] >=dev-haskell/syb-0.1[profile?] <dev-haskell/syb-0.4[profile?] >=dev-haskell/tagsoup-0.12.5[profile?] <dev-haskell/tagsoup-0.13[profile?] =dev-haskell/temporary-1.1*[profile?] >=dev-haskell/texmath-0.6.0.2[profile?] <dev-haskell/texmath-0.7[profile?] >=dev-haskell/time-1.2[profile?] <dev-haskell/time-1.5[profile?] =dev-haskell/utf8-string-0.3*[profile?] >=dev-haskell/xml-1.3.12[profile?] <dev-haskell/xml-1.4[profile?] >=dev-haskell/zip-archive-0.1.1.7[profile?] <dev-haskell/zip-archive-0.2[profile?] =dev-haskell/zlib-0.5*[profile?] >=dev-lang/ghc-6.10.1 dev-lang/ghc
 0
 http://hackage.haskell.org/packages/archive/pandoc/1.9.4.1/pandoc-1.9.4.1.tar.gz
-
+test
 http://johnmacfarlane.net/pandoc
 GPL-2
 Conversion between markup formats
diff --git a/metadata/cache/app-text/xournal-0.4.5_p20111022-r1 b/metadata/cache/app-text/xournal-0.4.6-r1
similarity index 73%
rename from metadata/cache/app-text/xournal-0.4.5_p20111022-r1
rename to metadata/cache/app-text/xournal-0.4.6-r1
index 5dbf1bfaf6c1..40dd6791e4c1 100644
--- a/metadata/cache/app-text/xournal-0.4.5_p20111022-r1
+++ b/metadata/cache/app-text/xournal-0.4.6-r1
@@ -1,13 +1,13 @@
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 0
-http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz
+http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.6.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.6-r1-gentoo.patch.xz
 
 http://xournal.sourceforge.net/
 GPL-2
 Xournal is an application for notetaking, sketching, and keeping a journal using a stylus.
-amd64 x86
-autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multiprocessing toolchain-funcs user versionator
+~amd64 ~x86
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multiprocessing toolchain-funcs user versionator
 +pdf
 
 
diff --git a/metadata/cache/dev-java/nailgun-0.7.1-r1 b/metadata/cache/dev-java/nailgun-0.7.1-r1
index 60d1f14c6698..d7e884c08ce5 100644
--- a/metadata/cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/cache/dev-java/nailgun-0.7.1-r1
@@ -6,7 +6,7 @@ test
 http://martiansoftware.com/nailgun/index.html
 Apache-2.0
 a client, protocol, and server for running Java apps without incurring the JVM startup overhead
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 test elibc_FreeBSD doc source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-lang/mercury-11.07.1 b/metadata/cache/dev-lang/mercury-11.07.1
index ac346fb9c1ea..3d87c576465c 100644
--- a/metadata/cache/dev-lang/mercury-11.07.1
+++ b/metadata/cache/dev-lang/mercury-11.07.1
@@ -1,7 +1,7 @@
 !dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 !dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-2.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
+http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-3.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
 
 http://www.cs.mu.oz.au/research/mercury/index.html
 GPL-2
diff --git a/metadata/cache/dev-lang/php-5.3.14 b/metadata/cache/dev-lang/php-5.3.14
index 76b73c5c67f2..e9594f4faa5b 100644
--- a/metadata/cache/dev-lang/php-5.3.14
+++ b/metadata/cache/dev-lang/php-5.3.14
@@ -6,7 +6,7 @@ mirror
 http://php.net/
 PHP-3
 The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
 apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
 kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
 truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-lang/yap-6.3.2 b/metadata/cache/dev-lang/yap-6.3.2
new file mode 100644
index 000000000000..2aff2550af1c
--- /dev/null
+++ b/metadata/cache/dev-lang/yap-6.3.2
@@ -0,0 +1,22 @@
+sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) doc? ( app-text/texi2html ) java? ( >=dev-java/java-config-2.1.9-r1 )
+sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
+0
+http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.2.tar.gz mirror://gentoo/yap-6.3.2-gentoo-patchset-0.tar.gz
+
+http://www.dcc.fc.up.pt/~vsc/Yap/
+Artistic LGPL-2
+YAP is a high-performance Prolog compiler.
+~amd64 ~ppc ~x86
+eutils flag-o-matic java-pkg-opt-2 java-utils-2 multilib toolchain-funcs user versionator
+R debug doc examples gmp java mpi mysql odbc readline static threads elibc_FreeBSD java
+
+
+
+2
+
+compile configure install preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/elfutils-0.154 b/metadata/cache/dev-libs/elfutils-0.154
new file mode 100644
index 000000000000..6e015a712026
--- /dev/null
+++ b/metadata/cache/dev-libs/elfutils-0.154
@@ -0,0 +1,22 @@
+zlib? ( >=sys-libs/zlib-1.2.2.3 ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+zlib? ( >=sys-libs/zlib-1.2.2.3 ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) !dev-libs/libelf
+0
+https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-0.154.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-portability.patch -> elfutils-0.154-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-robustify.patch -> elfutils-0.154-robustify.patch
+
+https://fedorahosted.org/elfutils/
+GPL-2-with-exceptions
+Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+eutils flag-o-matic multilib toolchain-funcs user
+bzip2 lzma nls test zlib
+
+
+
+3
+
+configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/embryo-1.2.0 b/metadata/cache/dev-libs/embryo-1.2.0
new file mode 100644
index 000000000000..fc2c61da2dc5
--- /dev/null
+++ b/metadata/cache/dev-libs/embryo-1.2.0
@@ -0,0 +1,22 @@
+>=dev-libs/eina-1.2.0 doc? ( app-doc/doxygen )
+>=dev-libs/eina-1.2.0 nls? ( sys-devel/gettext )
+0
+http://download.enlightenment.org/releases/embryo-1.2.0.tar.bz2
+
+http://www.enlightenment.org/
+BSD
+load and control programs compiled in embryo language (small/pawn variant)
+~amd64 ~x86
+enlightenment eutils libtool multilib toolchain-funcs user
+static-libs nls doc
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/isl-0.07-r1 b/metadata/cache/dev-libs/isl-0.10
similarity index 82%
rename from metadata/cache/dev-libs/isl-0.07-r1
rename to metadata/cache/dev-libs/isl-0.10
index a8af509d343c..237011d80b72 100644
--- a/metadata/cache/dev-libs/isl-0.07-r1
+++ b/metadata/cache/dev-libs/isl-0.10
@@ -1,7 +1,7 @@
 dev-libs/gmp
 dev-libs/gmp
 0
-http://www.kotnet.org/~skimo/isl/isl-0.07.tar.bz2
+http://www.kotnet.org/~skimo/isl/isl-0.10.tar.bz2
 
 http://www.kotnet.org/~skimo/isl/
 LGPL-2.1
diff --git a/metadata/cache/dev-libs/libgcrypt-1.5.0-r2 b/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
index e8dd71146a94..7c2656f4daa8 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
+++ b/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
@@ -6,7 +6,7 @@ mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libg
 http://www.gnupg.org/
 LGPL-2.1 MIT
 General purpose crypto library based on the code used in GnuPG
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/dev-libs/nspr-4.9.1-r1 b/metadata/cache/dev-libs/nspr-4.9.1-r2
similarity index 100%
rename from metadata/cache/dev-libs/nspr-4.9.1-r1
rename to metadata/cache/dev-libs/nspr-4.9.1-r2
diff --git a/metadata/cache/dev-libs/opensc-0.12.2-r1 b/metadata/cache/dev-libs/opensc-0.12.2-r1
index e461d3d64093..307bd97a9979 100644
--- a/metadata/cache/dev-libs/opensc-0.12.2-r1
+++ b/metadata/cache/dev-libs/opensc-0.12.2-r1
@@ -1,4 +1,4 @@
-libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
+libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 0
 http://www.opensc-project.org/files/opensc/opensc-0.12.2.tar.gz
diff --git a/metadata/cache/dev-perl/B-Hooks-Parser-0.110.0 b/metadata/cache/dev-perl/B-Hooks-Parser-0.110.0
new file mode 100644
index 000000000000..48d48b6ada9b
--- /dev/null
+++ b/metadata/cache/dev-perl/B-Hooks-Parser-0.110.0
@@ -0,0 +1,22 @@
+dev-perl/B-Hooks-OP-Check >=dev-perl/extutils-depends-0.302 test? ( dev-perl/Test-Exception dev-perl/B-Hooks-EndOfScope ) dev-lang/perl[-build]
+dev-perl/B-Hooks-OP-Check dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/Z/ZE/ZEFRAM/B-Hooks-Parser-0.11.tar.gz
+
+http://search.cpan.org/dist/B-Hooks-Parser/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Interface to perls parser variables
+~amd64 ~x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Config-Auto-0.420.0 b/metadata/cache/dev-perl/Config-Auto-0.420.0
new file mode 100644
index 000000000000..721191b571e1
--- /dev/null
+++ b/metadata/cache/dev-perl/Config-Auto-0.420.0
@@ -0,0 +1,22 @@
+dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec dev-perl/yaml dev-lang/perl[-build]
+dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec dev-perl/yaml dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.42.tar.gz
+
+http://search.cpan.org/dist/Config-Auto/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Magical config file parser
+~amd64 ~x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Data-Uniqid-0.12 b/metadata/cache/dev-perl/Data-Uniqid-0.120.0
similarity index 53%
rename from metadata/cache/dev-perl/Data-Uniqid-0.12
rename to metadata/cache/dev-perl/Data-Uniqid-0.120.0
index e4cfe9202795..5d9cb587e8a3 100644
--- a/metadata/cache/dev-perl/Data-Uniqid-0.12
+++ b/metadata/cache/dev-perl/Data-Uniqid-0.120.0
@@ -1,12 +1,12 @@
-dev-lang/perl virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
-dev-lang/perl virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
+virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
+virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
 0
 mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz
 
 http://search.cpan.org/dist/Data-Uniqid/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
-Perl extension for simple genrating of unique id's
-~amd64
+Perl extension for simple generating of unique ids
+~amd64 ~x86
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Email-MIME-1.910.0 b/metadata/cache/dev-perl/Email-MIME-1.910.0
index b693791e2286..fe61922ee789 100644
--- a/metadata/cache/dev-perl/Email-MIME-1.910.0
+++ b/metadata/cache/dev-perl/Email-MIME-1.910.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.910.tar.gz
 http://search.cpan.org/dist/Email-MIME/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Easy MIME message parsing
-alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
+amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Log-TraceMessages-1.400.0 b/metadata/cache/dev-perl/Log-TraceMessages-1.400.0
new file mode 100644
index 000000000000..6d00f657b453
--- /dev/null
+++ b/metadata/cache/dev-perl/Log-TraceMessages-1.400.0
@@ -0,0 +1,22 @@
+>=dev-perl/HTML-FromText-1.004 dev-lang/perl[-build]
+>=dev-perl/HTML-FromText-1.004 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
+
+http://search.cpan.org/dist/Log-TraceMessages/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Logging/debugging aid
+amd64 ppc x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/MusicBrainz-DiscID-0.03 b/metadata/cache/dev-perl/MusicBrainz-DiscID-0.30.0
similarity index 83%
rename from metadata/cache/dev-perl/MusicBrainz-DiscID-0.03
rename to metadata/cache/dev-perl/MusicBrainz-DiscID-0.30.0
index 12672d87ac57..d030f17d8b4e 100644
--- a/metadata/cache/dev-perl/MusicBrainz-DiscID-0.03
+++ b/metadata/cache/dev-perl/MusicBrainz-DiscID-0.30.0
@@ -1,7 +1,7 @@
 >=media-libs/libdiscid-0.2.2 virtual/perl-Module-Build virtual/pkgconfig test? ( dev-perl/Test-Pod virtual/perl-Test-Simple ) dev-lang/perl[-build]
 >=media-libs/libdiscid-0.2.2 dev-lang/perl[-build]
 0
-mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz
+mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz http://dev.gentoo.org/~tove/distfiles/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-patch.tar.bz2
 
 http://search.cpan.org/dist/MusicBrainz-DiscID/
 GPL-2
diff --git a/metadata/cache/dev-perl/Sys-SigAction-0.150.0 b/metadata/cache/dev-perl/Sys-SigAction-0.150.0
index 64ee52b97ac0..a77a2ccc53da 100644
--- a/metadata/cache/dev-perl/Sys-SigAction-0.150.0
+++ b/metadata/cache/dev-perl/Sys-SigAction-0.150.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.15.tar.gz
 http://search.cpan.org/dist/Sys-SigAction/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl extension for Consistent Signal Handling
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/XML-LibXML-2.0.100 b/metadata/cache/dev-perl/XML-LibXML-2.0.100
new file mode 100644
index 000000000000..ab1479e21b76
--- /dev/null
+++ b/metadata/cache/dev-perl/XML-LibXML-2.0.100
@@ -0,0 +1,22 @@
+>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
+>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0001.tar.gz
+
+http://search.cpan.org/dist/XML-LibXML/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+A Perl module to parse XSL Transformational sheets using gnome's libXSLT
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/frontier-rpc-0.07_beta4 b/metadata/cache/dev-perl/frontier-rpc-0.07_beta4
index ecdf8184b501..c1959c7b00f2 100644
--- a/metadata/cache/dev-perl/frontier-rpc-0.07_beta4
+++ b/metadata/cache/dev-perl/frontier-rpc-0.07_beta4
@@ -1,20 +1,20 @@
-dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl
-dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl
+dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl[-build]
+dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl[-build]
 0
-http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
+mirror://cpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.07b4.tar.gz http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
 
-http://perl-xml.sourceforge.net/xml-rpc/
-|| ( Artistic GPL-2 )
-A Perl 5 module for performing remote procedure calls using extensible markup language
+http://search.cpan.org/dist/Frontier-RPC/ http://perl-xml.sourceforge.net/xml-rpc/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Perform remote procedure calls using extensible markup language
 alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
 
 
+4
 
-
-compile install postinst postrm preinst prerm setup test unpack
+compile configure install prepare test unpack
 
 
 
diff --git a/metadata/cache/dev-perl/yaml-0.810.0 b/metadata/cache/dev-perl/yaml-0.810.0
index 55081dfebcfd..d9621b44d7f7 100644
--- a/metadata/cache/dev-perl/yaml-0.810.0
+++ b/metadata/cache/dev-perl/yaml-0.810.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/I/IN/INGY/YAML-0.81.tar.gz
 http://search.cpan.org/dist/YAML/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 YAML Ain't Markup Language (tm)
-~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
+~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 multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-php/DBUnit-1.0.1 b/metadata/cache/dev-php/DBUnit-1.0.1
index 507377ae3340..f6a981480bd5 100644
--- a/metadata/cache/dev-php/DBUnit-1.0.1
+++ b/metadata/cache/dev-php/DBUnit-1.0.1
@@ -1,5 +1,5 @@
 dev-lang/php >=dev-php/pear-1.9.0
->=dev-php/ezc-ConsoleTools-1.6 >=dev-php/File_Iterator-1.2.2 dev-php/PHP_TokenStream dev-php/Text_Template dev-lang/php >=dev-php/pear-1.9.0
+>=dev-php/File_Iterator-1.2.2 dev-php/PHP_TokenStream dev-php/Text_Template dev-lang/php >=dev-php/pear-1.9.0
 0
 http://pear.phpunit.de/get/DbUnit-1.0.1.tgz
 
diff --git a/metadata/cache/dev-php/PHP_CodeCoverage-1.1.0 b/metadata/cache/dev-php/PHP_CodeCoverage-1.1.0
deleted file mode 100644
index 03f080d4b561..000000000000
--- a/metadata/cache/dev-php/PHP_CodeCoverage-1.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/php >=dev-php/pear-1.9.0
->=dev-php/ezc-ConsoleTools-1.6 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.0 >=dev-php/Text_Template-1.1.1 dev-lang/php >=dev-php/pear-1.9.0
-0
-http://pear.phpunit.de/get/PHP_CodeCoverage-1.1.0.tgz
-
-http://pear.phpunit.de
-BSD
-Library that provides collection, processing, and rendering functionality for PHP code coverage
-~amd64 ~x86
-depend.php eutils multilib php-pear-lib-r1 phpconfutils toolchain-funcs user
-
-
-
-
-
-
-install setup
-
-
-
-
-
diff --git a/metadata/cache/dev-python/CoverageTestRunner-1.8 b/metadata/cache/dev-python/CoverageTestRunner-1.8
new file mode 100644
index 000000000000..a09b23f172d4
--- /dev/null
+++ b/metadata/cache/dev-python/CoverageTestRunner-1.8
@@ -0,0 +1,22 @@
+dev-python/coverage || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+dev-python/coverage || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.8.orig.tar.gz
+
+http://liw.fi/coverage-test-runner/
+GPL-3
+fail Python program unit tests unless they test everything
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/PyQt4-4.9.2 b/metadata/cache/dev-python/PyQt4-4.9.2
index 50d1628ce042..668a27248e0e 100644
--- a/metadata/cache/dev-python/PyQt4-4.9.2
+++ b/metadata/cache/dev-python/PyQt4-4.9.2
@@ -1,5 +1,5 @@
->=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dbus? ( virtual/pkgconfig ) dev-lang/python
->=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dev-lang/python
+>=dev-python/sip-4.13.3 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dbus? ( virtual/pkgconfig ) dev-lang/python
+>=dev-python/sip-4.13.3 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dev-lang/python
 0
 http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-4.9.2.tar.gz
 
diff --git a/metadata/cache/dev-python/apsw-3.7.13.1 b/metadata/cache/dev-python/apsw-3.7.13.1
new file mode 100644
index 000000000000..f8130c45bcc0
--- /dev/null
+++ b/metadata/cache/dev-python/apsw-3.7.13.1
@@ -0,0 +1,22 @@
+>=dev-db/sqlite-3.7.13[extensions] app-arch/unzip dev-lang/python
+>=dev-db/sqlite-3.7.13[extensions] dev-lang/python
+0
+http://apsw.googlecode.com/files/apsw-3.7.13-r1.zip
+
+http://code.google.com/p/apsw/
+as-is
+APSW - Another Python SQLite Wrapper
+~amd64 ~ppc64 ~x86
+distutils eutils multilib python toolchain-funcs user versionator
+doc
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/cliapp-0.29 b/metadata/cache/dev-python/cliapp-0.29
index 64e7e70b1555..9b3e86b92a5d 100644
--- a/metadata/cache/dev-python/cliapp-0.29
+++ b/metadata/cache/dev-python/cliapp-0.29
@@ -1,4 +1,4 @@
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+test? ( dev-python/CoverageTestRunner ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_0.29.orig.tar.gz
@@ -14,7 +14,7 @@ distutils multilib python toolchain-funcs
 
 4
 
-compile install postinst postrm prepare setup
+compile install postinst postrm prepare setup test
 
 
 
diff --git a/metadata/cache/dev-python/pydns-2.3.5 b/metadata/cache/dev-python/pydns-2.3.5
deleted file mode 100644
index 73c9ce33671b..000000000000
--- a/metadata/cache/dev-python/pydns-2.3.5
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/libiconv dev-lang/python
-dev-lang/python
-0
-http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.5/pydns-2.3.5.tar.gz
-
-http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
-CNRI
-Python module for DNS (Domain Name Service)
-~amd64 ~x86
-distutils multilib python toolchain-funcs
-examples
-
-
-
-2
-
-compile install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-python/pydns-2.3.6 b/metadata/cache/dev-python/pydns-2.3.6
new file mode 100644
index 000000000000..57901464a1e5
--- /dev/null
+++ b/metadata/cache/dev-python/pydns-2.3.6
@@ -0,0 +1,22 @@
+!dev-python/pydns:0 virtual/libiconv =dev-lang/python-2*
+=dev-lang/python-2*
+2
+http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.6/pydns-2.3.6.tar.gz
+
+http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
+CNRI
+Python module for DNS (Domain Name Service)
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+examples
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/pydns-3.0.2 b/metadata/cache/dev-python/pydns-3.0.2
new file mode 100644
index 000000000000..8294949f90ab
--- /dev/null
+++ b/metadata/cache/dev-python/pydns-3.0.2
@@ -0,0 +1,22 @@
+!dev-python/py3dns virtual/libiconv =dev-lang/python-3*
+=dev-lang/python-3*
+3
+http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.2.tar.gz
+
+http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
+CNRI
+Python module for DNS (Domain Name Service)
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+examples
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/pyxdg-0.20_rc1_p20120624 b/metadata/cache/dev-python/pyxdg-0.20_rc1_p20120624
new file mode 100644
index 000000000000..a18f8c83e118
--- /dev/null
+++ b/metadata/cache/dev-python/pyxdg-0.20_rc1_p20120624
@@ -0,0 +1,22 @@
+|| ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+|| ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://dev.gentoo.org/~ssuominen/pyxdg-0.20_rc1_p20120624.tar.xz
+
+http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/
+LGPL-2
+A Python module to deal with freedesktop.org specifications
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+distutils multilib python toolchain-funcs
+examples
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/right_http_connection-1.3.0 b/metadata/cache/dev-ruby/right_http_connection-1.3.0
index c73572b1e31c..c637a745b599 100644
--- a/metadata/cache/dev-ruby/right_http_connection-1.3.0
+++ b/metadata/cache/dev-ruby/right_http_connection-1.3.0
@@ -2,7 +2,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-e
 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 0
 https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-
+test
 http://rightscale.rubyforge.org/
 as-is
 RightScale's robust HTTP/S connection module
diff --git a/metadata/cache/dev-util/ccache-3.1.7 b/metadata/cache/dev-util/ccache-3.1.7
index 6ffec09c1131..292a3ea8ce00 100644
--- a/metadata/cache/dev-util/ccache-3.1.7
+++ b/metadata/cache/dev-util/ccache-3.1.7
@@ -7,14 +7,14 @@ http://ccache.samba.org/
 GPL-3
 fast compiler cache
 ~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-multilib toolchain-funcs
+eutils multilib toolchain-funcs user
 
 
 
 
+4
 
-
-install postinst unpack
+install postinst prepare
 
 
 
diff --git a/metadata/cache/dev-util/google-perftools-1.8.3 b/metadata/cache/dev-util/google-perftools-1.8.3
index a79eb6e237b1..0d0b7c703021 100644
--- a/metadata/cache/dev-util/google-perftools-1.8.3
+++ b/metadata/cache/dev-util/google-perftools-1.8.3
@@ -6,7 +6,7 @@ test
 http://code.google.com/p/google-perftools/
 MIT
 Fast, multi-threaded malloc() and nifty performance analysis tools
-~amd64 ~x86 ~x86-fbsd
+amd64 ~x86 ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 largepages +debug minimal
 
diff --git a/metadata/cache/games-emulation/desmume-0.9.8 b/metadata/cache/games-emulation/desmume-0.9.8
new file mode 100644
index 000000000000..9ed3746e5bfa
--- /dev/null
+++ b/metadata/cache/games-emulation/desmume-0.9.8
@@ -0,0 +1,22 @@
+>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/opengl sys-libs/zlib dev-libs/zziplib media-libs/libsdl[joystick] x11-libs/agg
+>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/opengl sys-libs/zlib dev-libs/zziplib media-libs/libsdl[joystick] x11-libs/agg
+0
+mirror://sourceforge/desmume/desmume-0.9.8.tar.gz
+
+http://desmume.org/
+GPL-2
+Nintendo DS emulator
+~amd64 ~ppc ~x86
+base eutils games multilib toolchain-funcs user
+
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-rpg/eternal-lands-1.9.3-r1 b/metadata/cache/games-rpg/eternal-lands-1.9.3-r1
index f3294fa98d0f..eaada4859bb7 100644
--- a/metadata/cache/games-rpg/eternal-lands-1.9.3-r1
+++ b/metadata/cache/games-rpg/eternal-lands-1.9.3-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz )
+x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz ) >=sys-apps/sed-4
 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3
 0
 mirror://gentoo/elc_1.9.3-20120213.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
@@ -7,14 +7,14 @@ http://www.eternal-lands.com
 eternal_lands
 An online MMORPG written in C and SDL
 ~amd64 ~x86 ~x86-fbsd
-base eutils flag-o-matic games multilib toolchain-funcs user
+base eutils flag-o-matic games gnome2-utils multilib toolchain-funcs user
 debug doc kernel_linux
 
 
 
 2
 
-compile configure install postinst preinst prepare setup unpack
+compile configure install postinst postrm preinst prepare setup unpack
 
 
 
diff --git a/metadata/cache/games-rpg/eternal-lands-1.9.3-r2 b/metadata/cache/games-rpg/eternal-lands-1.9.3-r2
new file mode 100644
index 000000000000..407f6dcbea8b
--- /dev/null
+++ b/metadata/cache/games-rpg/eternal-lands-1.9.3-r2
@@ -0,0 +1,22 @@
+x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz ) >=sys-apps/sed-4
+x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3
+0
+mirror://gentoo/elc_1.9.3-20120213.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
+
+http://www.eternal-lands.com
+eternal_lands
+An online MMORPG written in C and SDL
+~amd64 ~x86 ~x86-fbsd
+base eutils flag-o-matic games gnome2-utils multilib toolchain-funcs user
+debug doc kernel_linux
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/ja2-stracciatella-0.12.1_p7072 b/metadata/cache/games-strategy/ja2-stracciatella-0.12.1_p7072
index 13cdd2704708..362ae4894b25 100644
--- a/metadata/cache/games-strategy/ja2-stracciatella-0.12.1_p7072
+++ b/metadata/cache/games-strategy/ja2-stracciatella-0.12.1_p7072
@@ -8,8 +8,8 @@ SFI-SCLA
 A port of Jagged Alliance 2 to SDL
 ~amd64 ~x86
 base eutils games multilib toolchain-funcs user
-cdinstall editor zlib linguas_en linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold
-
+cdinstall editor zlib linguas_de +linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold
+^^ ( linguas_de linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold )
 
 
 4
diff --git a/metadata/cache/gnome-extra/evolution-data-server-3.4.3 b/metadata/cache/gnome-extra/evolution-data-server-3.4.3
new file mode 100644
index 000000000000..0ed056291759
--- /dev/null
+++ b/metadata/cache/gnome-extra/evolution-data-server-3.4.3
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.2:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.10 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/dbus-glib-0.6 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.2:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.10 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/dbus-glib-0.6 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 )
+0
+mirror://gnome/sources/evolution-data-server/3.4/evolution-data-server-3.4.3.tar.xz
+test
+http://www.gnome.org/projects/evolution/
+LGPL-2 BSD DB
+Evolution groupware backend
+~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+db-use eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator virtualx
+doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather test
+vala? ( introspection )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/evolution-ews-3.4.3 b/metadata/cache/gnome-extra/evolution-ews-3.4.3
new file mode 100644
index 000000000000..771f3934a9ca
--- /dev/null
+++ b/metadata/cache/gnome-extra/evolution-ews-3.4.3
@@ -0,0 +1,22 @@
+>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3 >=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 >=net-libs/libsoup-2.30:2.4 >=x11-libs/gtk+-2.90.4:3 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3 >=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 >=net-libs/libsoup-2.30:2.4 >=x11-libs/gtk+-2.90.4:3
+0
+mirror://gnome/sources/evolution-ews/3.4/evolution-ews-3.4.3.tar.xz
+test
+http://www.gnome.org/projects/evolution/
+LGPL-2.1
+Evolution module for connecting to Microsoft Exchange Web Services
+~amd64
+db-use eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/evolution-exchange-3.4.3 b/metadata/cache/gnome-extra/evolution-exchange-3.4.3
new file mode 100644
index 000000000000..911d9069a041
--- /dev/null
+++ b/metadata/cache/gnome-extra/evolution-exchange-3.4.3
@@ -0,0 +1,22 @@
+>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3[ldap,kerberos] >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2:2 >=dev-libs/libical-0.43 dev-libs/libxml2:2 net-libs/libsoup:2.4 >=net-nds/openldap-2.1.30-r2 virtual/krb5 >=dev-util/intltool-0.40 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4
+>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3[ldap,kerberos] >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2:2 >=dev-libs/libical-0.43 dev-libs/libxml2:2 net-libs/libsoup:2.4 >=net-nds/openldap-2.1.30-r2 virtual/krb5
+2.0
+mirror://gnome/sources/evolution-exchange/3.4/evolution-exchange-3.4.3.tar.xz
+
+http://projects.gnome.org/evolution/
+GPL-2
+Evolution module for connecting to Microsoft Exchange
+~amd64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+debug doc static debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/evolution-groupwise-3.4.2 b/metadata/cache/gnome-extra/evolution-groupwise-3.4.2
new file mode 100644
index 000000000000..7f01f8c04655
--- /dev/null
+++ b/metadata/cache/gnome-extra/evolution-groupwise-3.4.2
@@ -0,0 +1,22 @@
+>=mail-client/evolution-3.4.2:2.0 >=gnome-extra/evolution-data-server-3.4.2 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+>=mail-client/evolution-3.4.2:2.0 >=gnome-extra/evolution-data-server-3.4.2 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3
+0
+mirror://gnome/sources/evolution-groupwise/3.4/evolution-groupwise-3.4.2.tar.xz
+
+http://www.gnome.org/projects/evolution/
+LGPL-2.1
+Evolution module for connecting to Novell Groupwise
+~amd64 ~x86
+db-use eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/yelp-2.30.2-r200 b/metadata/cache/gnome-extra/yelp-2.30.2-r200
index 4fabd4062f10..b5edfe1a33c5 100644
--- a/metadata/cache/gnome-extra/yelp-2.30.2-r200
+++ b/metadata/cache/gnome-extra/yelp-2.30.2-r200
@@ -1,7 +1,7 @@
 app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils ) dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils )
 0
-http://dev.gentoo.org/~ssuominen/yelp-2.30.2+webkit.tar.xz
+mirror://gentoo/yelp-2.30.2+webkit.tar.xz
 
 http://projects.gnome.org/yelp/
 GPL-2
diff --git a/metadata/cache/mail-client/evolution-3.4.3 b/metadata/cache/mail-client/evolution-3.4.3
new file mode 100644
index 000000000000..b0041ca615c6
--- /dev/null
+++ b/metadata/cache/mail-client/evolution-3.4.3
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2.0:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.4.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.12.0 >=media-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.20.10 app-text/scrollkeeper >=dev-util/intltool-0.40.0 sys-devel/bison >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2.0:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.4.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.12.0 >=media-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+2.0
+mirror://gnome/sources/evolution/3.4/evolution-3.4.3.tar.xz
+
+http://www.gnome.org/projects/evolution/
+GPL-2 LGPL-2 OPENLDAP
+Integrated mail, addressbook and calendaring functionality
+~amd64 ~x86 ~x86-fbsd
+eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
+clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl
+map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-fonts/font-util-1.3.0 b/metadata/cache/media-fonts/font-util-1.3.0
index c1cbdd1dd2c3..9b812b6af349 100644
--- a/metadata/cache/media-fonts/font-util-1.3.0
+++ b/metadata/cache/media-fonts/font-util-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org font utilities
-~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
+~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/media-fonts/mix-mplus-ipa-20120411_p2 b/metadata/cache/media-fonts/mix-mplus-ipa-20120411_p2
new file mode 100644
index 000000000000..efeb3721f2e8
--- /dev/null
+++ b/metadata/cache/media-fonts/mix-mplus-ipa-20120411_p2
@@ -0,0 +1,22 @@
+app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+
+0
+mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1c-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-2m-20120411-2.zip
+
+http://mix-mplus-ipa.sourceforge.jp/
+mplus-fonts IPAfont
+Mixing mplus and IPA fonts
+~amd64 ~x86 ~x86-fbsd
+eutils font multilib toolchain-funcs user
+X
+
+
+
+4
+
+install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-fonts/ricty-3.2.0 b/metadata/cache/media-fonts/ricty-3.2.0
new file mode 100644
index 000000000000..db7606278910
--- /dev/null
+++ b/metadata/cache/media-fonts/ricty-3.2.0
@@ -0,0 +1,22 @@
+media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+
+0
+https://github.com/yascentur/Ricty/tarball/3.2.0 -> Ricty-3.2.0.tar.gz
+strip binchecks
+http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
+public-domain
+A beautiful sans-serif monotype Japanese font designed for code listings
+~amd64 ~x86 ~x86-fbsd
+eutils font multilib toolchain-funcs user
+X
+
+
+
+4
+
+compile install postinst postrm setup
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/sxiv-0.9-r1 b/metadata/cache/media-gfx/sxiv-0.9-r1
deleted file mode 100644
index 8824d982091e..000000000000
--- a/metadata/cache/media-gfx/sxiv-0.9-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/imlib2[X] x11-libs/libX11
-media-libs/imlib2[X] x11-libs/libX11
-0
-mirror://github/muennich/sxiv/sxiv-0.9.tar.gz
-
-https://github.com/muennich/sxiv/
-GPL-2
-Simple (or small or suckless) X Image Viewer
-~amd64 ~x86
-eutils multilib portability savedconfig toolchain-funcs user
-savedconfig
-
-
-
-4
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/media-libs/edje-1.2.1 b/metadata/cache/media-libs/edje-1.2.1
index c72b07ecee8a..9cdb8c541d37 100644
--- a/metadata/cache/media-libs/edje-1.2.1
+++ b/metadata/cache/media-libs/edje-1.2.1
@@ -1,5 +1,5 @@
-dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.0.0_beta >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 doc? ( app-doc/doxygen )
-dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.0.0_beta >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 nls? ( sys-devel/gettext )
+dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.2.0 >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 doc? ( app-doc/doxygen )
+dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.2.0 >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 nls? ( sys-devel/gettext )
 0
 http://download.enlightenment.org/releases/edje-1.2.1.tar.bz2
 
diff --git a/metadata/cache/media-libs/freetype-2.4.9 b/metadata/cache/media-libs/freetype-2.4.10
similarity index 51%
rename from metadata/cache/media-libs/freetype-2.4.9
rename to metadata/cache/media-libs/freetype-2.4.10
index 8b0d4f4894f1..ffaaca74866e 100644
--- a/metadata/cache/media-libs/freetype-2.4.9
+++ b/metadata/cache/media-libs/freetype-2.4.10
@@ -1,12 +1,12 @@
 sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 2
-mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
+mirror://sourceforge/freetype/freetype-2.4.10.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.10.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.10.tar.bz2 )
 
 http://www.freetype.org/
 FTL GPL-2
 A high-quality and portable font engine
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
 X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
 
@@ -14,7 +14,7 @@ X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
 
 4
 
-compile configure install postinst prepare
+compile configure install prepare
 
 
 
diff --git a/metadata/cache/media-libs/gluon-0.71.0 b/metadata/cache/media-libs/gluon-0.71.0
new file mode 100644
index 000000000000..7acb11a5d3c9
--- /dev/null
+++ b/metadata/cache/media-libs/gluon-0.71.0
@@ -0,0 +1,22 @@
+media-libs/alure media-libs/libsndfile media-libs/openal virtual/glu virtual/opengl x11-libs/qt-declarative:4 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+media-libs/alure media-libs/libsndfile media-libs/openal virtual/glu virtual/opengl x11-libs/qt-declarative:4 >=kde-base/oxygen-icons-4.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+mirror://kde/unstable/gluon/0.71/src/gluon-0.71.0.tar.gz
+
+http://gluon.tuxfamily.org/
+LGPL-2.1
+Gluon is a Free and Open Source framework for creating and distributing games.
+~amd64
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+debug examples aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libao-1.1.0 b/metadata/cache/media-libs/libao-1.1.0
deleted file mode 100644
index c932e40c5033..000000000000
--- a/metadata/cache/media-libs/libao-1.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig
-alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
-0
-http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz
-
-http://www.xiph.org/ao/
-GPL-2
-The Audio Output library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-libtool multilib toolchain-funcs
-alsa nas mmap pulseaudio static-libs
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libao-1.1.0-r1 b/metadata/cache/media-libs/libao-1.1.0-r1
index 556755528d61..8f9633b7fa9b 100644
--- a/metadata/cache/media-libs/libao-1.1.0-r1
+++ b/metadata/cache/media-libs/libao-1.1.0-r1
@@ -6,8 +6,8 @@ http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz
 http://www.xiph.org/ao/
 GPL-2
 The Audio Output library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-libtool multilib toolchain-funcs
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+eutils libtool multilib toolchain-funcs user
 alsa nas mmap pulseaudio static-libs
 
 
diff --git a/metadata/cache/media-libs/libmatroska-1.3.0 b/metadata/cache/media-libs/libmatroska-1.3.0
index cc231b0ba254..149494394bcc 100644
--- a/metadata/cache/media-libs/libmatroska-1.3.0
+++ b/metadata/cache/media-libs/libmatroska-1.3.0
@@ -6,7 +6,7 @@ test
 http://www.matroska.org/
 GPL-2
 Extensible multimedia container format based on EBML
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/mesa-8.0.3 b/metadata/cache/media-libs/mesa-8.0.3
index 4d1245e0e0ff..f7f59dbbfb5f 100644
--- a/metadata/cache/media-libs/mesa-8.0.3
+++ b/metadata/cache/media-libs/mesa-8.0.3
@@ -6,7 +6,7 @@ ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/m
 http://mesa3d.sourceforge.net/
 MIT LGPL-3 SGI-B-2.0
 OpenGL-like graphic library for Linux
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools base eutils flag-o-matic libtool multilib multiprocessing python toolchain-funcs user
 video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
 d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
diff --git a/metadata/cache/media-libs/tiff-4.0.2 b/metadata/cache/media-libs/tiff-4.0.2
index 8ae78e03c1b2..2b17f6873d0c 100644
--- a/metadata/cache/media-libs/tiff-4.0.2
+++ b/metadata/cache/media-libs/tiff-4.0.2
@@ -6,7 +6,7 @@ http://download.osgeo.org/libtiff/tiff-4.0.2.tar.gz ftp://ftp.remotesensing.org/
 http://www.remotesensing.org/libtiff/
 as-is
 Tag Image File Format (TIFF) library
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 libtool multilib toolchain-funcs
 +cxx jbig jpeg lzma static-libs zlib
 
diff --git a/metadata/cache/media-sound/sonic-visualiser-1.8 b/metadata/cache/media-sound/sonic-visualiser-1.8
deleted file mode 100644
index d18d62c9c321..000000000000
--- a/metadata/cache/media-sound/sonic-visualiser-1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio )
-0
-mirror://sourceforge/sv1/sonic-visualiser-1.8.tar.gz
-
-http://www.sonicvisualiser.org/
-GPL-2
-Music audio files viewer and analiser
-~amd64 ~x86
-autotools base eutils fdo-mime libtool multilib multiprocessing qt4-r2 toolchain-funcs user
-fftw id3tag jack mad ogg osc portaudio pulseaudio
-|| ( jack pulseaudio portaudio )
-
-
-4
-
-compile configure install postinst postrm prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/sonic-visualiser-1.9 b/metadata/cache/media-sound/sonic-visualiser-1.9
index 741a2b032fd3..68de57f269f3 100644
--- a/metadata/cache/media-sound/sonic-visualiser-1.9
+++ b/metadata/cache/media-sound/sonic-visualiser-1.9
@@ -8,7 +8,7 @@ GPL-2
 Music audio files viewer and analiser
 ~amd64 ~x86
 autotools base eutils fdo-mime libtool multilib multiprocessing qt4-r2 toolchain-funcs user
-fftw id3tag jack mad ogg osc portaudio pulseaudio
+fftw id3tag jack mad ogg osc +portaudio pulseaudio
 || ( jack pulseaudio portaudio )
 
 
diff --git a/metadata/cache/media-tv/mythtv-status-0.10.1 b/metadata/cache/media-tv/mythtv-status-0.10.1
index a27b58aa3289..720fa56d47bf 100644
--- a/metadata/cache/media-tv/mythtv-status-0.10.1
+++ b/metadata/cache/media-tv/mythtv-status-0.10.1
@@ -1,5 +1,5 @@
-dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction media-tv/mythtv[perl]
-dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction media-tv/mythtv[perl]
+dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction dev-perl/Config-Auto media-tv/mythtv[perl]
+dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction dev-perl/Config-Auto media-tv/mythtv[perl]
 0
 http://www.etc.gen.nz/projects/mythtv/tarballs/mythtv-status-0.10.1.tar.gz
 
diff --git a/metadata/cache/media-video/ffmpeg-0.10.3 b/metadata/cache/media-video/ffmpeg-0.10.3
index e678d7a31802..f365d6ea3a29 100644
--- a/metadata/cache/media-video/ffmpeg-0.10.3
+++ b/metadata/cache/media-video/ffmpeg-0.10.3
@@ -6,7 +6,7 @@ http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2
 http://ffmpeg.org/
 GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 Complete solution to record, convert and stream audio and video. Includes libavcodec.
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 eutils flag-o-matic multilib toolchain-funcs user
 aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
 bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
diff --git a/metadata/cache/media-video/mkvtoolnix-5.0.1-r1 b/metadata/cache/media-video/mkvtoolnix-5.0.1-r1
index 8f5368f434bf..ca43302385c7 100644
--- a/metadata/cache/media-video/mkvtoolnix-5.0.1-r1
+++ b/metadata/cache/media-video/mkvtoolnix-5.0.1-r1
@@ -6,7 +6,7 @@ http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.0.1.tar.bz2
 http://www.bunkus.org/videotools/mkvtoolnix
 GPL-2
 Tools to create, alter, and inspect Matroska files
-~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 autotools eutils libtool multilib multiprocessing toolchain-funcs user wxwidgets
 bzip2 debug lzo pch wxwidgets
 
diff --git a/metadata/cache/media-video/ogmrip-0.13.8 b/metadata/cache/media-video/ogmrip-0.13.8
new file mode 100644
index 000000000000..fb7c4e0f4ecb
--- /dev/null
+++ b/metadata/cache/media-video/ogmrip-0.13.8
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
+0
+mirror://sourceforge/ogmrip/ogmrip-0.13.8.tar.gz
+
+http://ogmrip.sourceforge.net/
+LGPL-2.1
+Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4
+~amd64 ~ppc ~ppc64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-check-1.12.3 b/metadata/cache/net-dns/dnssec-check-1.12.3-r1
similarity index 70%
rename from metadata/cache/net-dns/dnssec-check-1.12.3
rename to metadata/cache/net-dns/dnssec-check-1.12.3-r1
index 52393a3b2fff..2788d8a2b273 100644
--- a/metadata/cache/net-dns/dnssec-check-1.12.3
+++ b/metadata/cache/net-dns/dnssec-check-1.12.3-r1
@@ -1,5 +1,5 @@
-net-dns/dnssec-tools x11-libs/qt-declarative:4
-net-dns/dnssec-tools x11-libs/qt-declarative:4
+net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
+net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
 0
 http://www.dnssec-tools.org/download/dnssec-check-1.12.3.tar.gz
 
diff --git a/metadata/cache/net-dns/dnssec-check-1.13 b/metadata/cache/net-dns/dnssec-check-1.13
new file mode 100644
index 000000000000..918c0c7b5389
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-check-1.13
@@ -0,0 +1,22 @@
+net-dns/dnssec-validator[threads] x11-libs/qt-declarative:4
+net-dns/dnssec-validator[threads] x11-libs/qt-declarative:4
+0
+http://www.dnssec-tools.org/download/dnssec-check-1.13.tar.gz
+
+http://www.dnssec-tools.org
+BSD
+tests local resolver for support of DNSSEC validation
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-lookup-1.13 b/metadata/cache/net-dns/dnssec-lookup-1.13
new file mode 100644
index 000000000000..3cebf8036dcc
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-lookup-1.13
@@ -0,0 +1,22 @@
+net-dns/dnssec-validator[threads] x11-libs/qt-gui
+net-dns/dnssec-validator[threads] x11-libs/qt-gui
+0
+http://www.dnssec-tools.org/download/lookup-1.13.tar.gz
+
+http://www.dnssec-tools.org
+BSD
+DNS lookup utility that supports DNSSEC validation
+~amd64
+base eutils multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-nodes-1.12 b/metadata/cache/net-dns/dnssec-nodes-1.12-r1
similarity index 82%
rename from metadata/cache/net-dns/dnssec-nodes-1.12
rename to metadata/cache/net-dns/dnssec-nodes-1.12-r1
index 49b6f9a167eb..45792b2e8aae 100644
--- a/metadata/cache/net-dns/dnssec-nodes-1.12
+++ b/metadata/cache/net-dns/dnssec-nodes-1.12-r1
@@ -1,5 +1,5 @@
-net-dns/dnssec-tools
-net-dns/dnssec-tools
+net-dns/dnssec-tools[threads]
+net-dns/dnssec-tools[threads]
 0
 http://www.dnssec-tools.org/download/dnssec-nodes-1.12.tar.gz
 
diff --git a/metadata/cache/net-dns/dnssec-nodes-1.13 b/metadata/cache/net-dns/dnssec-nodes-1.13
new file mode 100644
index 000000000000..2072efd78f3a
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-nodes-1.13
@@ -0,0 +1,22 @@
+net-dns/dnssec-validator[threads]
+net-dns/dnssec-validator[threads]
+0
+http://www.dnssec-tools.org/download/dnssec-nodes-1.13.tar.gz
+
+http://www.dnssec-tools.org
+GPL-2
+graphically depicts the DNSSEC results from a lookup via logfiles
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-system-tray-1.13 b/metadata/cache/net-dns/dnssec-system-tray-1.13
new file mode 100644
index 000000000000..b748ba94ad11
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-system-tray-1.13
@@ -0,0 +1,22 @@
+x11-libs/qt-gui
+x11-libs/qt-gui
+0
+http://www.dnssec-tools.org/download/dnssec-system-tray-1.13.tar.gz
+
+http://www.dnssec-tools.org
+BSD
+display DNSSEC resolver logs in system tray
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-tools-1.13 b/metadata/cache/net-dns/dnssec-tools-1.13
new file mode 100644
index 000000000000..5ceabb4dcc85
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-tools-1.13
@@ -0,0 +1,22 @@
+dev-lang/perl dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/XML-Simple
+dev-lang/perl dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/XML-Simple
+0
+http://www.dnssec-tools.org/download/dnssec-tools-1.13.tar.gz
+
+http://www.dnssec-tools.org/
+BSD
+tools to ease the deployment of DNSSEC related technologies
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+static-libs
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/dnssec-validator-1.13 b/metadata/cache/net-dns/dnssec-validator-1.13
new file mode 100644
index 000000000000..02542c0466fe
--- /dev/null
+++ b/metadata/cache/net-dns/dnssec-validator-1.13
@@ -0,0 +1,22 @@
+dev-libs/openssl !<net-dns/dnssec-tools-1.13 !net-dns/dnsval
+dev-libs/openssl !<net-dns/dnssec-tools-1.13 !net-dns/dnsval
+0
+http://www.dnssec-tools.org/download/dnsval-1.13.tar.gz
+
+http://www.dnssec-tools.org/
+BSD
+DNSSEC validator (dnsval)
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+ipv6 static-libs +threads
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-irc/inspircd-2.0.6_rc1 b/metadata/cache/net-irc/inspircd-2.0.6_rc1
index 4649f1ef4739..d9032d2e43e9 100644
--- a/metadata/cache/net-irc/inspircd-2.0.6_rc1
+++ b/metadata/cache/net-irc/inspircd-2.0.6_rc1
@@ -1,14 +1,14 @@
-dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
-dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
+dev-lang/perl ssl? ( dev-libs/openssl ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
+dev-lang/perl ssl? ( dev-libs/openssl ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 0
 http://github.com/inspircd/inspircd/downloads/InspIRCd-2.0.6rc1.tar.bz2
 
-http://www.inspircd.org/
+http://inspircd.github.com/
 GPL-2
 Inspire IRCd - The Stable, High-Performance Modular IRCd
 ~amd64 ~x86
 eutils flag-o-matic multilib toolchain-funcs user versionator
-gnutls ipv6 ldap mysql postgres sqlite ssl
+geoip gnutls ipv6 ldap mysql postgres sqlite ssl
 
 
 
diff --git a/metadata/cache/net-libs/enet-1.3.4 b/metadata/cache/net-libs/enet-1.3.4
index b4cecc0fb1eb..4376bf17aa28 100644
--- a/metadata/cache/net-libs/enet-1.3.4
+++ b/metadata/cache/net-libs/enet-1.3.4
@@ -6,7 +6,7 @@ http://enet.bespin.org/download/enet-1.3.4.tar.gz
 http://enet.bespin.org/
 MIT
 relatively thin, simple and robust network communication layer on top of UDP
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 base eutils multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/net-libs/telepathy-qt-0.8.0 b/metadata/cache/net-libs/telepathy-qt-0.8.0
index 126bc5ecbc21..69e3cd2afba3 100644
--- a/metadata/cache/net-libs/telepathy-qt-0.8.0
+++ b/metadata/cache/net-libs/telepathy-qt-0.8.0
@@ -2,11 +2,11 @@ dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? (
 dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://telepathy.freedesktop.org/releases/telepathy-qt4/telepathy-qt4-0.8.0.tar.gz
-
+test
 http://telepathy.freedesktop.org/
 LGPL-2.1
 Qt4 bindings for the Telepathy D-Bus protocol
-~amd64 ~x86
+amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user
 debug farsight glib test
 
diff --git a/metadata/cache/net-libs/telepathy-qt-0.9.0 b/metadata/cache/net-libs/telepathy-qt-0.9.0
deleted file mode 100644
index 7c33f3193909..000000000000
--- a/metadata/cache/net-libs/telepathy-qt-0.9.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.17.2 ) !net-libs/telepathy-qt4 dev-libs/libxslt virtual/pkgconfig test? ( x11-libs/qt-test:4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.17.2 ) !net-libs/telepathy-qt4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.0.tar.gz
-
-http://telepathy.freedesktop.org/
-LGPL-2.1
-Qt4 bindings for the Telepathy D-Bus protocol
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user
-debug farsight glib test
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/net-misc/corkscrew-2.0 b/metadata/cache/net-misc/corkscrew-2.0
index fb6dbb751da7..ce1985bf96ae 100644
--- a/metadata/cache/net-misc/corkscrew-2.0
+++ b/metadata/cache/net-misc/corkscrew-2.0
@@ -12,9 +12,9 @@ autotools libtool multilib multiprocessing toolchain-funcs
 
 
 
-3
+4
 
-install prepare
+prepare
 
 
 
diff --git a/metadata/cache/perl-core/Text-ParseWords-3.270.0 b/metadata/cache/perl-core/Text-ParseWords-3.270.0
new file mode 100644
index 000000000000..10174815eb13
--- /dev/null
+++ b/metadata/cache/perl-core/Text-ParseWords-3.270.0
@@ -0,0 +1,22 @@
+app-arch/unzip dev-lang/perl[-build]
+dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.27.zip
+
+http://search.cpan.org/dist/Text-ParseWords/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Parse strings containing shell-style quoting
+~amd64 ~x86
+alternatives base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-biology/mira-3.2.1 b/metadata/cache/sci-biology/mira-3.2.1
index 221a1dd7e730..5d5de7ddd808 100644
--- a/metadata/cache/sci-biology/mira-3.2.1
+++ b/metadata/cache/sci-biology/mira-3.2.1
@@ -6,7 +6,7 @@ mirror://sourceforge/mira-assembler/mira-3.2.1.tar.bz2 mirror://sourceforge/mira
 http://www.chevreux.org/projects_mira.html
 GPL-2
 Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina
-~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 autotools base eutils libtool multilib multiprocessing toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-chemistry/pdb-extract-3.11 b/metadata/cache/sci-chemistry/pdb-extract-3.11
new file mode 100644
index 000000000000..fd7b5bad2af1
--- /dev/null
+++ b/metadata/cache/sci-chemistry/pdb-extract-3.11
@@ -0,0 +1,22 @@
+!<app-text/html-xml-utils-5.3 >=sci-libs/cifparse-obj-7.025
+!<app-text/html-xml-utils-5.3
+0
+http://sw-tools.pdb.org/apps/PDB_EXTRACT/pdb-extract-v3.11-prod-src.tar.gz
+
+http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html
+PDB
+Tools for extracting mmCIF data from structure determination applications
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+eutils multilib prefix toolchain-funcs user
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/portage-2.1.11 b/metadata/cache/sys-apps/portage-2.1.11.1
similarity index 86%
rename from metadata/cache/sys-apps/portage-2.1.11
rename to metadata/cache/sys-apps/portage-2.1.11.1
index 42874d503b4e..4be431578da2 100644
--- a/metadata/cache/sys-apps/portage-2.1.11
+++ b/metadata/cache/sys-apps/portage-2.1.11.1
@@ -1,7 +1,7 @@
 python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 0
-mirror://gentoo/portage-2.1.11.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+mirror://gentoo/portage-2.1.11.1.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.1.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
 
 http://www.gentoo.org/proj/en/portage/index.xml
 GPL-2
diff --git a/metadata/cache/sys-apps/portage-2.2.0_alpha111 b/metadata/cache/sys-apps/portage-2.2.0_alpha112
similarity index 93%
rename from metadata/cache/sys-apps/portage-2.2.0_alpha111
rename to metadata/cache/sys-apps/portage-2.2.0_alpha112
index 4fd3c8dbadbd..925bd490eabc 100644
--- a/metadata/cache/sys-apps/portage-2.2.0_alpha111
+++ b/metadata/cache/sys-apps/portage-2.2.0_alpha112
@@ -1,7 +1,7 @@
 python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
 python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 0
-mirror://gentoo/portage-2.2.0_alpha111.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha111.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+mirror://gentoo/portage-2.2.0_alpha111.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha111.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha112.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha112.patch.bz2
 
 http://www.gentoo.org/proj/en/portage/index.xml
 GPL-2
diff --git a/metadata/cache/sys-apps/sandbox-2.5 b/metadata/cache/sys-apps/sandbox-2.5
index 92ecc1070987..dd8c2295fe8a 100644
--- a/metadata/cache/sys-apps/sandbox-2.5
+++ b/metadata/cache/sys-apps/sandbox-2.5
@@ -7,7 +7,7 @@ http://www.gentoo.org/
 GPL-2
 sandbox'd LD_PRELOAD hack
 alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd
-eutils flag-o-matic multilib toolchain-funcs unpacker user
+eutils flag-o-matic multilib multiprocessing toolchain-funcs unpacker user
 multilib
 
 
diff --git a/metadata/cache/sys-apps/xinetd-2.3.15 b/metadata/cache/sys-apps/xinetd-2.3.15
index 7deb7f10b18b..884ca91235cf 100644
--- a/metadata/cache/sys-apps/xinetd-2.3.15
+++ b/metadata/cache/sys-apps/xinetd-2.3.15
@@ -6,7 +6,7 @@ http://www.xinetd.org/xinetd-2.3.15.tar.gz
 http://www.xinetd.org/
 BSD
 powerful replacement for inetd
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 perl rpc tcpd
 
diff --git a/metadata/cache/sys-auth/libyubikey-1.6 b/metadata/cache/sys-auth/libyubikey-1.6
deleted file mode 100644
index 59fe6bfd4efb..000000000000
--- a/metadata/cache/sys-auth/libyubikey-1.6
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-
-0
-http://yubico-c.googlecode.com/files/libyubikey-1.6.tar.gz
-
-http://code.google.com/p/yubico-c/
-BSD-2
-Yubico C low-level library
-~amd64
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/libyubikey-1.9 b/metadata/cache/sys-auth/libyubikey-1.9
new file mode 100644
index 000000000000..3a14b8ac2994
--- /dev/null
+++ b/metadata/cache/sys-auth/libyubikey-1.9
@@ -0,0 +1,22 @@
+
+
+0
+http://yubico-c.googlecode.com/files/libyubikey-1.9.tar.gz
+
+https://github.com/Yubico/yubico-c
+BSD-2
+Yubico C low-level library
+~amd64
+eutils multilib toolchain-funcs user
+static-libs
+
+
+
+4
+
+configure install test
+
+
+
+
+
diff --git a/metadata/cache/sys-auth/ykclient-2.3 b/metadata/cache/sys-auth/ykclient-2.3
deleted file mode 100644
index ddecaa6486af..000000000000
--- a/metadata/cache/sys-auth/ykclient-2.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-misc/curl-7.21.1 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=net-misc/curl-7.21.1
-0
-http://yubico-c-client.googlecode.com/files/ykclient-2.3.tar.gz
-test
-http://code.google.com/p/yubico-c-client/
-BSD-2
-Yubico C client library
-~amd64
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/ykclient-2.8 b/metadata/cache/sys-auth/ykclient-2.8
new file mode 100644
index 000000000000..60b2e75a242f
--- /dev/null
+++ b/metadata/cache/sys-auth/ykclient-2.8
@@ -0,0 +1,22 @@
+>=net-misc/curl-7.21.1
+>=net-misc/curl-7.21.1
+0
+http://yubico-c-client.googlecode.com/files/ykclient-2.8.tar.gz
+test
+https://github.com/Yubico/yubico-c-client
+BSD-2
+Yubico C client library
+~amd64
+eutils multilib toolchain-funcs user
+static-libs
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/sys-auth/ykpers-1.3.4 b/metadata/cache/sys-auth/ykpers-1.3.4
deleted file mode 100644
index 9f8e22118f7a..000000000000
--- a/metadata/cache/sys-auth/ykpers-1.3.4
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-auth/libyubikey-1.6 virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=sys-auth/libyubikey-1.6 virtual/libusb:1
-0
-http://yubikey-personalization.googlecode.com/files/ykpers-1.3.4.tar.gz
-
-http://code.google.com/p/yubikey-personalization
-BSD-2
-Library and tool for personalization of Yubico's YubiKey
-~amd64
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/ykpers-1.7.0 b/metadata/cache/sys-auth/ykpers-1.7.0
new file mode 100644
index 000000000000..efcd7b1922cf
--- /dev/null
+++ b/metadata/cache/sys-auth/ykpers-1.7.0
@@ -0,0 +1,22 @@
+>=sys-auth/libyubikey-1.6 virtual/libusb:1 virtual/pkgconfig
+>=sys-auth/libyubikey-1.6 virtual/libusb:1
+0
+http://yubikey-personalization.googlecode.com/files/ykpers-1.7.0.tar.gz
+
+https://github.com/Yubico/yubikey-personalization
+BSD-2
+Library and tool for personalization of Yubico's YubiKey
+~amd64
+eutils multilib toolchain-funcs user
+static-libs
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/automake-wrapper-7 b/metadata/cache/sys-devel/automake-wrapper-7
index 8869f092da5e..ea1d22d405a7 100644
--- a/metadata/cache/sys-devel/automake-wrapper-7
+++ b/metadata/cache/sys-devel/automake-wrapper-7
@@ -6,7 +6,7 @@
 http://www.gentoo.org/
 GPL-2
 wrapper for automake to manage multiple automake versions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/sys-kernel/cell-sources-2.6.18-r6 b/metadata/cache/sys-kernel/cell-sources-2.6.18-r6
index f57f91192ec7..2661f6c58360 100644
--- a/metadata/cache/sys-kernel/cell-sources-2.6.18-r6
+++ b/metadata/cache/sys-kernel/cell-sources-2.6.18-r6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.18-r6
 mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.18-arnd6/2.6.18-arnd6.diff.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/cell-sources-2.6.19_rc5-r1 b/metadata/cache/sys-kernel/cell-sources-2.6.19_rc5-r1
index 2c3c74a86a54..8a92107e24c5 100644
--- a/metadata/cache/sys-kernel/cell-sources-2.6.19_rc5-r1
+++ b/metadata/cache/sys-kernel/cell-sources-2.6.19_rc5-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.19_rc5-r1
 mirror://kernel/linux/kernel/v2.6/testing/patch-2.6.19-rc5.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.19-rc5-arnd1/2.6.19-rc5-arnd1.diff.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/cell-sources-2.6.19_rc6-r1 b/metadata/cache/sys-kernel/cell-sources-2.6.19_rc6-r1
index 5a37f8f489cd..c00606a314e0 100644
--- a/metadata/cache/sys-kernel/cell-sources-2.6.19_rc6-r1
+++ b/metadata/cache/sys-kernel/cell-sources-2.6.19_rc6-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.19_rc6-r1
 mirror://kernel/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.19-rc6-arnd1/2.6.19-rc6-arnd1.diff.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/cell-sources-2.6.24-r1 b/metadata/cache/sys-kernel/cell-sources-2.6.24-r1
index 531b0d6329f3..96f0054e58ba 100644
--- a/metadata/cache/sys-kernel/cell-sources-2.6.24-r1
+++ b/metadata/cache/sys-kernel/cell-sources-2.6.24-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.24-r1
 mirror://kernel/linux/kernel/v2.6/linux-2.6.24.tar.bz2 mirror://kernel/linux/kernel/people/geoff/cell/ps3-linux/patch-ps3-linux-2.6.24-stable.1.bz2 mirror://gentoo/genpatches-2.6.24-4.base.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-2.6.38-r3 b/metadata/cache/sys-kernel/ck-sources-2.6.38-r3
index c09c7ef33758..3bdfc9b63060 100644
--- a/metadata/cache/sys-kernel/ck-sources-2.6.38-r3
+++ b/metadata/cache/sys-kernel/ck-sources-2.6.38-r3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.38-r3
 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 mirror://gentoo/deblob-check-2.6.38 ) mirror://gentoo/genpatches-2.6.38-8.base.tar.bz2 mirror://gentoo/genpatches-2.6.38-8.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/2.6/2.6.38/2.6.38-ck3/patch-2.6.38-ck3.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-2.6.39-r2 b/metadata/cache/sys-kernel/ck-sources-2.6.39-r2
index 34701347428f..65e27b12fb33 100644
--- a/metadata/cache/sys-kernel/ck-sources-2.6.39-r2
+++ b/metadata/cache/sys-kernel/ck-sources-2.6.39-r2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.39-r2
 mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 mirror://gentoo/genpatches-2.6.39-4.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-4.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/2.6/2.6.39/2.6.39-ck2/patch-2.6.39-ck2.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.0.4 b/metadata/cache/sys-kernel/ck-sources-3.0.4
index a806c6ef5529..ef38ec307b76 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.0.4
+++ b/metadata/cache/sys-kernel/ck-sources-3.0.4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.4
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-5.base.tar.bz2 mirror://gentoo/genpatches-3.0-5.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/3.0/3.0.0-ck1/patch-3.0.0-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.1.4 b/metadata/cache/sys-kernel/ck-sources-3.1.4
index 2af311212e46..5a592670e856 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.1.4
+++ b/metadata/cache/sys-kernel/ck-sources-3.1.4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.4
 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 mirror://gentoo/genpatches-3.1-7.base.tar.bz2 mirror://gentoo/genpatches-3.1-7.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.1/3.1.0-ck2/patch-3.1.0-ck2.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.2.1 b/metadata/cache/sys-kernel/ck-sources-3.2.1
index e31fef26d0ec..8c22f2249e54 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.2.1
+++ b/metadata/cache/sys-kernel/ck-sources-3.2.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.1
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.2.5 b/metadata/cache/sys-kernel/ck-sources-3.2.5
index a1206ea5fe25..180320d58d44 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.2.5
+++ b/metadata/cache/sys-kernel/ck-sources-3.2.5
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.5
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-8.base.tar.bz2 mirror://gentoo/genpatches-3.2-8.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.2.6 b/metadata/cache/sys-kernel/ck-sources-3.2.6
index 3eb439a2ca01..5fb4f82d4aaa 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.2.6
+++ b/metadata/cache/sys-kernel/ck-sources-3.2.6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.6
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-9.base.tar.bz2 mirror://gentoo/genpatches-3.2-9.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.3.1 b/metadata/cache/sys-kernel/ck-sources-3.3.1
index 978be8bef2fa..d01df2bad955 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.3.1
+++ b/metadata/cache/sys-kernel/ck-sources-3.3.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.1
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 mirror://gentoo/genpatches-3.3-2.base.tar.bz2 mirror://gentoo/genpatches-3.3-2.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.3/3.3-ck1/patch-3.3-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/ck-sources-3.3.4 b/metadata/cache/sys-kernel/ck-sources-3.3.4
index 4b660fbbc01e..c283772f724f 100644
--- a/metadata/cache/sys-kernel/ck-sources-3.3.4
+++ b/metadata/cache/sys-kernel/ck-sources-3.3.4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.4
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.3/3.3-ck1/patch-3.3-ck1.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/cluster-sources-2.6.39 b/metadata/cache/sys-kernel/cluster-sources-2.6.39
index 02b77baf2dd0..237e84edaa72 100644
--- a/metadata/cache/sys-kernel/cluster-sources-2.6.39
+++ b/metadata/cache/sys-kernel/cluster-sources-2.6.39
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.39
 mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 mirror://gentoo/genpatches-2.6.39-2.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-2.extras.tar.bz2 http://dev.gentoo.org/~alexxy/cluster/clusterpathches-2.6.39-2.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2 b/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
index 16d39a49427b..ed309a7dfc39 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.17-r2
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-18.base.tar.bz2 mirror://gentoo/genpatches-3.0-18.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.33 b/metadata/cache/sys-kernel/gentoo-sources-3.0.33
index 39812ea8b191..9242b69480c3 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.33
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.33
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.33
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-25.base.tar.bz2 mirror://gentoo/genpatches-3.0-25.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.35 b/metadata/cache/sys-kernel/gentoo-sources-3.0.35
index 06552c3f47ff..18daaa78ce4e 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.35
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.35
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.35
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-26.base.tar.bz2 mirror://gentoo/genpatches-3.0-26.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.36 b/metadata/cache/sys-kernel/gentoo-sources-3.0.36
new file mode 100644
index 000000000000..97b96c9327a8
--- /dev/null
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.36
@@ -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 dev-lang/perl )
+3.0.36
+mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-27.base.tar.bz2 mirror://gentoo/genpatches-3.0-27.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 3.0 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1 b/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
index 143f446a4a52..dbf6d767140f 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.10-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-14.base.tar.bz2 mirror://gentoo/genpatches-3.1-14.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.1-r2 b/metadata/cache/sys-kernel/gentoo-sources-3.2.1-r2
index e2c5a90a4bef..b23e91b0919f 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.1-r2
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.2.1-r2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.1-r2
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.12 b/metadata/cache/sys-kernel/gentoo-sources-3.2.12
index eb4c305b71ca..9bf02c9bd436 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.12
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.2.12
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.12
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-12.base.tar.bz2 mirror://gentoo/genpatches-3.2-12.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.14 b/metadata/cache/sys-kernel/gentoo-sources-3.2.14
index 01420ab1a31c..2bad823fced9 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.14
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.2.14
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.14
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-13.base.tar.bz2 mirror://gentoo/genpatches-3.2-13.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.16 b/metadata/cache/sys-kernel/gentoo-sources-3.2.16
index a792a70b8f3e..4bb228c327bc 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.16
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.2.16
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.16
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.21 b/metadata/cache/sys-kernel/gentoo-sources-3.2.21
index 1ed49032e5c2..18089216af79 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.21
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.2.21
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.21
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-16.base.tar.bz2 mirror://gentoo/genpatches-3.2-16.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.3.7 b/metadata/cache/sys-kernel/gentoo-sources-3.3.7
index cac87bc1e1b2..66b86d32020a 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.3.7
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.3.7
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.7
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-8.base.tar.bz2 mirror://gentoo/genpatches-3.3-8.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.3.8 b/metadata/cache/sys-kernel/gentoo-sources-3.3.8
index 6658186a6037..1bd40bcb143f 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.3.8
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.3.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.8
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.3.8-r1 b/metadata/cache/sys-kernel/gentoo-sources-3.3.8-r1
index a8d4152bdd04..9bf65587505b 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.3.8-r1
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.3.8-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.8-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-10.base.tar.bz2 mirror://gentoo/genpatches-3.3-10.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.0 b/metadata/cache/sys-kernel/gentoo-sources-3.4.0
index d5a9ef9a45cc..7913022d222d 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.4.0
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.0
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.0
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.2 b/metadata/cache/sys-kernel/gentoo-sources-3.4.2
index 2d4cb3cd3dc0..e020c1c4daeb 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.4.2
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.2
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.2-r1 b/metadata/cache/sys-kernel/gentoo-sources-3.4.2-r1
index 6c699cc803ee..d286de642061 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.4.2-r1
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.2-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.2-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-3.base.tar.bz2 mirror://gentoo/genpatches-3.4-3.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.3 b/metadata/cache/sys-kernel/gentoo-sources-3.4.3
index 0035b7548d67..1625ea12002f 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.4.3
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.3
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-4.base.tar.bz2 mirror://gentoo/genpatches-3.4-4.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.4 b/metadata/cache/sys-kernel/gentoo-sources-3.4.4
new file mode 100644
index 000000000000..901c5f4f0f26
--- /dev/null
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.4
@@ -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 dev-lang/perl )
+3.4.4
+mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-5.base.tar.bz2 mirror://gentoo/genpatches-3.4-5.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 3.4 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+3
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/git-sources-3.5_rc1 b/metadata/cache/sys-kernel/git-sources-3.5_rc1
index 234af231b9b2..8442a27d04a7 100644
--- a/metadata/cache/sys-kernel/git-sources-3.5_rc1
+++ b/metadata/cache/sys-kernel/git-sources-3.5_rc1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 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
diff --git a/metadata/cache/sys-kernel/git-sources-3.5_rc2 b/metadata/cache/sys-kernel/git-sources-3.5_rc2
index 67b1557089de..898ca5e98978 100644
--- a/metadata/cache/sys-kernel/git-sources-3.5_rc2
+++ b/metadata/cache/sys-kernel/git-sources-3.5_rc2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.5_rc2
 mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/git-sources-3.5_rc3 b/metadata/cache/sys-kernel/git-sources-3.5_rc3
index bbf77bf1e4d6..658a0a567d8d 100644
--- a/metadata/cache/sys-kernel/git-sources-3.5_rc3
+++ b/metadata/cache/sys-kernel/git-sources-3.5_rc3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.5_rc3
 mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
index 665e5b734e71..0231e03410dd 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r108
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-110.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r109 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r109
index 378bb6713665..6d3d66bce81b 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r109
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r109
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r109
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-111.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110
index bca06326d30d..5483d5d2a42f 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r110
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-112.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r111 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r111
index 7259e7d70109..2dc0fa63a611 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r111
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r111
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r111
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-113.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r112 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r112
index 948ca2447614..5e9fcaffe980 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r112
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r112
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r112
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-114.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r42 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r42
index fd653df0e9d3..300b5ac5a560 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r42
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r42
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r42
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-45.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-34.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-34.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r90 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r90
index 45140ad53bcd..b0930c5232e8 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r90
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r90
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r90
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-92.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r95 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r95
index 663df3d6266f..4cb2cadf5a5e 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r95
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r95
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-r95
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-97.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.11 b/metadata/cache/sys-kernel/hardened-sources-3.2.11
index edb999978da5..438f3ff20fa7 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.11
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.11
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.11
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.11-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-11.base.tar.bz2 mirror://gentoo/genpatches-3.2-11.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.19 b/metadata/cache/sys-kernel/hardened-sources-3.2.19
index cae80751114a..aef554aeca90 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.19
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.19
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.19
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.19-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.19-r1 b/metadata/cache/sys-kernel/hardened-sources-3.2.19-r1
index 7c0d087423ce..07011de41f9f 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.19-r1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.19-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.19-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.19-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.2-r1 b/metadata/cache/sys-kernel/hardened-sources-3.2.2-r1
index efb1644b02c4..d2d0e7901779 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.2-r1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.2-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.2-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.2-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.20 b/metadata/cache/sys-kernel/hardened-sources-3.2.20
index 805857ed8df8..73d15f023e39 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.20
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.20
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.20
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.20-r1 b/metadata/cache/sys-kernel/hardened-sources-3.2.20-r1
index e0a419405d3b..1ab57e2b62d2 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.20-r1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.20-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.20-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.21 b/metadata/cache/sys-kernel/hardened-sources-3.2.21
index 9bfe4453cc2a..cc710a29ebeb 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.21
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.21
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.21
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.21-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.bz2 mirror://gentoo/genpatches-3.2-16.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.8 b/metadata/cache/sys-kernel/hardened-sources-3.3.8
index d14b13c9ef27..91a73bc65052 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.8
+++ b/metadata/cache/sys-kernel/hardened-sources-3.3.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.8
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.4.1 b/metadata/cache/sys-kernel/hardened-sources-3.4.1
index 4dbcea75c000..2392c345d7d1 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.4.1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.4.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.1
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.4.2 b/metadata/cache/sys-kernel/hardened-sources-3.4.2
index c335070ef8a0..8969eee26e78 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.4.2
+++ b/metadata/cache/sys-kernel/hardened-sources-3.4.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.2
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.4.3 b/metadata/cache/sys-kernel/hardened-sources-3.4.3
index 02e118a9f878..ed753f22a674 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.4.3
+++ b/metadata/cache/sys-kernel/hardened-sources-3.4.3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.3
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.3-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.4.3-r1 b/metadata/cache/sys-kernel/hardened-sources-3.4.3-r1
index 68505399234c..60e1c6339e9c 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.4.3-r1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.4.3-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.3-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.3-2.extras.tar.bz2 mirror://gentoo/genpatches-3.4-4.base.tar.bz2 mirror://gentoo/genpatches-3.4-4.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/mips-sources-2.6.29.1 b/metadata/cache/sys-kernel/mips-sources-2.6.29.1
index 3855c73544e2..d99ebdee9aae 100644
--- a/metadata/cache/sys-kernel/mips-sources-2.6.29.1
+++ b/metadata/cache/sys-kernel/mips-sources-2.6.29.1
@@ -1,5 +1,5 @@
 >=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.29
 mirror://kernel/linux/kernel/v2.6/patch-2.6.29.1.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.29.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.29.N/deblob-2.6.29 mirror://gentoo/deblob-check-2.6.29 ) mirror://gentoo/mipsgit-2.6.29-20090324.diff.bz2 mirror://gentoo/mips-sources-2.6.29-patches-v3.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/mips-sources-3.0.9-r1 b/metadata/cache/sys-kernel/mips-sources-3.0.9-r1
index 1b0c32821212..3f5ff0541af3 100644
--- a/metadata/cache/sys-kernel/mips-sources-3.0.9-r1
+++ b/metadata/cache/sys-kernel/mips-sources-3.0.9-r1
@@ -1,5 +1,5 @@
 >=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.9
 mirror://kernel/linux/kernel/v3.x/patch-3.0.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/mipsgit-3.0.0-20110821.diff.xz mirror://gentoo/mips-sources-3.0.0-patches-v3.tar.xz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/mips-sources-3.1.6 b/metadata/cache/sys-kernel/mips-sources-3.1.6
index 0c4ad948b4c6..0214de9a0734 100644
--- a/metadata/cache/sys-kernel/mips-sources-3.1.6
+++ b/metadata/cache/sys-kernel/mips-sources-3.1.6
@@ -1,5 +1,5 @@
 >=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.6
 mirror://kernel/linux/kernel/v3.x/patch-3.1.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 mirror://gentoo/mipsgit-3.1.0-20111216.diff.xz mirror://gentoo/mips-sources-3.1.0-patches-v2.tar.xz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/openvz-sources-2.6.18.028.099.3 b/metadata/cache/sys-kernel/openvz-sources-2.6.18.028.099.3
index 6ea35f922355..2a025c0e13ff 100644
--- a/metadata/cache/sys-kernel/openvz-sources-2.6.18.028.099.3
+++ b/metadata/cache/sys-kernel/openvz-sources-2.6.18.028.099.3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.18.028.099.3
 mirror://kernel/linux/kernel/v./linux-2.6.18.tar.bz2 http://download.openvz.org/kernel/branches/rhel5-2.6.18/028stab099.3/patches/patch-308.el5.028stab099.3-combined.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/openvz-sources-2.6.32.11.1 b/metadata/cache/sys-kernel/openvz-sources-2.6.32.11.1
index ef6d55f7535c..4cb7c7f51769 100644
--- a/metadata/cache/sys-kernel/openvz-sources-2.6.32.11.1
+++ b/metadata/cache/sys-kernel/openvz-sources-2.6.32.11.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32-feoktistov.1
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/2.6.32/2.6.32-feoktistov.1/patches/patch-feoktistov.1-combined.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/openvz-sources-2.6.32.49.6 b/metadata/cache/sys-kernel/openvz-sources-2.6.32.49.6
index f7133203d71f..f606307905a0 100644
--- a/metadata/cache/sys-kernel/openvz-sources-2.6.32.49.6
+++ b/metadata/cache/sys-kernel/openvz-sources-2.6.32.49.6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32.49.6
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab049.6/patches/patch-042stab049.6-combined.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/openvz-sources-2.6.32.53.5 b/metadata/cache/sys-kernel/openvz-sources-2.6.32.53.5
index 45fdcc02a317..9e25917802e2 100644
--- a/metadata/cache/sys-kernel/openvz-sources-2.6.32.53.5
+++ b/metadata/cache/sys-kernel/openvz-sources-2.6.32.53.5
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32.53.5
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab053.5/patches/patch-042stab053.5-combined.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.31_p9 b/metadata/cache/sys-kernel/pf-sources-2.6.31_p9
index 31552f2843d0..89d4b5de4d94 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.31_p9
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.31_p9
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.31_p9
 mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-2.6.31 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-check -> deblob-check-2.6.31 ) http://pf.natalenko.name/sources/2.6.31/patch-2.6.31-pf9.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.32_p16 b/metadata/cache/sys-kernel/pf-sources-2.6.32_p16
index ed014b8253ad..fa02403c3fbe 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.32_p16
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.32_p16
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32_p16
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://pf.natalenko.name/sources/2.6.32/patch-2.6.32-pf16.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.33_p4 b/metadata/cache/sys-kernel/pf-sources-2.6.33_p4
index 79104f1d7f86..e46c21d1db3e 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.33_p4
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.33_p4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.33_p4
 mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-2.6.33 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-check -> deblob-check-2.6.33 ) http://pf.natalenko.name/sources/2.6.33/patch-2.6.33-pf4.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.34_p7 b/metadata/cache/sys-kernel/pf-sources-2.6.34_p7
index 9f0510c8e7d1..bc537b5b3578 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.34_p7
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.34_p7
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.34_p7
 mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-check -> deblob-check-2.6.34 ) http://pf.natalenko.name/sources/2.6.34/patch-2.6.34-pf7.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.35_p11 b/metadata/cache/sys-kernel/pf-sources-2.6.35_p11
index 5adbce3ec673..f268f1a5e18c 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.35_p11
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.35_p11
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.35_p11
 mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) http://pf.natalenko.name/sources/2.6.35/patch-2.6.35-pf11.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.36_p6 b/metadata/cache/sys-kernel/pf-sources-2.6.36_p6
index 34a852b0ae6a..ae4d7a754769 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.36_p6
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.36_p6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.36_p6
 mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://pf.natalenko.name/sources/2.6.36/patch-2.6.36-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.37_p6 b/metadata/cache/sys-kernel/pf-sources-2.6.37_p6
index 4e97411220f3..e8c7f66caec6 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.37_p6
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.37_p6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.37_p6
 mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-2.6.37 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-check -> deblob-check-2.6.37 ) http://pf.natalenko.name/sources/2.6.37/patch-2.6.37-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.38_p8 b/metadata/cache/sys-kernel/pf-sources-2.6.38_p8
index c791bb9fc47b..c61d7bdf62af 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.38_p8
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.38_p8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.38_p8
 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) http://pf.natalenko.name/sources/2.6.38/patch-2.6.38-pf8.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-2.6.39_p4 b/metadata/cache/sys-kernel/pf-sources-2.6.39_p4
index 82f197c86e04..1508aa5c1827 100644
--- a/metadata/cache/sys-kernel/pf-sources-2.6.39_p4
+++ b/metadata/cache/sys-kernel/pf-sources-2.6.39_p4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.39_p4
 mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 http://pf.natalenko.name/sources/2.6.39/patch-2.6.39-pf4.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-3.0.7-r2 b/metadata/cache/sys-kernel/pf-sources-3.0.7-r2
index 921c2d9fed57..5f447edb69af 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.0.7-r2
+++ b/metadata/cache/sys-kernel/pf-sources-3.0.7-r2
@@ -1,7 +1,7 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.7-r2
-mirror://kernel/linux/kernel/v3.0/linux-3.0.tar.bz2 http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
+mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
 binchecks strip
 http://pf.natalenko.name/
 GPL-2 freedist
diff --git a/metadata/cache/sys-kernel/pf-sources-3.1.6-r2 b/metadata/cache/sys-kernel/pf-sources-3.1.6-r2
index 39933a6c6201..ab887ee71c3a 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.1.6-r2
+++ b/metadata/cache/sys-kernel/pf-sources-3.1.6-r2
@@ -1,7 +1,7 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.6-r2
-mirror://kernel/linux/kernel/v3.0/linux-3.1.tar.bz2 http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
+mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
 binchecks strip
 http://pf.natalenko.name/
 GPL-2 freedist
diff --git a/metadata/cache/sys-kernel/pf-sources-3.2.7 b/metadata/cache/sys-kernel/pf-sources-3.2.7
index c9e2c02436fb..a00dff94247c 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.2.7
+++ b/metadata/cache/sys-kernel/pf-sources-3.2.7
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.7
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://pf.natalenko.name/sources/3.2/patch-3.2.7-pf.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-3.3.6 b/metadata/cache/sys-kernel/pf-sources-3.3.6
index 30b439c78b45..878a51a73213 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.3.6
+++ b/metadata/cache/sys-kernel/pf-sources-3.3.6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.6
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://pf.natalenko.name/sources/3.3/patch-3.3.6-pf.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-3.4.1 b/metadata/cache/sys-kernel/pf-sources-3.4.1
index f5a536ffa9db..863b0cb6a5c5 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.4.1
+++ b/metadata/cache/sys-kernel/pf-sources-3.4.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.1
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.1-pf.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/pf-sources-3.4.2 b/metadata/cache/sys-kernel/pf-sources-3.4.2
index da15ed807f17..f8d466ce383d 100644
--- a/metadata/cache/sys-kernel/pf-sources-3.4.2
+++ b/metadata/cache/sys-kernel/pf-sources-3.4.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.2
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.2-pf.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rsbac-sources-3.1.5 b/metadata/cache/sys-kernel/rsbac-sources-3.1.5
index e274f028bbb1..a7f1101a116f 100644
--- a/metadata/cache/sys-kernel/rsbac-sources-3.1.5
+++ b/metadata/cache/sys-kernel/rsbac-sources-3.1.5
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.5
 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.1.5-1.extras.tar.bz2 mirror://gentoo/genpatches-3.1-8.base.tar.bz2 mirror://gentoo/genpatches-3.1-8.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rsbac-sources-3.2.19 b/metadata/cache/sys-kernel/rsbac-sources-3.2.19
index c3f2b46d7873..ed607682cfba 100644
--- a/metadata/cache/sys-kernel/rsbac-sources-3.2.19
+++ b/metadata/cache/sys-kernel/rsbac-sources-3.2.19
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.19
 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.2.19-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rsbac-sources-3.3.8 b/metadata/cache/sys-kernel/rsbac-sources-3.3.8
index 6ac8f3defdc6..c8337124d490 100644
--- a/metadata/cache/sys-kernel/rsbac-sources-3.3.8
+++ b/metadata/cache/sys-kernel/rsbac-sources-3.3.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.8
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.3.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rsbac-sources-3.4.1 b/metadata/cache/sys-kernel/rsbac-sources-3.4.1
index c34a357c02be..452c4b4b214f 100644
--- a/metadata/cache/sys-kernel/rsbac-sources-3.4.1
+++ b/metadata/cache/sys-kernel/rsbac-sources-3.4.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.1
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.4.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rt-sources-3.0.14_p31 b/metadata/cache/sys-kernel/rt-sources-3.0.14_p31
index 4c5763160485..46b29598bd34 100644
--- a/metadata/cache/sys-kernel/rt-sources-3.0.14_p31
+++ b/metadata/cache/sys-kernel/rt-sources-3.0.14_p31
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.14_p31
 mirror://kernel/linux/kernel/v3.x/patch-3.0.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://kernel/linux/kernel/projects/rt/3.0/patch-3.0.14-rt31.patch.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rt-sources-3.0.27_p46 b/metadata/cache/sys-kernel/rt-sources-3.0.27_p46
index fe6266dfc43b..b50f6eddc18c 100644
--- a/metadata/cache/sys-kernel/rt-sources-3.0.27_p46
+++ b/metadata/cache/sys-kernel/rt-sources-3.0.27_p46
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.27_p46
 mirror://kernel/linux/kernel/v3.x/patch-3.0.27.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://kernel/linux/kernel/projects/rt/3.0/patch-3.0.27-rt46.patch.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/rt-sources-3.2.14_p24 b/metadata/cache/sys-kernel/rt-sources-3.2.14_p24
index 8ec3c554336e..c1db737756a6 100644
--- a/metadata/cache/sys-kernel/rt-sources-3.2.14_p24
+++ b/metadata/cache/sys-kernel/rt-sources-3.2.14_p24
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.14_p24
 mirror://kernel/linux/kernel/v3.x/patch-3.2.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://kernel/linux/kernel/projects/rt/3.2/patch-3.2.14-rt24.patch.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1 b/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1
index 62b7d4c19c7b..8cc230950130 100644
--- a/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1
+++ b/metadata/cache/sys-kernel/tuxonice-sources-3.0.17-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.17-r1
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-18.base.tar.bz2 mirror://gentoo/genpatches-3.0-18.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/tuxonice-sources-3.0.33 b/metadata/cache/sys-kernel/tuxonice-sources-3.0.33
index 3a35ab29b793..63edd1c9b69b 100644
--- a/metadata/cache/sys-kernel/tuxonice-sources-3.0.33
+++ b/metadata/cache/sys-kernel/tuxonice-sources-3.0.33
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.33
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-25.base.tar.bz2 mirror://gentoo/genpatches-3.0-25.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/tuxonice-sources-3.0.35 b/metadata/cache/sys-kernel/tuxonice-sources-3.0.35
index c7e32f7e17ab..c70d3abb799f 100644
--- a/metadata/cache/sys-kernel/tuxonice-sources-3.0.35
+++ b/metadata/cache/sys-kernel/tuxonice-sources-3.0.35
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.35
 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-26.base.tar.bz2 mirror://gentoo/genpatches-3.0-26.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-2.6.16.62 b/metadata/cache/sys-kernel/vanilla-sources-2.6.16.62
index 9ec0c9d62844..89f94864697b 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-2.6.16.62
+++ b/metadata/cache/sys-kernel/vanilla-sources-2.6.16.62
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.16.62
 mirror://kernel/linux/kernel/v2.6/patch-2.6.16.62.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-2.6.32.58 b/metadata/cache/sys-kernel/vanilla-sources-2.6.32.58
index 876967eb053c..dded78d61089 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-2.6.32.58
+++ b/metadata/cache/sys-kernel/vanilla-sources-2.6.32.58
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32.58
 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/patch-2.6.32.58.bz2 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-2.6.32.59 b/metadata/cache/sys-kernel/vanilla-sources-2.6.32.59
index 625f32fc3d7b..a1746406dcc0 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-2.6.32.59
+++ b/metadata/cache/sys-kernel/vanilla-sources-2.6.32.59
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32.59
 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/patch-2.6.32.59.bz2 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-2.6.38.7 b/metadata/cache/sys-kernel/vanilla-sources-2.6.38.7
index 689b7bb113d7..583223cb0142 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-2.6.38.7
+++ b/metadata/cache/sys-kernel/vanilla-sources-2.6.38.7
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.38.7
 mirror://kernel/linux/kernel/v2.6/patch-2.6.38.7.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-2.6.38.8 b/metadata/cache/sys-kernel/vanilla-sources-2.6.38.8
index ac299ad4bdfc..b77039320adf 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-2.6.38.8
+++ b/metadata/cache/sys-kernel/vanilla-sources-2.6.38.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.38.8
 mirror://kernel/linux/kernel/v2.6/patch-2.6.38.8.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.34 b/metadata/cache/sys-kernel/vanilla-sources-3.0.34
index 6b03426b6666..958035988d45 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.0.34
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.0.34
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.34
 mirror://kernel/linux/kernel/v3.x/patch-3.0.34.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.35 b/metadata/cache/sys-kernel/vanilla-sources-3.0.35
index 63f66d9de876..2b8b9af72b4d 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.0.35
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.0.35
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.35
 mirror://kernel/linux/kernel/v3.x/patch-3.0.35.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.0.36 b/metadata/cache/sys-kernel/vanilla-sources-3.0.36
index 8900be97cd08..58181c010101 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.0.36
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.0.36
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.0.36
 mirror://kernel/linux/kernel/v3.x/patch-3.0.36.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.10 b/metadata/cache/sys-kernel/vanilla-sources-3.1.10
index 2ee6d8c10d3b..224a1b32a691 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.1.10
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.10
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.10
 mirror://kernel/linux/kernel/v3.x/patch-3.1.10.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.6 b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
index cde194a55bc4..d7314b04ee2c 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.1.6
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.6
 mirror://kernel/linux/kernel/v3.x/patch-3.1.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.9 b/metadata/cache/sys-kernel/vanilla-sources-3.1.9
index cbf85a16bf55..277cd00e6595 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.1.9
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.9
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.1.9
 mirror://kernel/linux/kernel/v3.x/patch-3.1.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.12 b/metadata/cache/sys-kernel/vanilla-sources-3.2.12
index 483c94267350..255a334cef1b 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.2.12
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.12
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.12
 mirror://kernel/linux/kernel/v3.x/patch-3.2.12.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.19 b/metadata/cache/sys-kernel/vanilla-sources-3.2.19
index ba1d7d7c9421..34962d269667 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.2.19
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.19
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.19
 mirror://kernel/linux/kernel/v3.x/patch-3.2.19.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.2 b/metadata/cache/sys-kernel/vanilla-sources-3.2.2
index e4b637d3a848..5785525604af 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.2.2
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.2
 mirror://kernel/linux/kernel/v3.x/patch-3.2.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.20 b/metadata/cache/sys-kernel/vanilla-sources-3.2.20
index 5c6a20267c98..14beca3acd8b 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.2.20
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.20
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.20
 mirror://kernel/linux/kernel/v3.x/patch-3.2.20.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.21 b/metadata/cache/sys-kernel/vanilla-sources-3.2.21
index 13ecc61ffa35..d5cc1cfb0bbf 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.2.21
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.21
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.2.21
 mirror://kernel/linux/kernel/v3.x/patch-3.2.21.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.3.0 b/metadata/cache/sys-kernel/vanilla-sources-3.3.0
index ab16a4f3637f..db9e53ff5269 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.3.0
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.3.0
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.0
 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.3.5 b/metadata/cache/sys-kernel/vanilla-sources-3.3.5
index 87a4341e1ffa..f4c65124579b 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.3.5
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.3.5
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.5
 mirror://kernel/linux/kernel/v3.x/patch-3.3.5.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.3.6 b/metadata/cache/sys-kernel/vanilla-sources-3.3.6
index 522ab16a8098..b77284918ac1 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.3.6
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.3.6
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.6
 mirror://kernel/linux/kernel/v3.x/patch-3.3.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.3.8 b/metadata/cache/sys-kernel/vanilla-sources-3.3.8
index ab1459ff47cf..f3cab87d29ed 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.3.8
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.3.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.3.8
 mirror://kernel/linux/kernel/v3.x/patch-3.3.8.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.4.0 b/metadata/cache/sys-kernel/vanilla-sources-3.4.0
index cf001c978acc..c17740acd5ec 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.4.0
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.4.0
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.0
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.4.1 b/metadata/cache/sys-kernel/vanilla-sources-3.4.1
index 27799e3f691e..2609309dad61 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.4.1
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.4.1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.1
 mirror://kernel/linux/kernel/v3.x/patch-3.4.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.4.2 b/metadata/cache/sys-kernel/vanilla-sources-3.4.2
index 262a9ba82a0e..236d2ac226aa 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.4.2
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.4.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.2
 mirror://kernel/linux/kernel/v3.x/patch-3.4.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.4.3 b/metadata/cache/sys-kernel/vanilla-sources-3.4.3
index 7e34b2d03d62..2dbf82cfd66a 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.4.3
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.4.3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.3
 mirror://kernel/linux/kernel/v3.x/patch-3.4.3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.4.4 b/metadata/cache/sys-kernel/vanilla-sources-3.4.4
index c23e1b11b540..362d2582269e 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.4.4
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.4.4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 3.4.4
 mirror://kernel/linux/kernel/v3.x/patch-3.4.4.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.0.36.32 b/metadata/cache/sys-kernel/vserver-sources-2.3.0.36.32
index 5c68b4bb2df3..1c703afbfc0d 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.0.36.32
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.0.36.32
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.0.36.32
 mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 mirror://gentoo/deblob-check-2.6.35 ) mirror://gentoo/genpatches-2.6.35-9.base.tar.bz2 mirror://gentoo/genpatches-2.6.35-9.extras.tar.bz2 http://dev.gentoo.org/~hollow/distfiles/vserver-patches-2.6.35_2.3.0.36.32.tar.bz2
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.2.8 b/metadata/cache/sys-kernel/vserver-sources-2.3.2.8
index ff95005cfc92..9a5866c51d99 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.2.8
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.2.8
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.2.8
 mirror://kernel/linux/kernel/v3.x/patch-3.2.11.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.2.11-vs2.3.2.8.diff
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.3.2 b/metadata/cache/sys-kernel/vserver-sources-2.3.3.2
index 4aefa998f82a..94e4e0120902 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.3.2
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.3.2
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.3.2
 mirror://kernel/linux/kernel/v3.x/patch-3.3.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.3.1-vs2.3.3.2.diff
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.3.3 b/metadata/cache/sys-kernel/vserver-sources-2.3.3.3
index 8fcf80c33d45..143d0bfaead3 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.3.3
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.3.3
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.3.3
 mirror://kernel/linux/kernel/v3.x/patch-3.3.5.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.3.5-vs2.3.3.3.diff
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.3.4 b/metadata/cache/sys-kernel/vserver-sources-2.3.3.4
index 5729ed2f0cc5..946f3893b42d 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.3.4
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.3.4
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.3.4
 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.4-vs2.3.3.4.diff
 binchecks strip
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.3.4-r1 b/metadata/cache/sys-kernel/vserver-sources-2.3.3.4-r1
index 41ec429a7bff..4d6114f74289 100644
--- a/metadata/cache/sys-kernel/vserver-sources-2.3.3.4-r1
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.3.4-r1
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.3.3.4-r1
 mirror://kernel/linux/kernel/v3.x/patch-3.4.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.4.1-vs2.3.3.4.diff
 binchecks strip
diff --git a/metadata/cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/cache/sys-kernel/xbox-sources-2.6.16.26
index b53bd741fcf1..e8eda758ad3d 100644
--- a/metadata/cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/cache/sys-kernel/xbox-sources-2.6.16.26
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.16.26
 mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.bz2 mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.30_p11 b/metadata/cache/sys-kernel/zen-sources-2.6.30_p11
index 1cd058cfd0d7..9ea35d4de899 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.30_p11
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.30_p11
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.30_p11
 mirror://kernel/linux/kernel/v2.6/linux-2.6.30.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.30.N/deblob-2.6.30 mirror://gentoo/deblob-check-2.6.30 ) http://downloads.zen-kernel.org/2.6.30/2.6.30-zen11.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.31_p12 b/metadata/cache/sys-kernel/zen-sources-2.6.31_p12
index f9ed92d38a26..9b28fa72b48a 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.31_p12
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.31_p12
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.31_p12
 mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-2.6.31 mirror://gentoo/deblob-check-2.6.31 ) http://downloads.zen-kernel.org/2.6.31/2.6.31-zen12.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.32_p7-r1 b/metadata/cache/sys-kernel/zen-sources-2.6.32_p7-r1
index 30b28591eaf0..6b7bddc25670 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.32_p7-r1
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.32_p7-r1
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.32_p7-r1
 mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://downloads.zen-kernel.org/2.6.32/2.6.32-zen7.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.33_p3 b/metadata/cache/sys-kernel/zen-sources-2.6.33_p3
index 4323da5e4fef..aaca2e5e2dd8 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.33_p3
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.33_p3
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.33_p3
 mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-2.6.33 mirror://gentoo/deblob-check-2.6.33 ) http://downloads.zen-kernel.org/2.6.33/2.6.33-zen3.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.34_p1-r2 b/metadata/cache/sys-kernel/zen-sources-2.6.34_p1-r2
index ac614a2f78c7..1e57dd075941 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.34_p1-r2
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.34_p1-r2
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.34_p1-r2
 mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-check -> deblob-check-2.6.34 ) http://downloads.zen-kernel.org/2.6.34/2.6.34-zen1.patch.lzma bfq? ( http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch -> 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.35_p2 b/metadata/cache/sys-kernel/zen-sources-2.6.35_p2
index bf7f9f460ec5..87fb6ae50412 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.35_p2
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.35_p2
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.35_p2
 mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) http://downloads.zen-kernel.org/2.6.35/2.6.35-zen2.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.36_p1 b/metadata/cache/sys-kernel/zen-sources-2.6.36_p1
index 6b3be1470dfe..45c9afd6dc56 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.36_p1
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.36_p1
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.36_p1
 mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://downloads.zen-kernel.org/2.6.36/2.6.36-zen1.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.36_p2 b/metadata/cache/sys-kernel/zen-sources-2.6.36_p2
index f2c9516e20a2..ea15204823d3 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.36_p2
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.36_p2
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.36_p2
 mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://downloads.zen-kernel.org/2.6.36/2.6.36-zen2.patch.lzma
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.37_p20110325 b/metadata/cache/sys-kernel/zen-sources-2.6.37_p20110325
index ec512bb7e280..c2647b1096a6 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.37_p20110325
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.37_p20110325
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.37_p20110325
 mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-2.6.37 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-check -> deblob-check-2.6.37 ) http://dev.gentoo.org/~hwoarang/distfiles/zen-patch-2.6.37_p20110325.diff.gz
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-2.6.38_p20110510 b/metadata/cache/sys-kernel/zen-sources-2.6.38_p20110510
index da53e51ac443..48e5717cfd7a 100644
--- a/metadata/cache/sys-kernel/zen-sources-2.6.38_p20110510
+++ b/metadata/cache/sys-kernel/zen-sources-2.6.38_p20110510
@@ -1,5 +1,5 @@
 || ( app-arch/xz-utils app-arch/lzma-utils ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 2.6.38_p20110510
 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) http://dev.gentoo.org/~hwoarang/distfiles/zen-patch-2.6.38_p20110510.diff.gz tuxonice? ( http://tuxonice.net/files/tuxonice-3.2-for-2.6.38.patch.bz2 )
 binchecks strip
diff --git a/metadata/cache/sys-kernel/zen-sources-9999 b/metadata/cache/sys-kernel/zen-sources-9999
index c37e15b7b932..f211670bf34e 100644
--- a/metadata/cache/sys-kernel/zen-sources-9999
+++ b/metadata/cache/sys-kernel/zen-sources-9999
@@ -1,5 +1,5 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) dev-vcs/git
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 9999
 
 binchecks strip
diff --git a/metadata/cache/sys-libs/mtdev-1.1.2 b/metadata/cache/sys-libs/mtdev-1.1.2
index f57e6f12c54e..8f0a7d8f6155 100644
--- a/metadata/cache/sys-libs/mtdev-1.1.2
+++ b/metadata/cache/sys-libs/mtdev-1.1.2
@@ -6,7 +6,7 @@ http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2
 http://bitmath.org/code/mtdev/
 MIT
 Multitouch Protocol Translation Library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 
 static-libs
 
diff --git a/metadata/cache/sys-process/parallel-20120522 b/metadata/cache/sys-process/parallel-20120522
index 29651ad93606..9bf643ce0cb3 100644
--- a/metadata/cache/sys-process/parallel-20120522
+++ b/metadata/cache/sys-process/parallel-20120522
@@ -6,7 +6,7 @@ mirror://gnu/parallel/parallel-20120522.tar.bz2
 http://www.gnu.org/software/parallel/
 GPL-3
 A shell tool for executing jobs in parallel locally or on remote machines
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sys-process/parallel-20120622 b/metadata/cache/sys-process/parallel-20120622
new file mode 100644
index 000000000000..4e2410b5bf71
--- /dev/null
+++ b/metadata/cache/sys-process/parallel-20120622
@@ -0,0 +1,22 @@
+dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO !<sys-apps/moreutils-0.45-r1 !<sci-geosciences/grass-6.4.1-r1
+dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+0
+mirror://gnu/parallel/parallel-20120622.tar.bz2
+
+http://www.gnu.org/software/parallel/
+GPL-3
+A shell tool for executing jobs in parallel locally or on remote machines
+~amd64 ~x86 ~amd64-linux ~x86-linux
+
+
+
+
+
+4
+
+configure install postinst
+
+
+
+
+
diff --git a/metadata/cache/virtual/perl-Text-ParseWords-3.270.0 b/metadata/cache/virtual/perl-Text-ParseWords-3.270.0
new file mode 100644
index 000000000000..9f99b7e14aa2
--- /dev/null
+++ b/metadata/cache/virtual/perl-Text-ParseWords-3.270.0
@@ -0,0 +1,22 @@
+
+|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* =dev-lang/perl-5.12* ~perl-core/Text-ParseWords-3.270.0 )
+0
+
+
+
+
+Virtual for Text-ParseWords
+~amd64 ~x86
+
+
+
+
+
+
+
+-
+
+
+
+
+
diff --git a/metadata/cache/www-apache/mod_security-2.7.0_rc2 b/metadata/cache/www-apache/mod_security-2.7.0_rc2
new file mode 100644
index 000000000000..2745691c88f7
--- /dev/null
+++ b/metadata/cache/www-apache/mod_security-2.7.0_rc2
@@ -0,0 +1,22 @@
+>=dev-libs/libxml2-2.7.8 dev-libs/libpcre[jit?] lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2*
+>=dev-libs/libxml2-2.7.8 dev-libs/libpcre[jit?] lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
+0
+mirror://sourceforge/project/mod-security/modsecurity-apache/2.7.0-rc2/modsecurity-apache_2.7.0-rc2.tar.gz
+test
+http://www.modsecurity.org/
+Apache-2.0
+Web application firewall and Intrusion Detection System for Apache.
+~amd64 ~ppc ~sparc ~x86
+apache-module depend.apache multilib toolchain-funcs
+geoip curl lua jit
+
+>=www-apache/modsecurity-crs-2.2.5
+
+4
+
+compile configure install postinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/www-apps/gnopaste-0.5.5 b/metadata/cache/www-apps/gnopaste-0.5.5
index c26cfcbcc489..7a04066eb005 100644
--- a/metadata/cache/www-apps/gnopaste-0.5.5
+++ b/metadata/cache/www-apps/gnopaste-0.5.5
@@ -1,5 +1,5 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-virtual/httpd-php >=app-admin/webapp-config-1.50.15
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+virtual/httpd-php dev-lang/php[mysql] >=app-admin/webapp-config-1.50.15
 0.5.5
 mirror://sourceforge/gnopaste/gnopaste-0.5.5.tgz
 
@@ -7,14 +7,14 @@ http://gnopaste.sf.net/
 GPL-2
 gnopaste is a nopaste script based on PHP with MySQL
 ~x86 ~amd64
-depend.php eutils multilib phpconfutils toolchain-funcs user webapp
+eutils multilib toolchain-funcs user webapp
 vhosts
 
 
 
+4
 
-
-install postinst prerm setup unpack
+install postinst prepare prerm setup
 
 
 
diff --git a/metadata/cache/www-apps/groupoffice-2.15 b/metadata/cache/www-apps/groupoffice-2.15
deleted file mode 100644
index 6efa1dbca376..000000000000
--- a/metadata/cache/www-apps/groupoffice-2.15
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/php >=app-admin/webapp-config-1.50.15
-dev-lang/php >=app-admin/webapp-config-1.50.15
-2.15
-mirror://sourceforge/group-office/groupoffice-com-2.15.tar.gz
-
-http://group-office.sourceforge.net/
-GPL-2
-Group-Office is a powerful modular Intranet application framework
-alpha amd64 ~ppc ~sparc ~x86
-depend.php eutils multilib phpconfutils toolchain-funcs user webapp
-vhosts
-
-
-
-
-
-install postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/groupoffice-2.16.8 b/metadata/cache/www-apps/groupoffice-2.16.8
deleted file mode 100644
index 78d8ca104bd5..000000000000
--- a/metadata/cache/www-apps/groupoffice-2.16.8
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/php >=app-admin/webapp-config-1.50.15
-dev-lang/php >=app-admin/webapp-config-1.50.15
-2.16.8
-mirror://sourceforge/group-office/groupoffice-com-2.16-8.tar.gz
-
-http://group-office.sourceforge.net/
-GPL-2
-Group-Office is a powerful modular Intranet application framework
-~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
-depend.php eutils multilib phpconfutils toolchain-funcs user versionator webapp
-vhosts
-
-
-
-
-
-install postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/groupoffice-3.7.52 b/metadata/cache/www-apps/groupoffice-3.7.52
new file mode 100644
index 000000000000..eb4ed8dd1103
--- /dev/null
+++ b/metadata/cache/www-apps/groupoffice-3.7.52
@@ -0,0 +1,22 @@
+>=app-admin/webapp-config-1.50.15
+app-arch/zip app-arch/unzip virtual/httpd-cgi dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib] >=app-admin/webapp-config-1.50.15
+3.7.52
+mirror://sourceforge/group-office/groupoffice-com-3.7.52.tar.gz
+
+http://group-office.sourceforge.net/
+AGPL-3
+Group-Office is a powerful modular Intranet application framework
+~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/groupoffice-4.0.47 b/metadata/cache/www-apps/groupoffice-4.0.47
new file mode 100644
index 000000000000..10ed5cc28835
--- /dev/null
+++ b/metadata/cache/www-apps/groupoffice-4.0.47
@@ -0,0 +1,22 @@
+>=app-admin/webapp-config-1.50.15
+app-arch/zip app-arch/unzip virtual/httpd-cgi dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib] >=app-admin/webapp-config-1.50.15
+4.0.47
+mirror://sourceforge/group-office/groupoffice-com-4.0.47.tar.gz
+
+http://group-office.sourceforge.net/
+AGPL-3
+Group-Office is a powerful modular Intranet application framework
+~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/online-bookmarks-0.8.14_beta b/metadata/cache/www-apps/online-bookmarks-0.8.14_beta
new file mode 100644
index 000000000000..cd62f3c5393c
--- /dev/null
+++ b/metadata/cache/www-apps/online-bookmarks-0.8.14_beta
@@ -0,0 +1,22 @@
+>=app-admin/webapp-config-1.50.15
+virtual/httpd-php dev-lang/php[mysql] dev-php/PEAR-Auth dev-php/PEAR-DB >=app-admin/webapp-config-1.50.15
+0.8.14_beta
+http://www.frech.ch/online-bookmarks/download/online-bookmarks-0.8.14_beta.tar.gz
+
+http://www.frech.ch/online-bookmarks/index.php
+GPL-2
+A Bookmark management system to store your Bookmarks, Favorites and Links.
+~amd64 ~ppc ~x86
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/phpmp-0.11.0-r1 b/metadata/cache/www-apps/phpmp-0.11.0-r1
index 01b2a01d3c27..b411d9529b67 100644
--- a/metadata/cache/www-apps/phpmp-0.11.0-r1
+++ b/metadata/cache/www-apps/phpmp-0.11.0-r1
@@ -1,5 +1,5 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+virtual/httpd-php || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=app-admin/webapp-config-1.50.15
 0.11.0-r1
 mirror://sourceforge/musicpd/phpMp-0.11.0.tar.gz
 
@@ -7,7 +7,7 @@ http://www.musicpd.org/
 GPL-2
 phpMp is a client program for Music Player Daemon (mpd)
 ~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd
-depend.php eutils multilib phpconfutils toolchain-funcs user webapp
+webapp
 vhosts
 
 
diff --git a/metadata/cache/www-client/lynx-2.8.8_pre12 b/metadata/cache/www-client/lynx-2.8.8_pre12
index fa98a02966d4..8d8377a2ea76 100644
--- a/metadata/cache/www-client/lynx-2.8.8_pre12
+++ b/metadata/cache/www-client/lynx-2.8.8_pre12
@@ -1,5 +1,5 @@
-sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
+sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 0
 http://lynx.isc.org/current/lynx2.8.8dev.12.tar.bz2
 
diff --git a/metadata/cache/x11-apps/bitmap-1.0.6 b/metadata/cache/x11-apps/bitmap-1.0.6
index be681df8f60c..be1c0987f745 100644
--- a/metadata/cache/x11-apps/bitmap-1.0.6
+++ b/metadata/cache/x11-apps/bitmap-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org bitmap application
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1 b/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
index af0f1d3c3d0d..3d9817945589 100644
--- a/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
+++ b/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org fonttosfnt application
-amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/fslsfonts-1.0.4 b/metadata/cache/x11-apps/fslsfonts-1.0.4
index 544dad416fcd..f1a17b6b400c 100644
--- a/metadata/cache/x11-apps/fslsfonts-1.0.4
+++ b/metadata/cache/x11-apps/fslsfonts-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 list fonts served by X font server
-amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/fstobdf-1.0.5 b/metadata/cache/x11-apps/fstobdf-1.0.5
index 2b9a1c8a4b7e..c87929c837f5 100644
--- a/metadata/cache/x11-apps/fstobdf-1.0.5
+++ b/metadata/cache/x11-apps/fstobdf-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 generate BDF font from X font server
-amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/intel-gpu-tools-1.2 b/metadata/cache/x11-apps/intel-gpu-tools-1.2
index fa74bc2bda51..8a96645929bb 100644
--- a/metadata/cache/x11-apps/intel-gpu-tools-1.2
+++ b/metadata/cache/x11-apps/intel-gpu-tools-1.2
@@ -6,7 +6,7 @@ test
 http://xorg.freedesktop.org/
 MIT
 intel gpu userland tools
-amd64 ~x86
+amd64 x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/listres-1.0.3 b/metadata/cache/x11-apps/listres-1.0.3
index 3f9e99911e87..bdeb843f450b 100644
--- a/metadata/cache/x11-apps/listres-1.0.3
+++ b/metadata/cache/x11-apps/listres-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/listres-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 list resources in widgets
-amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/luit-1.1.1 b/metadata/cache/x11-apps/luit-1.1.1
index 145176fbcb92..246d3bdc64ec 100644
--- a/metadata/cache/x11-apps/luit-1.1.1
+++ b/metadata/cache/x11-apps/luit-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/luit-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Locale and ISO 2022 support for Unicode terminals
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/mkfontdir-1.0.7 b/metadata/cache/x11-apps/mkfontdir-1.0.7
index a1e727680a84..c701b22db39b 100644
--- a/metadata/cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/cache/x11-apps/mkfontdir-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 create an index of X font files in a directory
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/mkfontscale-1.1.0 b/metadata/cache/x11-apps/mkfontscale-1.1.0
index e4036f45bf95..ccfd004c4bca 100644
--- a/metadata/cache/x11-apps/mkfontscale-1.1.0
+++ b/metadata/cache/x11-apps/mkfontscale-1.1.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 create an index of scalable font files for X
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/oclock-1.0.3 b/metadata/cache/x11-apps/oclock-1.0.3
index 7f1d14f10b47..ccc848d6ccfe 100644
--- a/metadata/cache/x11-apps/oclock-1.0.3
+++ b/metadata/cache/x11-apps/oclock-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 round X clock
-~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/setxkbmap-1.3.0 b/metadata/cache/x11-apps/setxkbmap-1.3.0
index 34d330d0a63a..6ec479095f62 100644
--- a/metadata/cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/cache/x11-apps/setxkbmap-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Controls the keyboard layout of a running X server.
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xauth-1.0.7 b/metadata/cache/x11-apps/xauth-1.0.7
index f18085268af9..fbefaeb99db9 100644
--- a/metadata/cache/x11-apps/xauth-1.0.7
+++ b/metadata/cache/x11-apps/xauth-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X authority file utility
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6
 
diff --git a/metadata/cache/x11-apps/xclipboard-1.1.2 b/metadata/cache/x11-apps/xclipboard-1.1.2
index 1d96ea2b3b0b..484c213f1d45 100644
--- a/metadata/cache/x11-apps/xclipboard-1.1.2
+++ b/metadata/cache/x11-apps/xclipboard-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 interchange between cut buffer and selection
-amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xclock-1.0.6 b/metadata/cache/x11-apps/xclock-1.0.6
index 126894bbf92b..dd0f133074ea 100644
--- a/metadata/cache/x11-apps/xclock-1.0.6
+++ b/metadata/cache/x11-apps/xclock-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.6.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 analog / digital clock for X
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xcmsdb-1.0.4 b/metadata/cache/x11-apps/xcmsdb-1.0.4
index 7dab344df73b..26576ec62a94 100644
--- a/metadata/cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/cache/x11-apps/xcmsdb-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Device Color Characterization utility for X Color Management System
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xcursorgen-1.0.5 b/metadata/cache/x11-apps/xcursorgen-1.0.5
index 5a92126a77e0..2a41fbc867f2 100644
--- a/metadata/cache/x11-apps/xcursorgen-1.0.5
+++ b/metadata/cache/x11-apps/xcursorgen-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 create an X cursor file from a collection of PNG images
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xev-1.2.0 b/metadata/cache/x11-apps/xev-1.2.0
index 7c77e2fc618b..200c0dee9387 100644
--- a/metadata/cache/x11-apps/xev-1.2.0
+++ b/metadata/cache/x11-apps/xev-1.2.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 print contents of X events
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xfd-1.1.1 b/metadata/cache/x11-apps/xfd-1.1.1
index b073aaf1007a..2600bd715134 100644
--- a/metadata/cache/x11-apps/xfd-1.1.1
+++ b/metadata/cache/x11-apps/xfd-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xfd application
-amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xfontsel-1.0.4 b/metadata/cache/x11-apps/xfontsel-1.0.4
index 47369a0b704b..c04d87402067 100644
--- a/metadata/cache/x11-apps/xfontsel-1.0.4
+++ b/metadata/cache/x11-apps/xfontsel-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 point and click selection of X11 font names
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xgamma-1.0.5 b/metadata/cache/x11-apps/xgamma-1.0.5
index 7a01aa428327..f2dc90219ea2 100644
--- a/metadata/cache/x11-apps/xgamma-1.0.5
+++ b/metadata/cache/x11-apps/xgamma-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Alter a monitor's gamma correction through the X server
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xhost-1.0.5 b/metadata/cache/x11-apps/xhost-1.0.5
index b28cddbfd10b..205185f66628 100644
--- a/metadata/cache/x11-apps/xhost-1.0.5
+++ b/metadata/cache/x11-apps/xhost-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Controls host and/or user access to a running X server.
-~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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6
 
diff --git a/metadata/cache/x11-apps/xinit-1.3.2 b/metadata/cache/x11-apps/xinit-1.3.2
index 9111f9e24e97..661d86c88b94 100644
--- a/metadata/cache/x11-apps/xinit-1.3.2
+++ b/metadata/cache/x11-apps/xinit-1.3.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT GPL-2
 X Window System initializer
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 +minimal
 
diff --git a/metadata/cache/x11-apps/xinput-1.6.0 b/metadata/cache/x11-apps/xinput-1.6.0
index 34858769d96a..473e280f9db3 100644
--- a/metadata/cache/x11-apps/xinput-1.6.0
+++ b/metadata/cache/x11-apps/xinput-1.6.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Utility to set XInput device parameters
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xkbevd-1.1.3 b/metadata/cache/x11-apps/xkbevd-1.1.3
index ee6ffc62e4e8..5fa88bc5467d 100644
--- a/metadata/cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/cache/x11-apps/xkbevd-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 XKB event daemon
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xload-1.1.1 b/metadata/cache/x11-apps/xload-1.1.1
index 9a0c9891f3f8..08584576a658 100644
--- a/metadata/cache/x11-apps/xload-1.1.1
+++ b/metadata/cache/x11-apps/xload-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xload-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 system load average display for X
-~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 autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xlogo-1.0.4 b/metadata/cache/x11-apps/xlogo-1.0.4
index 945c26c8d197..a51b0d3d3e01 100644
--- a/metadata/cache/x11-apps/xlogo-1.0.4
+++ b/metadata/cache/x11-apps/xlogo-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X Window System logo
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xlsatoms-1.1.1 b/metadata/cache/x11-apps/xlsatoms-1.1.1
index a40666457cba..b3a266ee47be 100644
--- a/metadata/cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/cache/x11-apps/xlsatoms-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 list interned atoms defined on server
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xlsfonts-1.0.4 b/metadata/cache/x11-apps/xlsfonts-1.0.4
index 685f64ca0e28..ecf80ec22022 100644
--- a/metadata/cache/x11-apps/xlsfonts-1.0.4
+++ b/metadata/cache/x11-apps/xlsfonts-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xlsfonts application
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xmodmap-1.0.7 b/metadata/cache/x11-apps/xmodmap-1.0.7
index df184dc7f5e5..625db008c47c 100644
--- a/metadata/cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/cache/x11-apps/xmodmap-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 utility for modifying keymaps and pointer button mappings in X
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xpr-1.0.4 b/metadata/cache/x11-apps/xpr-1.0.4
index 64c39522432e..91cfec369d7a 100644
--- a/metadata/cache/x11-apps/xpr-1.0.4
+++ b/metadata/cache/x11-apps/xpr-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xpr application
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xtrap-1.0.2-r1 b/metadata/cache/x11-apps/xtrap-1.0.2-r1
index f078ec255b86..03fe6f132349 100644
--- a/metadata/cache/x11-apps/xtrap-1.0.2-r1
+++ b/metadata/cache/x11-apps/xtrap-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xtrap application
-amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/cache/x11-apps/xvidtune-1.0.2-r1
index 93a195f00d41..83d2c904428a 100644
--- a/metadata/cache/x11-apps/xvidtune-1.0.2-r1
+++ b/metadata/cache/x11-apps/xvidtune-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 video mode tuner for Xorg
-~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xwd-1.0.5 b/metadata/cache/x11-apps/xwd-1.0.5
index c83f714567b1..33127d0f6f87 100644
--- a/metadata/cache/x11-apps/xwd-1.0.5
+++ b/metadata/cache/x11-apps/xwd-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 dump an image of an X window
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xwud-1.0.4 b/metadata/cache/x11-apps/xwud-1.0.4
index 8f4ca28121de..7354b8b00c12 100644
--- a/metadata/cache/x11-apps/xwud-1.0.4
+++ b/metadata/cache/x11-apps/xwud-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 image displayer for X
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-base/xorg-drivers-1.12 b/metadata/cache/x11-base/xorg-drivers-1.12
index bc1a09f0e1d2..3f32b1c3072a 100644
--- a/metadata/cache/x11-base/xorg-drivers-1.12
+++ b/metadata/cache/x11-base/xorg-drivers-1.12
@@ -6,7 +6,7 @@
 http://www.gentoo.org/
 as-is
 Meta package containing deps on all xorg drivers
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 
 video_cards_apm video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
 
diff --git a/metadata/cache/x11-base/xorg-server-1.12.2 b/metadata/cache/x11-base/xorg-server-1.12.2
index 452e937da4a0..e4e7325c987f 100644
--- a/metadata/cache/x11-base/xorg-server-1.12.2
+++ b/metadata/cache/x11-base/xorg-server-1.12.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.2.tar.b
 http://xorg.freedesktop.org/
 MIT
 X.Org X servers
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing 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-drivers/ati-drivers-12.6_beta b/metadata/cache/x11-drivers/ati-drivers-12.6_beta
index d3acd7099f20..b8b2628c3c70 100644
--- a/metadata/cache/x11-drivers/ati-drivers-12.6_beta
+++ b/metadata/cache/x11-drivers/ati-drivers-12.6_beta
@@ -6,7 +6,7 @@ bindist
 http://www.amd.com
 AMD GPL-2 QPL-1.0 as-is
 Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets
-amd64 ~x86
+amd64 x86
 eutils linux-info linux-mod multilib toolchain-funcs user versionator
 debug +modules multilib pax_kernel qt4 static-libs kernel_linux
 
diff --git a/metadata/cache/x11-drivers/radeon-ucode-20120320 b/metadata/cache/x11-drivers/radeon-ucode-20120320
index bcf62d1fb097..a86e3b71a03e 100644
--- a/metadata/cache/x11-drivers/radeon-ucode-20120320
+++ b/metadata/cache/x11-drivers/radeon-ucode-20120320
@@ -6,7 +6,7 @@ http://people.freedesktop.org/~agd5f/radeon_ucode/ARUBA_me.bin http://people.fre
 http://people.freedesktop.org/~agd5f/radeon_ucode/
 radeon-ucode
 IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs
-amd64 ~x86
+amd64 x86
 eutils linux-info multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0 b/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
index 27acbc88983c..ed2843f2f3e8 100644
--- a/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
+++ b/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.0.ta
 http://xorg.freedesktop.org/
 MIT
 Generic Linux input driver
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1 b/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
index 54366cddd574..11d1be9d8a2a 100644
--- a/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
+++ b/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.1
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for joystick input devices
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1 b/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
index b377271ca5c0..e2066ea9db39 100644
--- a/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
+++ b/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.1
 http://xorg.freedesktop.org/
 MIT
 Keyboard input driver
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2 b/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
index c5c1931d4605..97eb0fbd91aa 100644
--- a/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
+++ b/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.2.ta
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for mouse input devices
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-mtrack-0.2.0 b/metadata/cache/x11-drivers/xf86-input-mtrack-0.2.0
index 29fb06932dd2..df9e46ed9973 100644
--- a/metadata/cache/x11-drivers/xf86-input-mtrack-0.2.0
+++ b/metadata/cache/x11-drivers/xf86-input-mtrack-0.2.0
@@ -6,7 +6,7 @@ http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0 -> xf86-input-mtr
 https://github.com/BlueDragonX/xf86-input-mtrack
 GPL-2
 Xorg Driver for Multitouch Trackpads
-amd64 ~x86
+amd64 x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 debug
 
diff --git a/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2 b/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
index 87f6b722dade..de2a4a9c258a 100644
--- a/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
+++ b/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.
 http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
 MIT
 Driver for Synaptics touchpads
-amd64 ~mips ~ppc ~ppc64 ~x86
+amd64 ~mips ~ppc ~ppc64 x86
 autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-vmmouse-12.9.0 b/metadata/cache/x11-drivers/xf86-input-vmmouse-12.9.0
index d6f1607e3ca5..9e529a5c9982 100644
--- a/metadata/cache/x11-drivers/xf86-input-vmmouse-12.9.0
+++ b/metadata/cache/x11-drivers/xf86-input-vmmouse-12.9.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.9.0
 http://xorg.freedesktop.org/
 MIT
 VMWare mouse input driver
-amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0 b/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
index a64c95ce6438..1f7636ed9afc 100644
--- a/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
+++ b/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
@@ -6,7 +6,7 @@ mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.14.0.tar.bz2
 http://linuxwacom.sourceforge.net/
 GPL-2
 Driver for Wacom tablets and drawing devices
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
 autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
 debug
 
diff --git a/metadata/cache/x11-drivers/xf86-input-wacom-0.15.0 b/metadata/cache/x11-drivers/xf86-input-wacom-0.15.0
new file mode 100644
index 000000000000..06787a90b853
--- /dev/null
+++ b/metadata/cache/x11-drivers/xf86-input-wacom-0.15.0
@@ -0,0 +1,22 @@
+>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-proto/randrproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
+0
+mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.15.0.tar.bz2
+
+http://linuxwacom.sourceforge.net/
+GPL-2
+Driver for Wacom tablets and drawing devices
+~amd64 ~ppc ~ppc64 ~x86
+autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
+debug
+
+
+
+4
+
+compile configure install postinst postrm prepare pretend setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-drivers/xf86-video-apm-1.2.4 b/metadata/cache/x11-drivers/xf86-video-apm-1.2.4
index b0539cf54208..90608df61e54 100644
--- a/metadata/cache/x11-drivers/xf86-video-apm-1.2.4
+++ b/metadata/cache/x11-drivers/xf86-video-apm-1.2.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.4.tar.
 http://xorg.freedesktop.org/
 MIT
 Alliance ProMotion video driver
-amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-ark-0.7.4 b/metadata/cache/x11-drivers/xf86-video-ark-0.7.4
index 8635656e290a..ff5f88d7a752 100644
--- a/metadata/cache/x11-drivers/xf86-video-ark-0.7.4
+++ b/metadata/cache/x11-drivers/xf86-video-ark-0.7.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.4.tar.
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for ark cards
-amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-ast-0.95.0 b/metadata/cache/x11-drivers/xf86-video-ast-0.95.0
index 55670b1b6ca5..620e2e7dfd40 100644
--- a/metadata/cache/x11-drivers/xf86-video-ast-0.95.0
+++ b/metadata/cache/x11-drivers/xf86-video-ast-0.95.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.95.0.tar
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for ASpeedTech cards
-amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1 b/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
index d442482c64a1..b71d8aac6205 100644
--- a/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
+++ b/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.4.tar
 http://xorg.freedesktop.org/
 MIT
 ATI video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-cirrus-1.4.0 b/metadata/cache/x11-drivers/xf86-video-cirrus-1.4.0
index d0455d21bc45..358f406a2dc5 100644
--- a/metadata/cache/x11-drivers/xf86-video-cirrus-1.4.0
+++ b/metadata/cache/x11-drivers/xf86-video-cirrus-1.4.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.4.0.t
 http://xorg.freedesktop.org/
 MIT
 Cirrus Logic video driver
-~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5 b/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5
index b222954db0a2..d32c4f80ebe5 100644
--- a/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5
+++ b/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.5.ta
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for dummy cards
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dga
 
diff --git a/metadata/cache/x11-drivers/xf86-video-glint-1.2.7 b/metadata/cache/x11-drivers/xf86-video-glint-1.2.7
index 6b2623d35069..aa66902ec4ce 100644
--- a/metadata/cache/x11-drivers/xf86-video-glint-1.2.7
+++ b/metadata/cache/x11-drivers/xf86-video-glint-1.2.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.7.ta
 http://xorg.freedesktop.org/
 MIT
 GLINT/Permedia video driver
-~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-i128-1.3.5 b/metadata/cache/x11-drivers/xf86-video-i128-1.3.5
index 6c3f7d4c8c35..d5e5cba3a857 100644
--- a/metadata/cache/x11-drivers/xf86-video-i128-1.3.5
+++ b/metadata/cache/x11-drivers/xf86-video-i128-1.3.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.5.tar
 http://xorg.freedesktop.org/
 MIT
 Number 9 I128 video driver
-amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-i740-1.3.3 b/metadata/cache/x11-drivers/xf86-video-i740-1.3.3
index fa448450213d..3fa9e2e32795 100644
--- a/metadata/cache/x11-drivers/xf86-video-i740-1.3.3
+++ b/metadata/cache/x11-drivers/xf86-video-i740-1.3.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.3.tar
 http://xorg.freedesktop.org/
 MIT
 Intel i740 video driver
-amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-intel-2.19.0 b/metadata/cache/x11-drivers/xf86-video-intel-2.19.0
index 9ffbdf91eaac..53ed52dd9b6c 100644
--- a/metadata/cache/x11-drivers/xf86-video-intel-2.19.0
+++ b/metadata/cache/x11-drivers/xf86-video-intel-2.19.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.19.0.t
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for Intel cards
-amd64 ~ia64 ~x86 ~amd64-fbsd -x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
 glamor sna dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1 b/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
index 191b23ab7a69..ff5ccce0ebfb 100644
--- a/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
+++ b/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.1.t
 http://xorg.freedesktop.org/
 MIT
 ATI Mach64 video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-mga-1.5.0 b/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
index e9338de9bf1e..a6fe9d3fce0e 100644
--- a/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
+++ b/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.5.0.tar.
 http://xorg.freedesktop.org/
 MIT
 Matrox video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0 b/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
index 2b42671df6ae..20fbb95af626 100644
--- a/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
+++ b/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.
 http://xorg.freedesktop.org/
 MIT
 Unaccelerated generic driver for kernel modesetting
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-neomagic-1.2.6 b/metadata/cache/x11-drivers/xf86-video-neomagic-1.2.6
index e71dbec43d5a..6f5468cc6ac4 100644
--- a/metadata/cache/x11-drivers/xf86-video-neomagic-1.2.6
+++ b/metadata/cache/x11-drivers/xf86-video-neomagic-1.2.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.6
 http://xorg.freedesktop.org/
 MIT
 Neomagic video driver
-amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322 b/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
index 13489b4ac21c..50f3d3b92484 100644
--- a/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
+++ b/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
@@ -6,7 +6,7 @@ mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120322.tar.bz2
 http://nouveau.freedesktop.org/
 MIT
 Accelerated Open Source driver for nVidia cards
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
 autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-openchrome-0.2.906 b/metadata/cache/x11-drivers/xf86-video-openchrome-0.2.906
index 4de2230bfd61..90260f26e412 100644
--- a/metadata/cache/x11-drivers/xf86-video-openchrome-0.2.906
+++ b/metadata/cache/x11-drivers/xf86-video-openchrome-0.2.906
@@ -6,7 +6,7 @@ http://www.openchrome.org/releases/xf86-video-openchrome-0.2.906.tar.bz2
 http://www.openchrome.org
 MIT
 X.Org driver for VIA/S3G cards
-amd64 ~x86
+amd64 x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 debug viaregtool dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-qxl-0.0.17 b/metadata/cache/x11-drivers/xf86-video-qxl-0.0.17
index d6f984dc03be..f826df876f8b 100644
--- a/metadata/cache/x11-drivers/xf86-video-qxl-0.0.17
+++ b/metadata/cache/x11-drivers/xf86-video-qxl-0.0.17
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.0.17.tar
 http://xorg.freedesktop.org/
 MIT
 QEMU QXL paravirt video driver
-amd64 ~x86
+amd64 x86
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 xspice
 
diff --git a/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1 b/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
index d26ef7ad60c1..a6bbe7b8ca6e 100644
--- a/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
+++ b/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.2.tar
 http://xorg.freedesktop.org/
 MIT
 ATI Rage128 video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-s3-0.6.4 b/metadata/cache/x11-drivers/xf86-video-s3-0.6.4
index c54d85e4ef53..fe26a9a6df7d 100644
--- a/metadata/cache/x11-drivers/xf86-video-s3-0.6.4
+++ b/metadata/cache/x11-drivers/xf86-video-s3-0.6.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.4.tar.b
 http://xorg.freedesktop.org/
 MIT
 X.Org driver for s3 cards
-~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-s3virge-1.10.5 b/metadata/cache/x11-drivers/xf86-video-s3virge-1.10.5
index 8bc53c66ac1b..273d9d192675 100644
--- a/metadata/cache/x11-drivers/xf86-video-s3virge-1.10.5
+++ b/metadata/cache/x11-drivers/xf86-video-s3virge-1.10.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.5
 http://xorg.freedesktop.org/
 MIT
 S3 ViRGE video driver
-~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-savage-2.3.4-r1 b/metadata/cache/x11-drivers/xf86-video-savage-2.3.4-r1
index 7641d16bb7c2..9d7bbcb28f1e 100644
--- a/metadata/cache/x11-drivers/xf86-video-savage-2.3.4-r1
+++ b/metadata/cache/x11-drivers/xf86-video-savage-2.3.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.4.t
 http://xorg.freedesktop.org/
 MIT
 S3 Savage video driver
-~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-siliconmotion-1.7.6 b/metadata/cache/x11-drivers/xf86-video-siliconmotion-1.7.6
index 22be57a4a66c..bd36a18895c1 100644
--- a/metadata/cache/x11-drivers/xf86-video-siliconmotion-1.7.6
+++ b/metadata/cache/x11-drivers/xf86-video-siliconmotion-1.7.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-
 http://xorg.freedesktop.org/
 MIT
 Silicon Motion video driver
-~alpha amd64 ~ia64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~mips x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-sis-0.10.4-r1 b/metadata/cache/x11-drivers/xf86-video-sis-0.10.4-r1
index e30aab56d8fa..41666f807b51 100644
--- a/metadata/cache/x11-drivers/xf86-video-sis-0.10.4-r1
+++ b/metadata/cache/x11-drivers/xf86-video-sis-0.10.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.4.tar
 http://xorg.freedesktop.org/
 MIT
 SiS and XGI video driver
-amd64 ~ia64 ~ppc ~x86 ~x86-fbsd
+amd64 ~ia64 ~ppc x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-tdfx-1.4.4-r1 b/metadata/cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
index 3e8cc2193077..f14d8f55d22f 100644
--- a/metadata/cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
+++ b/metadata/cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.4.tar
 http://xorg.freedesktop.org/
 MIT
 3Dfx video driver
-~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 dri dri
 
diff --git a/metadata/cache/x11-drivers/xf86-video-trident-1.3.5 b/metadata/cache/x11-drivers/xf86-video-trident-1.3.5
index b074f7ab3244..801f3ce3e4f8 100644
--- a/metadata/cache/x11-drivers/xf86-video-trident-1.3.5
+++ b/metadata/cache/x11-drivers/xf86-video-trident-1.3.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.5.
 http://xorg.freedesktop.org/
 MIT
 Trident video driver
-amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-vesa-2.3.1 b/metadata/cache/x11-drivers/xf86-video-vesa-2.3.1
index 63b3c2a48442..1874de311814 100644
--- a/metadata/cache/x11-drivers/xf86-video-vesa-2.3.1
+++ b/metadata/cache/x11-drivers/xf86-video-vesa-2.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.1.tar
 http://xorg.freedesktop.org/
 MIT
 Generic VESA video driver
--* ~alpha amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-vmware-12.0.2 b/metadata/cache/x11-drivers/xf86-video-vmware-12.0.2
index 81ac4950f07a..4883fe7eea45 100644
--- a/metadata/cache/x11-drivers/xf86-video-vmware-12.0.2
+++ b/metadata/cache/x11-drivers/xf86-video-vmware-12.0.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-12.0.2.
 http://xorg.freedesktop.org/
 MIT
 VMware SVGA video driver
-amd64 ~x86 ~x86-fbsd
+amd64 x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-libs/libFS-1.0.4 b/metadata/cache/x11-libs/libFS-1.0.4
index 2e1d42a22b62..53a5814a27a4 100644
--- a/metadata/cache/x11-libs/libFS-1.0.4
+++ b/metadata/cache/x11-libs/libFS-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org FS library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6 static-libs
 
diff --git a/metadata/cache/x11-libs/libGLw-8.0.0 b/metadata/cache/x11-libs/libGLw-8.0.0
index 88ea8807e341..96264fb42b47 100644
--- a/metadata/cache/x11-libs/libGLw-8.0.0
+++ b/metadata/cache/x11-libs/libGLw-8.0.0
@@ -6,7 +6,7 @@ ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
 http://mesa3d.sourceforge.net/
 MIT
 Mesa GLw library
-amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 x86 ~amd64-linux ~x86-linux
 autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
 +motif static-libs
 
diff --git a/metadata/cache/x11-libs/libICE-1.0.8 b/metadata/cache/x11-libs/libICE-1.0.8
index ac88fe1242e5..beb9f5a668fa 100644
--- a/metadata/cache/x11-libs/libICE-1.0.8
+++ b/metadata/cache/x11-libs/libICE-1.0.8
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org ICE library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libSM-1.2.1 b/metadata/cache/x11-libs/libSM-1.2.1
index 4d955b6c829a..277957f5f110 100644
--- a/metadata/cache/x11-libs/libSM-1.2.1
+++ b/metadata/cache/x11-libs/libSM-1.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org SM library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 doc ipv6 +uuid static-libs doc
 
diff --git a/metadata/cache/x11-libs/libX11-1.5.0 b/metadata/cache/x11-libs/libX11-1.5.0
index c74e411bde5e..a2db1368d0f3 100644
--- a/metadata/cache/x11-libs/libX11-1.5.0
+++ b/metadata/cache/x11-libs/libX11-1.5.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org X11 library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
index e47d6253a9aa..ea235dd96d27 100644
--- a/metadata/cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XScrnSaver library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXTrap-1.0.0-r1 b/metadata/cache/x11-libs/libXTrap-1.0.0-r1
index 825b551632f0..a682a5e99f12 100644
--- a/metadata/cache/x11-libs/libXTrap-1.0.0-r1
+++ b/metadata/cache/x11-libs/libXTrap-1.0.0-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XTrap library
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXau-1.0.7 b/metadata/cache/x11-libs/libXau-1.0.7
index bcab8fbaee29..0738aecf1e97 100644
--- a/metadata/cache/x11-libs/libXau-1.0.7
+++ b/metadata/cache/x11-libs/libXau-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xau library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXaw-1.0.11 b/metadata/cache/x11-libs/libXaw-1.0.11
index b70166c28dac..9e3d60b3df47 100644
--- a/metadata/cache/x11-libs/libXaw-1.0.11
+++ b/metadata/cache/x11-libs/libXaw-1.0.11
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xaw library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXcursor-1.1.13 b/metadata/cache/x11-libs/libXcursor-1.1.13
index bfb23aa240f1..7dace19bf617 100644
--- a/metadata/cache/x11-libs/libXcursor-1.1.13
+++ b/metadata/cache/x11-libs/libXcursor-1.1.13
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xcursor 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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXdmcp-1.1.1 b/metadata/cache/x11-libs/libXdmcp-1.1.1
index 982a8e0b1292..86dce319b938 100644
--- a/metadata/cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/cache/x11-libs/libXdmcp-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xdmcp library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXext-1.3.1 b/metadata/cache/x11-libs/libXext-1.3.1
index 65cb225a17f3..d76d52c3e78a 100644
--- a/metadata/cache/x11-libs/libXext-1.3.1
+++ b/metadata/cache/x11-libs/libXext-1.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xext library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXfont-1.4.3 b/metadata/cache/x11-libs/libXfont-1.4.3
deleted file mode 100644
index 648e181116da..000000000000
--- a/metadata/cache/x11-libs/libXfont-1.4.3
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
-0
-http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.3.tar.bz2
-
-http://xorg.freedesktop.org/
-MIT
-X.Org Xfont library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
-doc ipv6 static-libs
-
-
-
-3
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/libXfont-1.4.5 b/metadata/cache/x11-libs/libXfont-1.4.5
index ec4067ecf1aa..0e98e645e294 100644
--- a/metadata/cache/x11-libs/libXfont-1.4.5
+++ b/metadata/cache/x11-libs/libXfont-1.4.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xfont library
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
@@ -14,7 +14,7 @@ ipv6 static-libs doc
 
 4
 
-compile configure install postinst postrm prepare setup test unpack
+compile configure install postinst postrm prepare test unpack
 
 
 
diff --git a/metadata/cache/x11-libs/libXfontcache-1.0.5-r1 b/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
index e914f2a2858d..5d13ab773bf2 100644
--- a/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
+++ b/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xfontcache library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXft-2.3.1 b/metadata/cache/x11-libs/libXft-2.3.1
index ac3c99c78517..93c4fa4b30c2 100644
--- a/metadata/cache/x11-libs/libXft-2.3.1
+++ b/metadata/cache/x11-libs/libXft-2.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xft 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~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 ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXi-1.6.1 b/metadata/cache/x11-libs/libXi-1.6.1
index a13cf036b66e..36c7559fe8af 100644
--- a/metadata/cache/x11-libs/libXi-1.6.1
+++ b/metadata/cache/x11-libs/libXi-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xi library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXinerama-1.1.2 b/metadata/cache/x11-libs/libXinerama-1.1.2
index 04ab40217ec5..a0767d1e4d4d 100644
--- a/metadata/cache/x11-libs/libXinerama-1.1.2
+++ b/metadata/cache/x11-libs/libXinerama-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xinerama 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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXmu-1.1.1 b/metadata/cache/x11-libs/libXmu-1.1.1
index 6bc9c8da1760..5c8546ba33c6 100644
--- a/metadata/cache/x11-libs/libXmu-1.1.1
+++ b/metadata/cache/x11-libs/libXmu-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xmu library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXpm-3.5.10 b/metadata/cache/x11-libs/libXpm-3.5.10
index 8c68b94f74a3..dec588172c06 100644
--- a/metadata/cache/x11-libs/libXpm-3.5.10
+++ b/metadata/cache/x11-libs/libXpm-3.5.10
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xpm library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXrender-0.9.7 b/metadata/cache/x11-libs/libXrender-0.9.7
index 07391308d01b..aa7a2ccb5852 100644
--- a/metadata/cache/x11-libs/libXrender-0.9.7
+++ b/metadata/cache/x11-libs/libXrender-0.9.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xrender 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~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 ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXres-1.0.6 b/metadata/cache/x11-libs/libXres-1.0.6
index 6e457326fac5..c7e95e30bc7a 100644
--- a/metadata/cache/x11-libs/libXres-1.0.6
+++ b/metadata/cache/x11-libs/libXres-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.6.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XRes library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXt-1.1.3 b/metadata/cache/x11-libs/libXt-1.1.3
index dee4cdc1176f..4705cf03d7de 100644
--- a/metadata/cache/x11-libs/libXt-1.1.3
+++ b/metadata/cache/x11-libs/libXt-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xt library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXtst-1.2.1 b/metadata/cache/x11-libs/libXtst-1.2.1
index ede0b62f894c..af0000a649b2 100644
--- a/metadata/cache/x11-libs/libXtst-1.2.1
+++ b/metadata/cache/x11-libs/libXtst-1.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xtst library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXv-1.0.7 b/metadata/cache/x11-libs/libXv-1.0.7
index d03c65e63634..ab9304727876 100644
--- a/metadata/cache/x11-libs/libXv-1.0.7
+++ b/metadata/cache/x11-libs/libXv-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xv library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXvMC-1.0.7 b/metadata/cache/x11-libs/libXvMC-1.0.7
index 90cd6f1b5306..03192d6def67 100644
--- a/metadata/cache/x11-libs/libXvMC-1.0.7
+++ b/metadata/cache/x11-libs/libXvMC-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XvMC library
-~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 ~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 ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXxf86dga-1.1.3 b/metadata/cache/x11-libs/libXxf86dga-1.1.3
index 8108377f234f..8fb600b68721 100644
--- a/metadata/cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/cache/x11-libs/libXxf86dga-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xxf86dga library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXxf86vm-1.1.2 b/metadata/cache/x11-libs/libXxf86vm-1.1.2
index e9988625abc4..297784567c2c 100644
--- a/metadata/cache/x11-libs/libXxf86vm-1.1.2
+++ b/metadata/cache/x11-libs/libXxf86vm-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xxf86vm library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libdmx-1.1.2 b/metadata/cache/x11-libs/libdmx-1.1.2
index 6b553d62738e..860e62cd76f2 100644
--- a/metadata/cache/x11-libs/libdmx-1.1.2
+++ b/metadata/cache/x11-libs/libdmx-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org dmx library
-~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
 autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-misc/arandr-0.1.5 b/metadata/cache/x11-misc/arandr-0.1.5
deleted file mode 100644
index 8cb2291e8758..000000000000
--- a/metadata/cache/x11-misc/arandr-0.1.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/docutils-0.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-python/pygtk-2 x11-apps/xrandr || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://christian.amsuess.com/tools/arandr/files/arandr-0.1.5.tar.gz
-
-http://christian.amsuess.com/tools/arandr/
-GPL-3
-A simple visual frontend for XRandR 1.2/1.3
-~amd64 ~x86
-distutils multilib python toolchain-funcs
-
-
-
-
-3
-
-compile install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/autocutsel-0.9.0 b/metadata/cache/x11-misc/autocutsel-0.9.0
index 6d0f54b9e86b..0c9326fc4335 100644
--- a/metadata/cache/x11-misc/autocutsel-0.9.0
+++ b/metadata/cache/x11-misc/autocutsel-0.9.0
@@ -3,7 +3,7 @@ x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 0
 http://savannah.nongnu.org/download/autocutsel/autocutsel-0.9.0.tar.gz
 
-http://www.lepton.fr/tools/autocutsel/
+http://www.nongnu.org/autocutsel/
 GPL-2
 Synchronise the two copy/paste buffers mainly used by X applications
 amd64 ppc sparc x86
diff --git a/metadata/cache/x11-misc/lightdm-1.2.2 b/metadata/cache/x11-misc/lightdm-1.2.2
deleted file mode 100644
index e2ae97d85888..000000000000
--- a/metadata/cache/x11-misc/lightdm-1.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool virtual/pkgconfig gnome-base/gnome-common sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
-0
-http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-
-http://www.freedesktop.org/wiki/Software/LightDM
-GPL-3 LGPL-3
-A lightweight display manager
-~amd64 ~x86
-autotools eutils flag-o-matic libtool multilib multiprocessing pam toolchain-funcs user
-+introspection
-
-x11-misc/lightdm-gtk-greeter
-
-4
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/lightdm-1.2.2-r1 b/metadata/cache/x11-misc/lightdm-1.2.2-r1
deleted file mode 100644
index f52c31223f0a..000000000000
--- a/metadata/cache/x11-misc/lightdm-1.2.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libxklavier x11-libs/libX11 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libxklavier x11-libs/libX11 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 )
-0
-http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-
-http://www.freedesktop.org/wiki/Software/LightDM
-GPL-3 LGPL-3
-A lightweight display manager
-~amd64 ~x86
-autotools eutils flag-o-matic libtool multilib multiprocessing pam toolchain-funcs user
-+introspection qt4
-
-
-
-4
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/lightdm-1.2.2-r2 b/metadata/cache/x11-misc/lightdm-1.2.2-r3
similarity index 58%
rename from metadata/cache/x11-misc/lightdm-1.2.2-r2
rename to metadata/cache/x11-misc/lightdm-1.2.2-r3
index 6d899b225759..91eb3d8315c2 100644
--- a/metadata/cache/x11-misc/lightdm-1.2.2-r2
+++ b/metadata/cache/x11-misc/lightdm-1.2.2-r3
@@ -1,5 +1,5 @@
-dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) >=sys-auth/pambase-20101024-r2
+dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) >=sys-auth/pambase-20101024-r2
 0
 http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
 
diff --git a/metadata/cache/x11-misc/slim-1.3.3 b/metadata/cache/x11-misc/slim-1.3.3
index 329f061dbc73..157dae3e7942 100644
--- a/metadata/cache/x11-misc/slim-1.3.3
+++ b/metadata/cache/x11-misc/slim-1.3.3
@@ -6,7 +6,7 @@ mirror://berlios/slim/slim-1.3.3.tar.gz
 http://slim.berlios.de
 GPL-2
 Simple Login Manager
-~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 base cmake-utils eutils flag-o-matic multilib pam toolchain-funcs user
 branding pam consolekit
 consolekit? ( pam )
diff --git a/metadata/cache/x11-misc/wmctrl-1.07 b/metadata/cache/x11-misc/wmctrl-1.07
index c669e9f492fb..ae8631c3cb63 100644
--- a/metadata/cache/x11-misc/wmctrl-1.07
+++ b/metadata/cache/x11-misc/wmctrl-1.07
@@ -1,9 +1,9 @@
 >=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu virtual/pkgconfig x11-proto/xproto
 >=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu
 0
-http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+http://tomas.styblo.name/wmctrl/dist/wmctrl-1.07.tar.gz
 
-http://sweb.cz/tripie/utils/wmctrl/
+http://tomas.styblo.name/wmctrl/
 GPL-2
 command line tool to interact with an EWMH/NetWM compatible X Window Manager
 ~amd64 ppc ~sparc x86
diff --git a/metadata/cache/x11-misc/wmctrl-1.07-r1 b/metadata/cache/x11-misc/wmctrl-1.07-r1
index 4b71d75f661b..073b6051e5ec 100644
--- a/metadata/cache/x11-misc/wmctrl-1.07-r1
+++ b/metadata/cache/x11-misc/wmctrl-1.07-r1
@@ -1,9 +1,9 @@
 >=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu virtual/pkgconfig x11-proto/xproto
 >=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu
 0
-http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+http://tomas.styblo.name/wmctrl/dist/wmctrl-1.07.tar.gz
 
-http://sweb.cz/tripie/utils/wmctrl/
+http://tomas.styblo.name/wmctrl/
 GPL-2
 command line tool to interact with an EWMH/NetWM compatible X Window Manager
 amd64 ~ppc ~sparc x86
diff --git a/metadata/cache/x11-misc/xosview-1.9.3 b/metadata/cache/x11-misc/xosview-1.9.3
index 1119dbed2295..67dff7dd8b11 100644
--- a/metadata/cache/x11-misc/xosview-1.9.3
+++ b/metadata/cache/x11-misc/xosview-1.9.3
@@ -6,7 +6,7 @@ http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.3.tar.gz
 http://www.pogo.org.uk/~mark/xosview/
 GPL-2 BSD
 X11 operating system viewer
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 eutils multilib toolchain-funcs user
 suid
 
diff --git a/metadata/cache/x11-themes/slim-themes-1.2.3a-r6 b/metadata/cache/x11-themes/slim-themes-1.2.3a-r6
index bda684989dbd..caab95b84dc1 100644
--- a/metadata/cache/x11-themes/slim-themes-1.2.3a-r6
+++ b/metadata/cache/x11-themes/slim-themes-1.2.3a-r6
@@ -6,7 +6,7 @@ strip binchecks
 http://slim.berlios.de
 GPL-2
 SLiM (Simple Login Manager) themes pack
-amd64 ppc ppc64 sparc x86 ~x86-fbsd
+amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d1b4ccb29cfe..aa161d24b0c5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Jun 2012 17:07:23 +0000
+Sun, 24 Jun 2012 19:37:44 +0000
diff --git a/metadata/glsa/glsa-201206-20.xml b/metadata/glsa/glsa-201206-20.xml
new file mode 100644
index 000000000000..686d6bb997fa
--- /dev/null
+++ b/metadata/glsa/glsa-201206-20.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-20">
+  <title>gdk-pixbuf: Denial of Service</title>
+  <synopsis>Multiple vulnerabilities in gdk-pixbuf may create a Denial of
+    Service condition.
+  </synopsis>
+  <product type="ebuild">gdk-pixbuf</product>
+  <announced>June 23, 2012</announced>
+  <revised>June 23, 2012: 1</revised>
+  <bug>373999</bug>
+  <bug>412033</bug>
+  <access>remote</access>
+  <affected>
+    <package name="x11-libs/gdk-pixbuf" auto="yes" arch="*">
+      <unaffected range="ge">2.24.1-r1</unaffected>
+      <vulnerable range="lt">2.24.1-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>gdk-pixbuf is an image loading library for GTK+.</p>
+  </background>
+  <description>
+    <p>Two vulnerabilities have been found in gdk-pixbuf:</p>
+    
+    <ul>
+      <li>The "gdk_pixbuf__gif_image_load()" function in io-gif.c fails to
+        properly handle certain return values from subroutines (CVE-2011-2485).
+      </li>
+      <li>The "read_bitmap_file_data()" function in io-xbm.c contains an
+        integer overflow error (CVE-2012-2370).
+      </li>
+    </ul>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted image
+      in an application linked against gdk-pixbuf, possibly resulting in Denial
+      of Service. 
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All gdk-pixbuf users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=x11-libs/gdk-pixbuf-2.24.1-r1"
+    </code>
+    
+    <p>Packages which depend on this library may need to be recompiled. Tools
+      such as revdep-rebuild may assist in identifying some of these packages.
+    </p>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2485">CVE-2011-2485</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2370">CVE-2012-2370</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:37:08 +0000" tag="requester">
+    underling
+  </metadata>
+  <metadata timestamp="Sat, 23 Jun 2012 20:11:46 +0000" tag="submitter">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201206-21.xml b/metadata/glsa/glsa-201206-21.xml
new file mode 100644
index 000000000000..05e78fbc5569
--- /dev/null
+++ b/metadata/glsa/glsa-201206-21.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-21">
+  <title>Adobe Flash Player: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Adobe Flash Player
+    could result in the execution of arbitrary code or Denial of Service.
+  </synopsis>
+  <product type="ebuild">Adobe Flash Player</product>
+  <announced>June 23, 2012</announced>
+  <revised>June 23, 2012: 1</revised>
+  <bug>414603</bug>
+  <bug>420311</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">11.2.202.236</unaffected>
+      <vulnerable range="lt">11.2.202.236</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Adobe Flash Player is a renderer for the SWF file format, which is
+      commonly used to provide interactive websites.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Adobe Flash Player.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted SWF
+      file, possibly resulting in execution of arbitrary code with the
+      privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Flash Player users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-plugins/adobe-flash-11.2.202.236"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0779">CVE-2012-0779</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2034">CVE-2012-2034</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2035">CVE-2012-2035</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2036">CVE-2012-2036</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2037">CVE-2012-2037</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2038">CVE-2012-2038</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2039">CVE-2012-2039</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2040">CVE-2012-2040</uri>
+  </references>
+  <metadata timestamp="Sat, 05 May 2012 11:36:09 +0000" tag="requester">ackle</metadata>
+  <metadata timestamp="Sat, 23 Jun 2012 20:11:51 +0000" tag="submitter">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201206-22.xml b/metadata/glsa/glsa-201206-22.xml
new file mode 100644
index 000000000000..392e09857422
--- /dev/null
+++ b/metadata/glsa/glsa-201206-22.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-22">
+  <title>Samba: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Samba, the worst of
+    which may allow execution of arbitrary code with root privileges.
+  </synopsis>
+  <product type="ebuild">Samba</product>
+  <announced>June 24, 2012</announced>
+  <revised>June 24, 2012: 1</revised>
+  <bug>290633</bug>
+  <bug>310105</bug>
+  <bug>323785</bug>
+  <bug>332063</bug>
+  <bug>337295</bug>
+  <bug>356917</bug>
+  <bug>382263</bug>
+  <bug>386375</bug>
+  <bug>405551</bug>
+  <bug>411487</bug>
+  <bug>414319</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="net-fs/samba" auto="yes" arch="*">
+      <unaffected range="ge">3.5.15</unaffected>
+      <vulnerable range="lt">3.5.15</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Samba is a suite of SMB and CIFS client/server programs.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Samba. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could possibly execute arbitrary code with root
+      privileges, cause a Denial of Service condition, take ownership of shared
+      files, or bypass file permissions. Furthermore, a local attacker may be
+      able to cause a Denial of Service condition or obtain sensitive
+      information in a Samba credentials file.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Samba users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-fs/samba-3.5.15"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-2906">CVE-2009-2906</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-2948">CVE-2009-2948</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-0728">CVE-2010-0728</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1635">CVE-2010-1635</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1642">CVE-2010-1642</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-2063">CVE-2010-2063</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-3069">CVE-2010-3069</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0719">CVE-2011-0719</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1678">CVE-2011-1678</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2724">CVE-2011-2724</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0870">CVE-2012-0870</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-1182">CVE-2012-1182</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2111">CVE-2012-2111</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:36:59 +0000" tag="requester">
+    underling
+  </metadata>
+  <metadata timestamp="Sun, 24 Jun 2012 12:38:35 +0000" tag="submitter">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201206-23.xml b/metadata/glsa/glsa-201206-23.xml
new file mode 100644
index 000000000000..5f452601cce3
--- /dev/null
+++ b/metadata/glsa/glsa-201206-23.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-23">
+  <title>PyCrypto: Weak key generation</title>
+  <synopsis>PyCrypto generates weak ElGamal keys.</synopsis>
+  <product type="ebuild">pycrypto</product>
+  <announced>June 24, 2012</announced>
+  <revised>June 24, 2012: 1</revised>
+  <bug>417625</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/pycrypto" auto="yes" arch="*">
+      <unaffected range="ge">2.6</unaffected>
+      <vulnerable range="lt">2.6</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PyCrypto is the Python Cryptography Toolkit.</p>
+  </background>
+  <description>
+    <p>An error in the generate() function in ElGamal.py causes PyCrypto to
+      generate weak ElGamal keys.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker might be able to derive private keys.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All PyCrypto users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-python/pycrypto-2.6"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2417">CVE-2012-2417</uri>
+  </references>
+  <metadata timestamp="Mon, 11 Jun 2012 22:45:07 +0000" tag="requester">ackle</metadata>
+  <metadata timestamp="Sun, 24 Jun 2012 12:38:41 +0000" tag="submitter">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201206-24.xml b/metadata/glsa/glsa-201206-24.xml
new file mode 100644
index 000000000000..81a14d5e299a
--- /dev/null
+++ b/metadata/glsa/glsa-201206-24.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-24">
+  <title>Apache Tomcat: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities were found in Apache Tomcat, the worst of
+    which allowing to read, modify and overwrite arbitrary files.
+  </synopsis>
+  <product type="ebuild">apache tomcat</product>
+  <announced>June 24, 2012</announced>
+  <revised>June 24, 2012: 1</revised>
+  <bug>272566</bug>
+  <bug>273662</bug>
+  <bug>303719</bug>
+  <bug>320963</bug>
+  <bug>329937</bug>
+  <bug>373987</bug>
+  <bug>374619</bug>
+  <bug>382043</bug>
+  <bug>386213</bug>
+  <bug>396401</bug>
+  <bug>399227</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="www-servers/tomcat" auto="yes" arch="*">
+      <unaffected range="rge">6.0.35</unaffected>
+      <unaffected range="ge">7.0.23</unaffected>
+      <vulnerable range="rlt">5.5.34</vulnerable>
+      <vulnerable range="rlt">6.0.35</vulnerable>
+      <vulnerable range="lt">7.0.23</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Apache Tomcat is a Servlet-3.0/JSP-2.2 Container.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache Tomcat. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>The vulnerabilities allow an attacker to cause a Denial of Service, to
+      hijack a session, to bypass authentication, to inject webscript, to
+      enumerate valid usernames, to read, modify and overwrite arbitrary files,
+      to bypass intended access restrictions, to delete work-directory files,
+      to discover the server's hostname or IP, to bypass read permissions for
+      files or HTTP headers, to read or write files outside of the intended
+      working directory, and to obtain sensitive information by reading a log
+      file.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache Tomcat 6.0.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/tomcat-6.0.35"
+    </code>
+    
+    <p>All Apache Tomcat 7.0.x users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/tomcat-7.0.23"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2008-5515">CVE-2008-5515</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-0033">CVE-2009-0033</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-0580">CVE-2009-0580</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-0781">CVE-2009-0781</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-0783">CVE-2009-0783</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-2693">CVE-2009-2693</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-2901">CVE-2009-2901</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-2902">CVE-2009-2902</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1157">CVE-2010-1157</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-2227">CVE-2010-2227</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-3718">CVE-2010-3718</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-4172">CVE-2010-4172</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-4312">CVE-2010-4312</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0013">CVE-2011-0013</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0534">CVE-2011-0534</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1088">CVE-2011-1088</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1183">CVE-2011-1183</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1184">CVE-2011-1184</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1419">CVE-2011-1419</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1475">CVE-2011-1475</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1582">CVE-2011-1582</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2204">CVE-2011-2204</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2481">CVE-2011-2481</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2526">CVE-2011-2526</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2729">CVE-2011-2729</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3190">CVE-2011-3190</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3375">CVE-2011-3375</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4858">CVE-2011-4858</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-5062">CVE-2011-5062</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-5063">CVE-2011-5063</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-5064">CVE-2011-5064</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0022">CVE-2012-0022</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:38:00 +0000" tag="requester">craig</metadata>
+  <metadata timestamp="Sun, 24 Jun 2012 14:10:42 +0000" tag="submitter">
+    keytoaster
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201206-25.xml b/metadata/glsa/glsa-201206-25.xml
new file mode 100644
index 000000000000..07fc251255d5
--- /dev/null
+++ b/metadata/glsa/glsa-201206-25.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201206-25">
+  <title>Apache HTTP Server: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities were found in Apache HTTP Server.</synopsis>
+  <product type="ebuild">apache</product>
+  <announced>June 24, 2012</announced>
+  <revised>June 24, 2012: 1</revised>
+  <bug>308049</bug>
+  <bug>330195</bug>
+  <bug>380475</bug>
+  <bug>382971</bug>
+  <bug>385859</bug>
+  <bug>389353</bug>
+  <bug>392189</bug>
+  <bug>398761</bug>
+  <bug>401081</bug>
+  <bug>412481</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="www-servers/apache" auto="yes" arch="*">
+      <unaffected range="ge">2.2.22-r1</unaffected>
+      <vulnerable range="lt">2.2.22-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Apache HTTP Server is one of the most popular web servers on the
+      Internet.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache HTTP Server.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker might obtain sensitive information, gain privileges,
+      send requests to unintended servers behind proxies, bypass certain
+      security restrictions, obtain the values of HTTPOnly cookies, or cause a
+      Denial of Service in various ways.
+    </p>
+    
+    <p>A local attacker could gain escalated privileges.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache HTTP Server users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/apache-2.2.22-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-0408">CVE-2010-0408</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-0434">CVE-2010-0434</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1452">CVE-2010-1452</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-2791">CVE-2010-2791</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3192">CVE-2011-3192</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3348">CVE-2011-3348</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3368">CVE-2011-3368</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-3607">CVE-2011-3607</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4317">CVE-2011-4317</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0021">CVE-2012-0021</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0031">CVE-2012-0031</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0053">CVE-2012-0053</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0883">CVE-2012-0883</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:37:41 +0000" tag="requester">craig</metadata>
+  <metadata timestamp="Sun, 24 Jun 2012 14:28:33 +0000" tag="submitter">
+    keytoaster
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d1b4ccb29cfe..aa161d24b0c5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Jun 2012 17:07:23 +0000
+Sun, 24 Jun 2012 19:37:44 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index a364ad290344..139ec95d8262 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.938 2012/06/22 06:39:25 slyfox Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.940 2012/06/24 15:25:17 blueness Exp $
 
 -->
 <herds>
@@ -1383,6 +1383,10 @@
     <name>Christian Parpart</name>
     <role>Some minor/certain packages.</role>
   </maintainer>
+  <maintainer>
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
 </herd>
 <herd>
   <name>pda</name>
@@ -1799,6 +1803,10 @@
     <email>solar@gentoo.org</email>
     <name>Ned Ludd</name>
   </maintainer>
+  <maintainer>
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
   <maintainer>
     <email>kumba@gentoo.org</email>
     <name>Joshua Kinard</name>
diff --git a/metadata/md5-cache/app-accessibility/brltty-4.2 b/metadata/md5-cache/app-accessibility/brltty-4.2
index c9c1762220cc..173055bdff7a 100644
--- a/metadata/md5-cache/app-accessibility/brltty-4.2
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d9e2dc70d8fab04719c7f8098951268
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2 b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
index 834f495f8763..12d3436f1b5c 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
+++ b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
@@ -9,5 +9,5 @@ LICENSE=FESTIVAL BSD as-is
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/1.96/speech_tools-1.2.96-beta.tar.gz mirror://gentoo/speech_tools-1.2.96-beta-patches.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15b127c79707141c53129f0112a9a33e
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta b/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
index c6b7eb56e6c8..933fbbedf007 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
@@ -9,5 +9,5 @@ LICENSE=FESTIVAL BSD as-is
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.0.95/speech_tools-2.0.95-beta.tar.gz mirror://gentoo/speech_tools-2.0.95-beta-patches.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=604ea2589cf2caafe943ec2dcd33b1c6
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
index fc8dc1efea58..fbc69c4838f3 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=FESTIVAL BSD as-is
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz mirror://gentoo/speech_tools-2.1-patches.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e21e2e8aaa45a7934ec7ffb9b63605e
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.2.22 b/metadata/md5-cache/app-admin/apache-tools-2.2.22
index f900e03ba3b3..6e134a1278f8 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.22
+++ b/metadata/md5-cache/app-admin/apache-tools-2.2.22
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/libpcre ssl? ( dev-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.2.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a887d47a835957c891a3c149e18cb03
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.2 b/metadata/md5-cache/app-admin/apache-tools-2.4.2
index 1b611dd4f2ea..1d56c52243e1 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.2
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.2
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/libpcre ssl? ( dev-libs/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dd16c106e57150d2b84bd61ad970444
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.16 b/metadata/md5-cache/app-admin/conserver-8.1.16
index c2dcc9a34b3b..eb4ce50d94a9 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.16
+++ b/metadata/md5-cache/app-admin/conserver-8.1.16
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc )
 SLOT=0
 SRC_URI=ftp://ftp.conserver.com/conserver/conserver-8.1.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf0079c6341ac17f5559efd8c775a605
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.16-r1 b/metadata/md5-cache/app-admin/conserver-8.1.16-r1
index 17c9f208966f..4a098860a34a 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.16-r1
+++ b/metadata/md5-cache/app-admin/conserver-8.1.16-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=ftp://ftp.conserver.com/conserver/conserver-8.1.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=696c954c905d0f52cb43f36849fc4ab0
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18 b/metadata/md5-cache/app-admin/conserver-8.1.18
index 10aa992d4002..60a4b9d175a1 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e8ffb8896de94a60b8de3b8290290d3
diff --git a/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1 b/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
index 5d9aee691c53..2838f4389a14 100644
--- a/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
+++ b/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility to change the OpenGL interface being used
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~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=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.4
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus//glext.h.75.xz http://dev.gentooexperimental.org/~scarabeus//glxext.h.33.xz http://dev.gentoo.org/~lu_zero/distfiles/eselect-opengl-1.2.5.tar.xz
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=b61ea63a113f365c22b7643de2763330
+_md5_=654f6ddf5582aa0773cc161900d7fc80
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10 b/metadata/md5-cache/app-admin/gam-server-0.1.10
index 8769203d07d3..fe3701c8f45e 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0dbb01e85e3abb280fbd031544fa420c
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10-r1 b/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
index c56fcfff581e..f928c1685164 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd552865f886e506486504b995d7319d
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.5.1 b/metadata/md5-cache/app-admin/hardinfo-0.5.1
index eac964226894..b238982fe017 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.5.1
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://berlios/hardinfo/hardinfo-0.5.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eba3b766eaf2728a2914b9464d2dc025
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527 b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527
index cabf13424c3c..b34cb1e071c8 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20120527.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc7a6c6b781b46421b0a48bb339db188
diff --git a/metadata/md5-cache/app-admin/killproc-2.13 b/metadata/md5-cache/app-admin/killproc-2.13
index aac9744768ef..507ed458e6c2 100644
--- a/metadata/md5-cache/app-admin/killproc-2.13
+++ b/metadata/md5-cache/app-admin/killproc-2.13
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/init/killproc-2.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48c2c963b63cc9502a13065d8bf3982e
diff --git a/metadata/md5-cache/app-admin/logrotate-3.8.1 b/metadata/md5-cache/app-admin/logrotate-3.8.1
index 2f8a104b6294..95317f00a6ce 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.8.1
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd58b24941f3c20bc00d28e411ffa03b
diff --git a/metadata/md5-cache/app-admin/prelude-lml-0.9.1 b/metadata/md5-cache/app-admin/prelude-lml-0.9.1
index e06589310fcf..47832bb99312 100644
--- a/metadata/md5-cache/app-admin/prelude-lml-0.9.1
+++ b/metadata/md5-cache/app-admin/prelude-lml-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/libprelude-cvs !app-admin/prelude-lml-cvs >=dev-libs/libprelude-0.9.0 dev-libs/libpcre
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/prelude-lml-0.9.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f28faaf9bccdebda47e6c0828c564a58
diff --git a/metadata/md5-cache/app-admin/prelude-lml-0.9.10.1 b/metadata/md5-cache/app-admin/prelude-lml-0.9.10.1
index 4897d49d49bf..7b2ef632ce6f 100644
--- a/metadata/md5-cache/app-admin/prelude-lml-0.9.10.1
+++ b/metadata/md5-cache/app-admin/prelude-lml-0.9.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.9 dev-libs/libpcre
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/prelude-lml-0.9.10.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7664f6015959f2d00859269f650c5a4
diff --git a/metadata/md5-cache/app-admin/prelude-lml-0.9.14 b/metadata/md5-cache/app-admin/prelude-lml-0.9.14
index 0cca7df3d75f..6c81ef7d842b 100644
--- a/metadata/md5-cache/app-admin/prelude-lml-0.9.14
+++ b/metadata/md5-cache/app-admin/prelude-lml-0.9.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.9 dev-libs/libpcre
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/prelude-lml/prelude-lml-0.9.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ecd69afa5b76183a1cae22a792e7f54
diff --git a/metadata/md5-cache/app-admin/prelude-lml-1.0.0 b/metadata/md5-cache/app-admin/prelude-lml-1.0.0
index 6d75a641c830..da74e2c5d589 100644
--- a/metadata/md5-cache/app-admin/prelude-lml-1.0.0
+++ b/metadata/md5-cache/app-admin/prelude-lml-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.8 dev-libs/libpcre
 SLOT=0
 SRC_URI=http://www.prelude-technologies.com/download/releases/prelude-lml/prelude-lml-1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=688c218640da67de27c4fbfeb4521c5a
diff --git a/metadata/md5-cache/app-admin/prelude-manager-0.9.15 b/metadata/md5-cache/app-admin/prelude-manager-0.9.15
index c4b00fa16b76..cc2d490ce848 100644
--- a/metadata/md5-cache/app-admin/prelude-manager-0.9.15
+++ b/metadata/md5-cache/app-admin/prelude-manager-0.9.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/libprelude-cvs !app-admin/prelude-manager-cvs >=dev-libs/libprelude-0.9.5 net-libs/gnutls xml? ( dev-libs/libxml2 ) dbx? ( dev-libs/libpreludedb ) tcpwrapper? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/prelude-manager/prelude-manager-0.9.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46976e3453903e3c32ed9fbfc2e195d8
diff --git a/metadata/md5-cache/app-admin/prelude-manager-0.9.9.1 b/metadata/md5-cache/app-admin/prelude-manager-0.9.9.1
index 6f2fa131f4b3..f5efdc3f963c 100644
--- a/metadata/md5-cache/app-admin/prelude-manager-0.9.9.1
+++ b/metadata/md5-cache/app-admin/prelude-manager-0.9.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/libprelude-cvs !app-admin/prelude-manager-cvs >=dev-libs/libprelude-0.9.5 dev-libs/openssl xml? ( dev-libs/libxml2 ) dbx? ( dev-libs/libpreludedb ) tcpwrapper? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/prelude-manager-0.9.9.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=611174ba9a1117326d21521a67a41b8a
diff --git a/metadata/md5-cache/app-admin/prelude-manager-1.0.0-r1 b/metadata/md5-cache/app-admin/prelude-manager-1.0.0-r1
index 393cd002ea51..7c0cd5636d3d 100644
--- a/metadata/md5-cache/app-admin/prelude-manager-1.0.0-r1
+++ b/metadata/md5-cache/app-admin/prelude-manager-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/libprelude-cvs !app-admin/prelude-manager-cvs >=dev-libs/libprelude-0.9.21.3 net-libs/gnutls xml? ( dev-libs/libxml2 ) dbx? ( >=dev-libs/libpreludedb-0.9.4 ) tcpwrapper? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.prelude-technologies.com/download/releases/prelude-manager/prelude-manager-1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=095d142dca6be48bf2ef6aa80f69c195
diff --git a/metadata/md5-cache/app-admin/socklog-2.1.0 b/metadata/md5-cache/app-admin/socklog-2.1.0
index eca98e749f39..56ce6f6aaf4d 100644
--- a/metadata/md5-cache/app-admin/socklog-2.1.0
+++ b/metadata/md5-cache/app-admin/socklog-2.1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-process/runit-1.4.0
 SLOT=0
 SRC_URI=http://smarden.org/socklog/socklog-2.1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4bbff0abad7049519ebe08742715621
diff --git a/metadata/md5-cache/app-admin/sshguard-1.5-r1 b/metadata/md5-cache/app-admin/sshguard-1.5-r1
index 88322e7e8efb..df007933651b 100644
--- a/metadata/md5-cache/app-admin/sshguard-1.5-r1
+++ b/metadata/md5-cache/app-admin/sshguard-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-apps/openrc virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e86b20ced0e7df5cb5bb3ed25b1dd43
diff --git a/metadata/md5-cache/app-admin/sud-1.3-r1 b/metadata/md5-cache/app-admin/sud-1.3-r1
index 11b4b514a94f..f18320dffa82 100644
--- a/metadata/md5-cache/app-admin/sud-1.3-r1
+++ b/metadata/md5-cache/app-admin/sud-1.3-r1
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~ppc
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://s0ftpj.org/projects/sud/sud-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac43214dbf7203c1bbba10cc2a5ac597
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.3_p2 b/metadata/md5-cache/app-admin/sudo-1.8.3_p2
index 7910f1e867ce..8bf9fd550858 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.3_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.3_p2
@@ -10,5 +10,5 @@ RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nd
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.3p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.3p2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2619064ecf70e7ec75e9258d4dda0fdd
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.4_p4 b/metadata/md5-cache/app-admin/sudo-1.8.4_p4
index ff724474f8da..127fb2c1d752 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.4_p4
+++ b/metadata/md5-cache/app-admin/sudo-1.8.4_p4
@@ -10,5 +10,5 @@ RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nd
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.4p4.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.4p4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f34df6824085c70c6a1c4b4cf61bd4b7
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.5_p2 b/metadata/md5-cache/app-admin/sudo-1.8.5_p2
index 2436b2571b9a..87f8038f8d91 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.5_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.8.5_p2
@@ -10,5 +10,5 @@ RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nd
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.5p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.5p2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc52033b5ec2317c6636fe40d0708caa
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.4.2_pre20061230-r2 b/metadata/md5-cache/app-admin/sysklogd-1.4.2_pre20061230-r2
index 9bcda3f54e43..4bfbf1b36721 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.4.2_pre20061230-r2
+++ b/metadata/md5-cache/app-admin/sysklogd-1.4.2_pre20061230-r2
@@ -7,5 +7,5 @@ RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://metalab.unc.edu/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz mirror://gentoo/sysklogd-1.4.1-cvs-20061230.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=257dd983785118887c98ff6c073cfa2c
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5 b/metadata/md5-cache/app-admin/sysklogd-1.5
index 0c1dde8a48a5..0749f18f543e 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5
@@ -7,5 +7,5 @@ RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-3.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54ce5b36f1d3fcc8bfe7f8a25d965c51
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5-r1 b/metadata/md5-cache/app-admin/sysklogd-1.5-r1
index d05fb4df8bc6..4bd38fc43ea7 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5-r1
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5-r1
@@ -7,5 +7,5 @@ RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=930ea870859e99f7dc9c91c199a119de
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5-r2 b/metadata/md5-cache/app-admin/sysklogd-1.5-r2
index 271657a20345..919178a76cbb 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5-r2
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5-r2
@@ -7,5 +7,5 @@ RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f4c3351d450fa2f8ceaaa9e5b9a3e5a
diff --git a/metadata/md5-cache/app-admin/testdisk-6.12 b/metadata/md5-cache/app-admin/testdisk-6.12
index 37630cb9c47e..3f13cf9b717e 100644
--- a/metadata/md5-cache/app-admin/testdisk-6.12
+++ b/metadata/md5-cache/app-admin/testdisk-6.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2 jpeg? ( virtual/jpeg ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.cgsecurity.org/testdisk-6.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d417f7b7c26c78980117b21351d7a894
diff --git a/metadata/md5-cache/app-admin/testdisk-6.13 b/metadata/md5-cache/app-admin/testdisk-6.13
index 73c1ea7d7da3..9f6f5de965d9 100644
--- a/metadata/md5-cache/app-admin/testdisk-6.13
+++ b/metadata/md5-cache/app-admin/testdisk-6.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2 jpeg? ( virtual/jpeg ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.cgsecurity.org/testdisk-6.13.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0a8d9d33699ab9fd6ee511b3a67835d
diff --git a/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r1 b/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r1
index f5e16ab98d94..44a879c936e8 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r1
+++ b/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.3.1-2.tar.gz http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce3405f716b53a268eaf705757de5029
diff --git a/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r2 b/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r2
index aafbc42b69a2..c394b198d9e8 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r2
+++ b/metadata/md5-cache/app-admin/tripwire-2.3.1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.3.1-2.tar.gz mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f1c8f80cc2392b7136b0f4962c16b5e
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2 b/metadata/md5-cache/app-admin/tripwire-2.4.2
index d903440d9519..e8d3fda91e81 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e41c928532be1a00be4a7028377874c7
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2-r1 b/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
index 65053487cf4e..ddb6bddb1aa2 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=402e795829ebec7c7edda185ae4fe871
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2.2 b/metadata/md5-cache/app-admin/tripwire-2.4.2.2
index 0f9e34a3320b..2c061bb7c34c 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2.2
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6572b4b7716e28ed83ea744fb384b873
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1 b/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
index 19274d28fa35..7126e0abbdc3 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17cd6ef51e3a2b9633b275c6f590bca4
diff --git a/metadata/md5-cache/app-admin/ulogd-1.23-r1 b/metadata/md5-cache/app-admin/ulogd-1.23-r1
index ab80a32bf089..b2bfb3ec262f 100644
--- a/metadata/md5-cache/app-admin/ulogd-1.23-r1
+++ b/metadata/md5-cache/app-admin/ulogd-1.23-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-1.23.tar.bz2 mirror://gentoo/ulogd-glsa-200701.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4cfe36a7b7363a0008d0abd82bd203b8
diff --git a/metadata/md5-cache/app-admin/ulogd-1.24-r2 b/metadata/md5-cache/app-admin/ulogd-1.24-r2
index 9aae66e675ef..76e1c8389c14 100644
--- a/metadata/md5-cache/app-admin/ulogd-1.24-r2
+++ b/metadata/md5-cache/app-admin/ulogd-1.24-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) net-libs/libpcap
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-1.24.tar.bz2 mirror://gentoo/ulogd-glsa-200805.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dabbefe2b5adb1c50a416d40bdd25af
diff --git a/metadata/md5-cache/app-admin/usermin-1.430 b/metadata/md5-cache/app-admin/usermin-1.430
index c626793d7d05..3fa54a25d6c0 100644
--- a/metadata/md5-cache/app-admin/usermin-1.430
+++ b/metadata/md5-cache/app-admin/usermin-1.430
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl sys-process/lsof ssl? ( dev-perl/Net-SSLeay )
 SLOT=0
 SRC_URI=mirror://sourceforge/webadmin/usermin-1.430.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20175f3a9e059f7578249e2c287bf275
diff --git a/metadata/md5-cache/app-admin/webmin-1.560-r1 b/metadata/md5-cache/app-admin/webmin-1.560-r1
index 26816306457d..2563ccf1bc4c 100644
--- a/metadata/md5-cache/app-admin/webmin-1.560-r1
+++ b/metadata/md5-cache/app-admin/webmin-1.560-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
 SLOT=0
 SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.560-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.560.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbdd502ee46e2fb2380867bf87d86b5b
diff --git a/metadata/md5-cache/app-admin/webmin-1.570-r1 b/metadata/md5-cache/app-admin/webmin-1.570-r1
index 73a5b4adacb0..c3200644db50 100644
--- a/metadata/md5-cache/app-admin/webmin-1.570-r1
+++ b/metadata/md5-cache/app-admin/webmin-1.570-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
 SLOT=0
 SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.570-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.570.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aaac4a60632896728bab2942857cdbe5
diff --git a/metadata/md5-cache/app-admin/webmin-1.580 b/metadata/md5-cache/app-admin/webmin-1.580
index 2afa50ec6cf0..5cbc9cb347d2 100644
--- a/metadata/md5-cache/app-admin/webmin-1.580
+++ b/metadata/md5-cache/app-admin/webmin-1.580
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local dev-perl/Authen-Libwrap dev-perl/IO-Tty dev-perl/MD5 dev-perl/Net-SSLeay dev-perl/Authen-PAM dev-perl/Sys-Hostname-Long !minimal? ( mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ldap? ( dev-perl/perl-ldap ) dev-perl/XML-Generator dev-perl/XML-Parser )
 SLOT=0
 SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.580-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.580.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c23a337b9a33480aca2af1a3ea401c4e
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.97.3 b/metadata/md5-cache/app-antivirus/clamav-0.97.3
index eb5b7f79b28b..75c5d284e1ad 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.97.3
+++ b/metadata/md5-cache/app-antivirus/clamav-0.97.3
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtua
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.97.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76144c78ea5a672950ccc31e6bb56928
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.97.4 b/metadata/md5-cache/app-antivirus/clamav-0.97.4
index 69de723ab899..6a0a6680eb51 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.97.4
+++ b/metadata/md5-cache/app-antivirus/clamav-0.97.4
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtua
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.97.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d02691ba4bdecfee4e188df0bf0dfc3f
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.97.5 b/metadata/md5-cache/app-antivirus/clamav-0.97.5
new file mode 100644
index 000000000000..fcd76012c932
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.97.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=4
+HOMEPAGE=http://www.clamav.net/
+IUSE=bzip2 clamdtop iconv ipv6 milter selinux static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/clamav/clamav-0.97.5.tar.gz
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2dda55fa73dd6dacb84c150b27905b29
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6 b/metadata/md5-cache/app-arch/bzip2-1.0.6
index f91735869247..9426a60dc9a7 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=BZIP2
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b33d5e932e24959fccc3d220b06e9f9f
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r1 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r1
index 777619b9803e..e2683578269f 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BZIP2
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7db25287822fc697f574e2a8d1291ed3
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r2 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r2
index ba16baeddf97..c0ada4fa3464 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r2
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=BZIP2
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a8b7e22d198b7868cb7d5fdc98a9b78
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r3 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r3
index 8d3c45edfa35..9acef847bd32 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r3
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=BZIP2
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edd189f522d2a38f3c4f9fca2588d6fc
diff --git a/metadata/md5-cache/app-arch/gzip-1.4 b/metadata/md5-cache/app-arch/gzip-1.4
index a6a71f43c41d..1adfe4f05e44 100644
--- a/metadata/md5-cache/app-arch/gzip-1.4
+++ b/metadata/md5-cache/app-arch/gzip-1.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.4.tar.gz mirror://gnu/gzip/gzip-1.4.tar.gz mirror://gentoo/gzip-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbb26ce688944b1ae6139a9935b3789f
diff --git a/metadata/md5-cache/app-arch/gzip-1.5 b/metadata/md5-cache/app-arch/gzip-1.5
index 06c8ab21e728..ea6da80a73db 100644
--- a/metadata/md5-cache/app-arch/gzip-1.5
+++ b/metadata/md5-cache/app-arch/gzip-1.5
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.5.tar.xz mirror://gnu/gzip/gzip-1.5.tar.xz mirror://gentoo/gzip-1.5.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bcc41c92d0965b8c9a879a8153d568c
diff --git a/metadata/md5-cache/app-arch/hardlink++-0.02 b/metadata/md5-cache/app-arch/hardlink++-0.02
deleted file mode 100644
index 1306eaf0e5b4..000000000000
--- a/metadata/md5-cache/app-arch/hardlink++-0.02
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Save disk space by hardlinking identical files
-EAPI=4
-HOMEPAGE=http://www.sodarock.com/hardlink/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/hardlink++-0.02.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17a25b3ba654563e4803b996aa09f99f
diff --git a/metadata/md5-cache/app-arch/lbzip2-0.23-r2 b/metadata/md5-cache/app-arch/lbzip2-0.23-r2
index 96f714f4483f..7b0d8986a81c 100644
--- a/metadata/md5-cache/app-arch/lbzip2-0.23-r2
+++ b/metadata/md5-cache/app-arch/lbzip2-0.23-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://lacos.web.elte.hu/pub/lbzip2/lbzip2-0.23.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f590d68b113c057abb49b97ad955f37e
diff --git a/metadata/md5-cache/app-arch/lha-114i-r7 b/metadata/md5-cache/app-arch/lha-114i-r7
index 09682b1eadfa..b7ea3f0a8385 100644
--- a/metadata/md5-cache/app-arch/lha-114i-r7
+++ b/metadata/md5-cache/app-arch/lha-114i-r7
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Utility for creating and opening lzh archives
-EAPI=3
+EAPI=4
 HOMEPAGE=http://lha.sourceforge.jp
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint
 LICENSE=lha
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d48d88695903857e1626065038a04e90
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=249b6617d975b03633744d8a3a584d3c
diff --git a/metadata/md5-cache/app-arch/libzpaq-5.01 b/metadata/md5-cache/app-arch/libzpaq-5.01
index 86827df357eb..586a4f79744c 100644
--- a/metadata/md5-cache/app-arch/libzpaq-5.01
+++ b/metadata/md5-cache/app-arch/libzpaq-5.01
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=zpaq
 SLOT=0
 SRC_URI=http://mattmahoney.net/dc/libzpaq501.zip
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b26a7e25e550b01d9b9e2e748edc306
diff --git a/metadata/md5-cache/app-arch/mscompress-0.3-r1 b/metadata/md5-cache/app-arch/mscompress-0.3-r1
index 23d6be0caba0..b6ad3a8871c3 100644
--- a/metadata/md5-cache/app-arch/mscompress-0.3-r1
+++ b/metadata/md5-cache/app-arch/mscompress-0.3-r1
@@ -6,5 +6,5 @@ KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-l
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.penguin.cz/pub/users/mhi/mscompress/mscompress-0.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4eefb3f4a34779fc9b908dc3de17d38
diff --git a/metadata/md5-cache/app-arch/p7zip-9.13 b/metadata/md5-cache/app-arch/p7zip-9.13
index 165234eddee9..1b7e4e2b5286 100644
--- a/metadata/md5-cache/app-arch/p7zip-9.13
+++ b/metadata/md5-cache/app-arch/p7zip-9.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=c28cc567e5d01b14ffa199a95d10354e
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.5 b/metadata/md5-cache/app-arch/pbzip2-1.1.5
index bb52195242e3..58cfaa5c02b0 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.5
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.5
@@ -9,5 +9,5 @@ LICENSE=PBZIP2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://compression.ca/pbzip2/pbzip2-1.1.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74606a48fcdd85d484d2ce0669017150
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.6 b/metadata/md5-cache/app-arch/pbzip2-1.1.6
index 6ced53566e39..c5edb27b2fcc 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.6
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.6
@@ -9,5 +9,5 @@ LICENSE=PBZIP2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://compression.ca/pbzip2/pbzip2-1.1.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11dfbe74827666f45c49fc1b8912a7fa
diff --git a/metadata/md5-cache/app-arch/ppmd-9.1_p14 b/metadata/md5-cache/app-arch/ppmd-9.1_p14
index 399d0153aae4..51429100042c 100644
--- a/metadata/md5-cache/app-arch/ppmd-9.1_p14
+++ b/metadata/md5-cache/app-arch/ppmd-9.1_p14
@@ -7,5 +7,5 @@ KEYWORDS=-alpha -amd64 hppa -ia64 ~mips ppc sparc x86 ~x86-interix -amd64-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/ppmd/ppmd_9.1.orig.tar.gz mirror://debian/pool/main/p/ppmd/ppmd_9.1-14.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a564511a5ccc0a53ca8f7f56b3d6502b
diff --git a/metadata/md5-cache/app-arch/ppmd-9.1_p16 b/metadata/md5-cache/app-arch/ppmd-9.1_p16
index 295e266ece1e..e987286ad816 100644
--- a/metadata/md5-cache/app-arch/ppmd-9.1_p16
+++ b/metadata/md5-cache/app-arch/ppmd-9.1_p16
@@ -6,5 +6,5 @@ KEYWORDS=-alpha -amd64 ~hppa -ia64 ~mips ~ppc ~sparc ~x86 ~x86-interix -amd64-li
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/ppmd/ppmd_9.1.orig.tar.gz mirror://debian/pool/main/p/ppmd/ppmd_9.1-16.debian.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5219900f238b9ecdba1faa20d98e4c95
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811 b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
index 30e37025a86a..74ff904aa304 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=0
 SRC_URI=mirror://gentoo/pxz-5.0_pre20110811.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=293d0dd543ba3572e33f10d6e662bcf8
diff --git a/metadata/md5-cache/app-arch/pxz-9999 b/metadata/md5-cache/app-arch/pxz-9999
index bba4699a8ca9..2e7ec78c6236 100644
--- a/metadata/md5-cache/app-arch/pxz-9999
+++ b/metadata/md5-cache/app-arch/pxz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils sys-devel/gcc[openmp]
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e2a77d91cf47ecf423dac4dfece9cdd
diff --git a/metadata/md5-cache/app-arch/rpm-4.10.0 b/metadata/md5-cache/app-arch/rpm-4.10.0
index 27580a80e042..a1c9b80bed36 100644
--- a/metadata/md5-cache/app-arch/rpm-4.10.0
+++ b/metadata/md5-cache/app-arch/rpm-4.10.0
@@ -9,5 +9,5 @@ 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.10.x/rpm-4.10.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c168637ecc019389ff7f2d2c08d63d7a
diff --git a/metadata/md5-cache/app-arch/rpm-4.4.6-r7 b/metadata/md5-cache/app-arch/rpm-4.4.6-r7
index 90bf83ca055c..8ef3d333981e 100644
--- a/metadata/md5-cache/app-arch/rpm-4.4.6-r7
+++ b/metadata/md5-cache/app-arch/rpm-4.4.6-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/db-4 >=sys-libs/zlib-1.1.3 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://rpm5.org/files/rpm/rpm-4.4/rpm-4.4.6.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=472bed5ffb147e76f8d9af0e3bc32117
diff --git a/metadata/md5-cache/app-arch/rpm-4.9.1.2 b/metadata/md5-cache/app-arch/rpm-4.9.1.2
index 5b51d5bf1ee6..2b0dffe771b0 100644
--- a/metadata/md5-cache/app-arch/rpm-4.9.1.2
+++ b/metadata/md5-cache/app-arch/rpm-4.9.1.2
@@ -9,5 +9,5 @@ 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.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69d523fff4ae351d449c5c9bd674b969
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 19a08609b95f..8acc1c475d55 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	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f229686123edf9d6fad17969a47face2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e9e05d7e0ddea0181c238fbf90bbe771
diff --git a/metadata/md5-cache/app-arch/tar-1.23-r2 b/metadata/md5-cache/app-arch/tar-1.23-r2
index 76b96101f6ab..39b8b9ef6d99 100644
--- a/metadata/md5-cache/app-arch/tar-1.23-r2
+++ b/metadata/md5-cache/app-arch/tar-1.23-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.23.tar.bz2 mirror://gnu-alpha/tar/tar-1.23.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c8c28ce8e716f6e6fba7d1f9df733ab
diff --git a/metadata/md5-cache/app-arch/tar-1.23-r4 b/metadata/md5-cache/app-arch/tar-1.23-r4
index 0ce45d7fc3d3..0083425120df 100644
--- a/metadata/md5-cache/app-arch/tar-1.23-r4
+++ b/metadata/md5-cache/app-arch/tar-1.23-r4
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.23.tar.bz2 mirror://gnu-alpha/tar/tar-1.23.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=417c62138d8e31186e1e29bbcb1871b8
diff --git a/metadata/md5-cache/app-arch/tar-1.25 b/metadata/md5-cache/app-arch/tar-1.25
index c542b9c9c04c..537ce0d8a18f 100644
--- a/metadata/md5-cache/app-arch/tar-1.25
+++ b/metadata/md5-cache/app-arch/tar-1.25
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.25.tar.bz2 mirror://gnu-alpha/tar/tar-1.25.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dea7355ed906a6e0cc3ff453c5a3b67f
diff --git a/metadata/md5-cache/app-arch/tar-1.25-r1 b/metadata/md5-cache/app-arch/tar-1.25-r1
index 340aa35a42b4..413a5f1ef158 100644
--- a/metadata/md5-cache/app-arch/tar-1.25-r1
+++ b/metadata/md5-cache/app-arch/tar-1.25-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.25.tar.bz2 mirror://gnu-alpha/tar/tar-1.25.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44cff55ce716cda602a55e8061787c85
diff --git a/metadata/md5-cache/app-arch/tar-1.26 b/metadata/md5-cache/app-arch/tar-1.26
index a8a1f1a1f7f0..fd6c7f7449ed 100644
--- a/metadata/md5-cache/app-arch/tar-1.26
+++ b/metadata/md5-cache/app-arch/tar-1.26
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-a
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.26.tar.bz2 mirror://gnu-alpha/tar/tar-1.26.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bd16ac60159ceaebb52d39c16bf1f2e
diff --git a/metadata/md5-cache/app-arch/tar-1.26-r1 b/metadata/md5-cache/app-arch/tar-1.26-r1
index 35777498d669..3bc44cbdad67 100644
--- a/metadata/md5-cache/app-arch/tar-1.26-r1
+++ b/metadata/md5-cache/app-arch/tar-1.26-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.26.tar.bz2 mirror://gnu-alpha/tar/tar-1.26.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c76c88e52852ddb6875e7986ca9176b
diff --git a/metadata/md5-cache/app-arch/unrar-4.1.4-r2 b/metadata/md5-cache/app-arch/unrar-4.1.4-r2
index 897c1c04aece..53baa842b542 100644
--- a/metadata/md5-cache/app-arch/unrar-4.1.4-r2
+++ b/metadata/md5-cache/app-arch/unrar-4.1.4-r2
@@ -7,5 +7,5 @@ LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a112f04a44bd2072b43464aeb49794ed
diff --git a/metadata/md5-cache/app-arch/unrar-4.2.1 b/metadata/md5-cache/app-arch/unrar-4.2.1
index 4fa85ee5b881..d338adbc8074 100644
--- a/metadata/md5-cache/app-arch/unrar-4.2.1
+++ b/metadata/md5-cache/app-arch/unrar-4.2.1
@@ -7,5 +7,5 @@ LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e48e67ae1621e4c8bc31db8e1e18ba1a
diff --git a/metadata/md5-cache/app-arch/unrar-4.2.2 b/metadata/md5-cache/app-arch/unrar-4.2.2
index 379512e39c6a..d79b867970fd 100644
--- a/metadata/md5-cache/app-arch/unrar-4.2.2
+++ b/metadata/md5-cache/app-arch/unrar-4.2.2
@@ -7,5 +7,5 @@ LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.2.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=068efa3b5d288e3f4d1c9f1496ef1eac
diff --git a/metadata/md5-cache/app-arch/unrar-4.2.3 b/metadata/md5-cache/app-arch/unrar-4.2.3
index afc20fd657cd..30a96abb142b 100644
--- a/metadata/md5-cache/app-arch/unrar-4.2.3
+++ b/metadata/md5-cache/app-arch/unrar-4.2.3
@@ -7,5 +7,5 @@ LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.2.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff819105e7268155581f98031a5a81fb
diff --git a/metadata/md5-cache/app-arch/unrar-4.2.4 b/metadata/md5-cache/app-arch/unrar-4.2.4
index a7c878204415..b3311bcea449 100644
--- a/metadata/md5-cache/app-arch/unrar-4.2.4
+++ b/metadata/md5-cache/app-arch/unrar-4.2.4
@@ -7,5 +7,5 @@ LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad29be2d38457f3e029cb6cfa5a9da7b
diff --git a/metadata/md5-cache/app-arch/unzip-5.52-r2 b/metadata/md5-cache/app-arch/unzip-5.52-r2
index bd28054f5cbc..0aae8aaf883f 100644
--- a/metadata/md5-cache/app-arch/unzip-5.52-r2
+++ b/metadata/md5-cache/app-arch/unzip-5.52-r2
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbs
 LICENSE=Info-ZIP
 SLOT=0
 SRC_URI=mirror://gentoo/unzip552.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc8608305d1e573993a239e6c2eb9e63
diff --git a/metadata/md5-cache/app-arch/unzip-6.0-r1 b/metadata/md5-cache/app-arch/unzip-6.0-r1
index 66da7b279a76..9618295d13fc 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0-r1
+++ b/metadata/md5-cache/app-arch/unzip-6.0-r1
@@ -8,5 +8,5 @@ LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ca59e7d41fccec4ab2619a65fa55df2
diff --git a/metadata/md5-cache/app-arch/unzip-6.0-r2 b/metadata/md5-cache/app-arch/unzip-6.0-r2
index 02e0ee9712ac..7cd9ab082bbf 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0-r2
+++ b/metadata/md5-cache/app-arch/unzip-6.0-r2
@@ -9,5 +9,5 @@ LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa319d1915726d37feb525b856ab1e52
diff --git a/metadata/md5-cache/app-arch/unzip-6.0-r3 b/metadata/md5-cache/app-arch/unzip-6.0-r3
index 8628e5040382..18eea8744b0a 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0-r3
+++ b/metadata/md5-cache/app-arch/unzip-6.0-r3
@@ -9,5 +9,5 @@ LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5e0819c61338adbe636fe2bf291bda5
diff --git a/metadata/md5-cache/app-arch/upx-ucl-3.08 b/metadata/md5-cache/app-arch/upx-ucl-3.08
index 6700923a2385..7f00a8a9da16 100644
--- a/metadata/md5-cache/app-arch/upx-ucl-3.08
+++ b/metadata/md5-cache/app-arch/upx-ucl-3.08
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/ucl-1.02 !app-arch/upx !app-arch/upx-bin
 SLOT=0
 SRC_URI=http://upx.sourceforge.net/download/upx-3.08-src.tar.bz2 lzma? ( mirror://sourceforge/sevenzip/lzma465.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8db2693a32f50a9115f64f72ec0bd544
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.0.4 b/metadata/md5-cache/app-arch/xz-utils-5.0.4
new file mode 100644
index 000000000000..59b13f7be602
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xz-utils-5.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst
+DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+DESCRIPTION=utils for managing LZMA compressed files
+EAPI=2
+HOMEPAGE=http://tukaani.org/xz/
+IUSE=nls static-libs +threads
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+SLOT=0
+SRC_URI=http://tukaani.org/xz/xz-5.0.4.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a6ca1bd3988b7a72cc66ce0cb84a4285
diff --git a/metadata/md5-cache/app-arch/zip-2.32-r1 b/metadata/md5-cache/app-arch/zip-2.32-r1
index bf5b968ded5c..06eca457ed1e 100644
--- a/metadata/md5-cache/app-arch/zip-2.32-r1
+++ b/metadata/md5-cache/app-arch/zip-2.32-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=Info-ZIP
 SLOT=0
 SRC_URI=ftp://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e846f0498597e71b9f9ad8f1aebe58d
diff --git a/metadata/md5-cache/app-arch/zip-3.0 b/metadata/md5-cache/app-arch/zip-3.0
index 3e2b93801e5e..4c24b40796f3 100644
--- a/metadata/md5-cache/app-arch/zip-3.0
+++ b/metadata/md5-cache/app-arch/zip-3.0
@@ -8,5 +8,5 @@ LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3a9afc7286f4317ee1bc228279ff288
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r1 b/metadata/md5-cache/app-arch/zip-3.0-r1
index d24ec985da56..66ae67e47b48 100644
--- a/metadata/md5-cache/app-arch/zip-3.0-r1
+++ b/metadata/md5-cache/app-arch/zip-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65bb0bc0657953c607941173156d2a27
diff --git a/metadata/md5-cache/app-backup/bacula-5.2.9 b/metadata/md5-cache/app-backup/bacula-5.2.9
new file mode 100644
index 000000000000..f6072433a05a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-5.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=>=sys-libs/zlib-1.1.4 dev-libs/gmp !bacula-clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( x11-libs/qt-svg:4 x11-libs/qwt:5 ) ssl? ( dev-libs/openssl ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( >=sys-libs/readline-4.1 ) dev-libs/lzo sys-libs/ncurses python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=4
+HOMEPAGE=http://www.bacula.org/
+IUSE=bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=>=sys-libs/zlib-1.1.4 dev-libs/gmp !bacula-clientonly? ( postgres? ( dev-db/postgresql-base[threads] ) mysql? ( virtual/mysql ) sqlite3? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( x11-libs/qt-svg:4 x11-libs/qwt:5 ) ssl? ( dev-libs/openssl ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( >=sys-libs/readline-4.1 ) dev-libs/lzo sys-libs/ncurses !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+REQUIRED_USE=|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-5.2.9.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e586b24f5852a219f0d7dc4e789541b8
diff --git a/metadata/md5-cache/app-backup/cpdup-1.07 b/metadata/md5-cache/app-backup/cpdup-1.07
index 979f15e108d0..bdc955820ab8 100644
--- a/metadata/md5-cache/app-backup/cpdup-1.07
+++ b/metadata/md5-cache/app-backup/cpdup-1.07
@@ -6,5 +6,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://apollo.backplane.com/FreeSrc/cpdup-1.07.tgz
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8714f41c50364ece76463e51d5f72e08
diff --git a/metadata/md5-cache/app-backup/dar-2.3.11 b/metadata/md5-cache/app-backup/dar-2.3.11
index c25186575459..c3da6a6c19a8 100644
--- a/metadata/md5-cache/app-backup/dar-2.3.11
+++ b/metadata/md5-cache/app-backup/dar-2.3.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.3 >=app-arch/bzip2-1.0.2 acl? ( static? ( sys-apps/attr[static-libs] ) !static? ( sys-apps/attr ) ) nls? ( virtual/libintl ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.3.11.tar.gz
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87f49d5bc34c05c77a2f9a19e9cd53df
diff --git a/metadata/md5-cache/app-backup/dar-2.3.8 b/metadata/md5-cache/app-backup/dar-2.3.8
index 2dc7133642a0..3577b008be71 100644
--- a/metadata/md5-cache/app-backup/dar-2.3.8
+++ b/metadata/md5-cache/app-backup/dar-2.3.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.3 >=app-arch/bzip2-1.0.2 acl? ( sys-apps/attr ) nls? ( virtual/libintl ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.3.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a875d5d65eec182a6f2bcd767a3661a
diff --git a/metadata/md5-cache/app-backup/dar-2.3.9 b/metadata/md5-cache/app-backup/dar-2.3.9
index fef6d0a39fe9..e8f64c963f0f 100644
--- a/metadata/md5-cache/app-backup/dar-2.3.9
+++ b/metadata/md5-cache/app-backup/dar-2.3.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.3 >=app-arch/bzip2-1.0.2 acl? ( sys-apps/attr ) nls? ( virtual/libintl ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.3.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28dd186c74459ea4cf2e399d23e8b8ee
diff --git a/metadata/md5-cache/app-backup/dar-2.4.0 b/metadata/md5-cache/app-backup/dar-2.4.0
index bb478d443d31..181e0e83638e 100644
--- a/metadata/md5-cache/app-backup/dar-2.4.0
+++ b/metadata/md5-cache/app-backup/dar-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.3 >=app-arch/bzip2-1.0.2 acl? ( static? ( sys-apps/a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.4.0.tar.gz
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9695d505bc3c681d85ec92b3a10ac5f
diff --git a/metadata/md5-cache/app-backup/dar-2.4.2 b/metadata/md5-cache/app-backup/dar-2.4.2
index 0783deef79c2..1d766b975551 100644
--- a/metadata/md5-cache/app-backup/dar-2.4.2
+++ b/metadata/md5-cache/app-backup/dar-2.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.3 >=app-arch/bzip2-1.0.2 acl? ( static? ( sys-apps/a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.4.2.tar.gz
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d86c60947b62412a45eea890709265d
diff --git a/metadata/md5-cache/app-backup/kbackup-0.7.1 b/metadata/md5-cache/app-backup/kbackup-0.7.1
index 3635cd27b091..f4a411b0faa3 100644
--- a/metadata/md5-cache/app-backup/kbackup-0.7.1
+++ b/metadata/md5-cache/app-backup/kbackup-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://members.aon.at/m.koller/kbackup-0.7.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=41e00a7b956fd7825f64e323a7152681
diff --git a/metadata/md5-cache/app-benchmarks/cpuburn-1.4a b/metadata/md5-cache/app-benchmarks/cpuburn-1.4a
index 28c69ab962d6..440cd3d11ab9 100644
--- a/metadata/md5-cache/app-benchmarks/cpuburn-1.4a
+++ b/metadata/md5-cache/app-benchmarks/cpuburn-1.4a
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/cpuburn-1.4a.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0018a23b53898a75c43ac442c6382157
diff --git a/metadata/md5-cache/app-benchmarks/i7z-0.27.1 b/metadata/md5-cache/app-benchmarks/i7z-0.27.1
index c7be9a9db680..513ed31c516e 100644
--- a/metadata/md5-cache/app-benchmarks/i7z-0.27.1
+++ b/metadata/md5-cache/app-benchmarks/i7z-0.27.1
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce07ba1594b7cb40d79d93c96069968d
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20090131 b/metadata/md5-cache/app-benchmarks/ltp-20090131
index 8679b7dd2b8f..c44ca978157f 100644
--- a/metadata/md5-cache/app-benchmarks/ltp-20090131
+++ b/metadata/md5-cache/app-benchmarks/ltp-20090131
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/ltp-full-20090131.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8faac16700606914da58e6b368d5acc
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20100131 b/metadata/md5-cache/app-benchmarks/ltp-20100131
index fb6f8c71aecb..a5201d1200ed 100644
--- a/metadata/md5-cache/app-benchmarks/ltp-20100131
+++ b/metadata/md5-cache/app-benchmarks/ltp-20100131
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/ltp-full-20100131.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb2618d425191b918dd8908036608787
diff --git a/metadata/md5-cache/app-benchmarks/piozone-1.0-r3 b/metadata/md5-cache/app-benchmarks/piozone-1.0-r3
index 2d656acce38c..e3920397e0e9 100644
--- a/metadata/md5-cache/app-benchmarks/piozone-1.0-r3
+++ b/metadata/md5-cache/app-benchmarks/piozone-1.0-r3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61f9c790cadb799168b5d66dfa2b33df
diff --git a/metadata/md5-cache/app-benchmarks/ramspeed-2.6.0 b/metadata/md5-cache/app-benchmarks/ramspeed-2.6.0
index 65349fd217ee..c8f092134ee6 100644
--- a/metadata/md5-cache/app-benchmarks/ramspeed-2.6.0
+++ b/metadata/md5-cache/app-benchmarks/ramspeed-2.6.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=Alasir
 SLOT=0
 SRC_URI=http://www.alasir.com/software/ramspeed/ramspeed-2.6.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ab46b72d5be839918fad42152cd343c
diff --git a/metadata/md5-cache/app-benchmarks/ramspeed-3.5.0 b/metadata/md5-cache/app-benchmarks/ramspeed-3.5.0
index 19d87416a303..02c39ffe5dfe 100644
--- a/metadata/md5-cache/app-benchmarks/ramspeed-3.5.0
+++ b/metadata/md5-cache/app-benchmarks/ramspeed-3.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Alasir
 SLOT=0
 SRC_URI=http://www.alasir.com/software/ramspeed/ramsmp-3.5.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ced9e4eb5d43a2465e29fac2b608d905
diff --git a/metadata/md5-cache/app-benchmarks/stress-0.18.6 b/metadata/md5-cache/app-benchmarks/stress-0.18.6
index 66b8cdf670f9..6b7b808a8542 100644
--- a/metadata/md5-cache/app-benchmarks/stress-0.18.6
+++ b/metadata/md5-cache/app-benchmarks/stress-0.18.6
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-0.18.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a0139b3a9ffd35cb2ed8804ae199b86
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.0 b/metadata/md5-cache/app-benchmarks/stress-1.0.0
index 310af0baf275..5bc3580c5841 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.0
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6691f5080f99997fdd47c998276c022
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.1 b/metadata/md5-cache/app-benchmarks/stress-1.0.1
index aae15ca9a55d..f156a6f1f895 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.1
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76c9a4f217fa75fdc6c9097aec482471
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.3 b/metadata/md5-cache/app-benchmarks/stress-1.0.3
index 4c59e22e7e66..c386c17a448f 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.3
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=670e4529a0620273d2d0b182e5b564c6
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.4 b/metadata/md5-cache/app-benchmarks/stress-1.0.4
index 55c874a7e72d..228674b0ef79 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.4
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://weather.ou.edu/~apw/projects/stress/stress-1.0.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=491d6d93c10d7f69ce657865e0482029
diff --git a/metadata/md5-cache/app-cdr/acetoneiso-2.2.2 b/metadata/md5-cache/app-cdr/acetoneiso-2.2.2
index c524a541a595..bedabfad136e 100644
--- a/metadata/md5-cache/app-cdr/acetoneiso-2.2.2
+++ b/metadata/md5-cache/app-cdr/acetoneiso-2.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 media-libs/phonon sys-fs/fuseiso
 SLOT=0
 SRC_URI=mirror://sourceforge/acetoneiso/acetoneiso_2.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0bee40e827b3d8190235ca12f8932a5
diff --git a/metadata/md5-cache/app-cdr/acetoneiso-2.3 b/metadata/md5-cache/app-cdr/acetoneiso-2.3
index 4e8824fdb8c2..f6516447c05d 100644
--- a/metadata/md5-cache/app-cdr/acetoneiso-2.3
+++ b/metadata/md5-cache/app-cdr/acetoneiso-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 kde? ( media-libs/phonon ) !kde? ( || ( x11-libs/qt-phonon:4 media-libs/phonon ) ) sys-fs/fuseiso
 SLOT=0
 SRC_URI=mirror://sourceforge/acetoneiso/acetoneiso_2.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd2b6ec866adedd9c6f42c95f423fbab
diff --git a/metadata/md5-cache/app-cdr/cdrkit-1.1.11 b/metadata/md5-cache/app-cdr/cdrkit-1.1.11
index c572f612df75..b5885744ac6f 100644
--- a/metadata/md5-cache/app-cdr/cdrkit-1.1.11
+++ b/metadata/md5-cache/app-cdr/cdrkit-1.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-arch/bzip2 !app-cdr/cdrtools sys-apps/file sys-libs/zlib unicode? ( virtual/libiconv ) kernel_linux? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cdrkit/cdrkit_1.1.11.orig.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7488f76d5d46886b61ca96017a64f2e
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.00 b/metadata/md5-cache/app-cdr/cdrtools-3.00
index 9bb64c3f4133..bde8293379de 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.00
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.00
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/cdrecord/cdrtools-3.00.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25a4df6c0fc917bc574fcb7c0b8492ae
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha07 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha07
index 7f3fe1cdf06c..5bb033006161 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha07
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha07
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) >=sys-devel/gettext-0.18.1.1 !app-cdr/cdrkit
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/cdrecord/alpha//cdrtools-3.01a07.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0230e3b67a764caac2e5fe4074fe4768
diff --git a/metadata/md5-cache/app-cdr/cdw-0.6.0 b/metadata/md5-cache/app-cdr/cdw-0.6.0
index 1e0dcc07a610..2689327bc4a2 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.6.0
+++ b/metadata/md5-cache/app-cdr/cdw-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.6.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=104b79af0ecd0cd6b2dd70cfeb8864e0
diff --git a/metadata/md5-cache/app-cdr/cdw-0.7.0 b/metadata/md5-cache/app-cdr/cdw-0.7.0
index 518bf5b5cc72..58f623730932 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.7.0
+++ b/metadata/md5-cache/app-cdr/cdw-0.7.0
@@ -8,5 +8,5 @@ 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.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78ed2054f3be68a8b8819fc406b779f1
diff --git a/metadata/md5-cache/app-cdr/cdw-0.7.1 b/metadata/md5-cache/app-cdr/cdw-0.7.1
index 2b46aba21097..5ecea93b0c67 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.7.1
+++ b/metadata/md5-cache/app-cdr/cdw-0.7.1
@@ -8,5 +8,5 @@ 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b86df5ed21057b30b1f457deaec1ecea
diff --git a/metadata/md5-cache/app-cdr/cuecue-0.2.2-r1 b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r1
index bf7d9db26336..15a180b635dd 100644
--- a/metadata/md5-cache/app-cdr/cuecue-0.2.2-r1
+++ b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=|| ( flac mp3 vorbis )
 SLOT=0
 SRC_URI=mirror://berlios/cuecue/cuecue-0.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12772a84f9d7400d7387112a93798a00
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.2-r1 b/metadata/md5-cache/app-cdr/k3b-2.0.2-r1
index 293c96e286bc..9273f0c0685e 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.2-r1
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( virtual/ffmpeg ) flac? ( >=media-libs/flac-1.2[cxx] ) encode? ( lame? ( media-sound/lame ) ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) musicbrainz? ( media-libs/musicbrainz:1 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) app-cdr/cdrdao >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) encode? ( sox? ( media-sound/sox ) ) vcd? ( media-video/vcdimager ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_csb(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=x11-libs/qt-multimedia-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/k3b/k3b-2.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a6d76e238549023178d14a72f69164b7
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.2-r3 b/metadata/md5-cache/app-cdr/k3b-2.0.2-r3
index 678b0d353648..326651a16142 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.2-r3
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( virtual/ffmpeg ) flac? ( >=media-libs/flac-1.2[cxx] ) lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] app-cdr/cdrdao media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 media-video/transcode[dvd] ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_csb(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=x11-libs/qt-multimedia-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/k3b/k3b-2.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=782d9e3c333d383551f9123c031fcd7b
diff --git a/metadata/md5-cache/app-cdr/k9copy-2.3.8 b/metadata/md5-cache/app-cdr/k9copy-2.3.8
index 10a2d8b10630..f675c9d37f5c 100644
--- a/metadata/md5-cache/app-cdr/k9copy-2.3.8
+++ b/metadata/md5-cache/app-cdr/k9copy-2.3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread media-libs/libmpeg2 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor mplayer? ( media-video/mplayer ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_es_AR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es_AR(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/k9copy/k9copy-2.3.8-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1585caabaf825a6226ca03100bf868ba
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.4 b/metadata/md5-cache/app-cdr/kcdemu-0.4
index 3fbc29fb020a..863435801ab6 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.4
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-cdr/cdemu >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2e3a3db097689405b0cea283f0fdf774
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 06241ea3725d..0a7a213a04b6 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60c7fe33d900b4e554c3d21493c3fde4
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1 b/metadata/md5-cache/app-cdr/xbiso-0.6.1
index aba029b947b7..8013726c95ef 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5241c414ea09927544db04b54f61c139
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
index 97ae0b191766..835fcd419c21 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/ftplib
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f087e441f82af3c2f4f3ac1642361737
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.3b b/metadata/md5-cache/app-crypt/aespipe-2.3b
index 4d1150ec2a41..b330ec1a949b 100644
--- a/metadata/md5-cache/app-crypt/aespipe-2.3b
+++ b/metadata/md5-cache/app-crypt/aespipe-2.3b
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/sharutils
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.3b.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e573acf99beee466f0b1b415d4bf6c6
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.3e b/metadata/md5-cache/app-crypt/aespipe-2.3e
index b5bcc5d1d971..dd907aecca49 100644
--- a/metadata/md5-cache/app-crypt/aespipe-2.3e
+++ b/metadata/md5-cache/app-crypt/aespipe-2.3e
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/sharutils
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.3e.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6bda813cd9b4d8a6924b8393ba44d0fe
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-1.6_p16 b/metadata/md5-cache/app-crypt/bestcrypt-1.6_p16
index 671edcaecbcc..0f92de67ce72 100644
--- a/metadata/md5-cache/app-crypt/bestcrypt-1.6_p16
+++ b/metadata/md5-cache/app-crypt/bestcrypt-1.6_p16
@@ -8,5 +8,5 @@ LICENSE=bestcrypt
 RDEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.jetico.com/linux/BestCrypt-1.6-16.tar.gz !x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz ) x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e90940c81583f0666d100f6d5b759fa
diff --git a/metadata/md5-cache/app-crypt/bestcrypt-1.7.0 b/metadata/md5-cache/app-crypt/bestcrypt-1.7.0
index 9662aff33ab4..465f2ffd3879 100644
--- a/metadata/md5-cache/app-crypt/bestcrypt-1.7.0
+++ b/metadata/md5-cache/app-crypt/bestcrypt-1.7.0
@@ -9,5 +9,5 @@ LICENSE=bestcrypt
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.jetico.com/linux/BestCrypt-1.7-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72048c677ba59c6a8062dd4614b92be1
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.0.2_p1188 b/metadata/md5-cache/app-crypt/eid-mw-4.0.2_p1188
index 83b054126a80..d340b3c46a73 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-4.0.2_p1188
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.0.2_p1188
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure install prepare
 DEPEND=gtk? ( x11-libs/gtk+:2 ) >=sys-apps/pcsc-lite-1.2.9 xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) !app-misc/beid-runtime app-arch/zip virtual/pkgconfig app-arch/unzip
 DESCRIPTION=Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government.
 EAPI=4
@@ -10,4 +10,4 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) >=sys-apps/pcsc-lite-1.2.9 xpi? ( || ( >=www-cl
 SLOT=0
 SRC_URI=http://eid-mw.googlecode.com/files/eid-mw-4.0.2-1188.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ac5451534bd6280bb1463629e2a902b
+_md5_=79b3896424844d5c2822ed432a343f94
diff --git a/metadata/md5-cache/app-crypt/gnupg-1.4.11 b/metadata/md5-cache/app-crypt/gnupg-1.4.11
index 1383fae539f4..37cfd0d9ac04 100644
--- a/metadata/md5-cache/app-crypt/gnupg-1.4.11
+++ b/metadata/md5-cache/app-crypt/gnupg-1.4.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) virtual/mta readline? ( sys-libs/readline ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2 idea? ( mirror://gentoo/idea.c.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d393e72fd4f2a85173d1c06e6f0d0a9
diff --git a/metadata/md5-cache/app-crypt/gnupg-1.4.12 b/metadata/md5-cache/app-crypt/gnupg-1.4.12
index 49e8327050e6..7756a75aa917 100644
--- a/metadata/md5-cache/app-crypt/gnupg-1.4.12
+++ b/metadata/md5-cache/app-crypt/gnupg-1.4.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) virtual/mta readline? ( sys-libs/readline ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.12.tar.bz2 idea? ( mirror://gentoo/idea.c.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dc009c06e22ce591a04db07a4b10a9b
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.17 b/metadata/md5-cache/app-crypt/gnupg-2.0.17
index 2ba088585085..0080d30dd0ba 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.17
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 >=dev-libs/libgpg-error-1.7 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib adns? ( >=net-libs/adns-1.4 ) bzip2? ( app-arch/bzip2 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) openct? ( >=dev-libs/openct-0.5.0 ) smartcard? ( =virtual/libusb-0* ) ldap? ( net-nds/openldap ) ) || ( app-crypt/pinentry app-crypt/pinentry-qt ) virtual/mta !app-crypt/gpg-agent !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e941dde20fd62ba3a04162b2bd89cc6
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.17-r2 b/metadata/md5-cache/app-crypt/gnupg-2.0.17-r2
index a4108bfb4764..7d752dc79345 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.17-r2
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.17-r2
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 >=dev-libs/li
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f01079bb37129fb1ed4920bd32ee541
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.17-r3 b/metadata/md5-cache/app-crypt/gnupg-2.0.17-r3
index 6f9b8cc6c07e..ee20b4765275 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.17-r3
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.17-r3
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 >=dev-libs/li
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30d1bcb78a6bac2176c088a94d38b161
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.18 b/metadata/md5-cache/app-crypt/gnupg-2.0.18
index 8f40f64c9afd..628d1a485b35 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.18
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.18
@@ -10,5 +10,5 @@ RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 >=dev-libs/li
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.18.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dab6c1c5566f4c4ddc8825742b52806
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.19 b/metadata/md5-cache/app-crypt/gnupg-2.0.19
index a49bbc0965f5..08eb7491747a 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.0.19
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.19
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
 IUSE=adns bzip2 doc ldap nls readline static selinux smartcard usb
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4 >=dev-libs/libgpg-error-1.7 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib adns? ( >=net-libs/adns-1.4 ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) || ( app-crypt/pinentry app-crypt/pinentry-qt ) virtual/mta !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.19.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4c6f1caf79fbf503bc92cd4220ddfeb1
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4d989e22df04cdc6e83a646006665048
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.1-r1 b/metadata/md5-cache/app-crypt/heimdal-1.5.1-r1
index 94b074172b6d..7465c1e9d9fa 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.1-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61b7f13708de3880d97bedfd6a66cd30
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.2 b/metadata/md5-cache/app-crypt/heimdal-1.5.2
index 6e1f3a969878..98e046fe5c56 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.2
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=82f52ee2e1735b6d8a68dc5d062624d4
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.2-r1 b/metadata/md5-cache/app-crypt/heimdal-1.5.2-r1
index 7b8aed9ce080..a541aec739c8 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.2-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d4b3f2f89b560898c7be547fe8d744cb
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.6-r1 b/metadata/md5-cache/app-crypt/johntheripper-1.7.6-r1
index 8f819a196ad8..6a2ead7fd5af 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.6-r1
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.6.tar.gz !minimal? ( http://www.openwall.com/john/contrib/john-1.7.6-jumbo-4.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cba22c2fd9cd1e315408088b31d55ff9
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.8 b/metadata/md5-cache/app-crypt/johntheripper-1.7.8
index 803dd904c956..a28a28514f95 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.8
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 REQUIRED_USE=openmp? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.8.tar.gz !minimal? ( http://www.openwall.com/john/g/john-1.7.8-jumbo-2.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c469c2c6e522dfbad2df593e5d53a1eb
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9
index e3ca7cf341b5..54eaaddeccc5 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 REQUIRED_USE=openmp? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-5.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5bd97bddd039a1b4c959213291fda5f
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r1 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r1
index cf8396b46e08..46a123560d3b 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r1
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-5.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3cb9f1b94aa7828544358fd6b33f0d2
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r2 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r2
index da08b9ee18ee..2f7964d916fe 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r2
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal )
 SLOT=0
 SRC_URI=http://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( http://www.openwall.com/john/g/john-1.7.9-jumbo-5.diff.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=059732c57d8750d5fa01fdbd15b6de62
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10 b/metadata/md5-cache/app-crypt/mit-krb5-1.10
index bc82f25412cc..c37658fdfba1 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=147ff08cb0a9cede66d1f4dd8e2d1eb9
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.10-r1
index 36ea8631f163..401dd4c93fea 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1760a14583ed412dbb6e531a9816f65
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1 b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1
index 2dc9ecd32690..97c6e4c6f69e 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.1-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=714ac50c2993d74dca928897082ed8c0
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r1
index 717bb2abad3b..df4abe90a535 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.1-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe943b433e430b29ff6d87cf0ba31e37
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r2
index 3750dd5434b6..bf62908d5032 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.1-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92fe1796f58324d6c29a71713120c5ec
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r3 b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r3
index 39300ee97d95..6173288b17b4 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10.1-r3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 dev-libs/libverto keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.1-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd81bcec5daa54798076c46848ae0800
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.10.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.10.2
index 22a2f920480f..7c0d90d07c51 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.10.2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.10.2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 dev-libs/libverto keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=efa6d2a79ffe7ca16b90e360ec2220c3
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.8.3-r6 b/metadata/md5-cache/app-crypt/mit-krb5-1.8.3-r6
index 19e009267fb8..8df25e29e519 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.8.3-r6
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.8.3-r6
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 sys-apps/keyutils openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.3-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1df5a3c88fd6c64994f1fd17b07b19eb
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.8.4-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.8.4-r2
index f7c0f99dc429..c5ed6189dd16 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.8.4-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.8.4-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 sys-apps/keyutils openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.4-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99f8082e325f0d0aede5741af76b1b2e
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.8.5-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.8.5-r1
index af5de62dad13..22a156a813b5 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.8.5-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 sys-apps/keyutils openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.5-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10527bf288345028de80a72f4b703a85
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.8.6 b/metadata/md5-cache/app-crypt/mit-krb5-1.8.6
index cf99a8ea9b9d..966bd0a64cce 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.8.6
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.8.6
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 sys-apps/keyutils openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.6-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=17a1021d3ccac1b27d7390fff6d1d4cf
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.9.2-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.9.2-r2
index 0da80064430c..455d17670e2d 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.9.2-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.9.2-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.2-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=292c6a2149db45bad9867d8004a9c277
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.9.3 b/metadata/md5-cache/app-crypt/mit-krb5-1.9.3
index 91abdc3d26d5..380edd1e64cd 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.9.3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.9.3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01ea9a147e30dc9a5f0d6ce8a25408bb
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.9.4 b/metadata/md5-cache/app-crypt/mit-krb5-1.9.4
index 7b4f64fb7e37..c4d65097ae2e 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.9.4
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.9.4
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.4-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1ee5e74c07e883f18c084e27244e6cf
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.2-r1 b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.2-r1
index ef6837074d78..5eac5ee78988 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.2-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.2-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1bdf28db2db0a59b3e714d89ee87a5a4
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3 b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
index 76c415d87b7b..658eee3381e0 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.3-signed.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6bceb9558b4997334d8077141b98ec8
diff --git a/metadata/md5-cache/app-crypt/nistp224-0.75-r1 b/metadata/md5-cache/app-crypt/nistp224-0.75-r1
index b0fbdb09bec4..aebdb5b867ba 100644
--- a/metadata/md5-cache/app-crypt/nistp224-0.75-r1
+++ b/metadata/md5-cache/app-crypt/nistp224-0.75-r1
@@ -7,5 +7,5 @@ KEYWORDS=~x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://cr.yp.to/nistp224/nistp224-0.75.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96ccd532e8304bc4c767c60646e83e7c
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.0 b/metadata/md5-cache/app-crypt/pinentry-0.8.0
index 49d934544462..01d9e9857f51 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.0
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=static? ( sys-libs/ncurses ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b56ed5290d0e95061813a8deddfdeb22
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.0-r1 b/metadata/md5-cache/app-crypt/pinentry-0.8.0-r1
index 828c1ff861a8..30f850abbbe7 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.0-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-pinentry static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a338a056411ab3bdcffab1a43df2118
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.1 b/metadata/md5-cache/app-crypt/pinentry-0.8.1
index ae36c411e449..2fdff57b3582 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.1
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-pinentry static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2df40298a983b186bc49643a1bf278fc
diff --git a/metadata/md5-cache/app-crypt/pinentry-qt-0.5.0 b/metadata/md5-cache/app-crypt/pinentry-qt-0.5.0
index 33fadcaeda23..6a46ae5c3bf5 100644
--- a/metadata/md5-cache/app-crypt/pinentry-qt-0.5.0
+++ b/metadata/md5-cache/app-crypt/pinentry-qt-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-pinentry x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-qt-0.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58307444b9068301b02fba1f88a13655
diff --git a/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r1 b/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r1
index 0075c80037f3..a69f21d17c00 100644
--- a/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r1
+++ b/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r1
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://project-rainbowcrack.com/rainbowcrack-1.2-src.zip http://project-rainbowcrack.com/rainbowcrack-1.2-src-algorithmpatch.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5169e8d258b4b8873a5eebe1313a2c7b
diff --git a/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r2 b/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r2
index 54d37a7305f7..b1190e38e825 100644
--- a/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r2
+++ b/metadata/md5-cache/app-crypt/rainbowcrack-1.2-r2
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://project-rainbowcrack.com/rainbowcrack-1.2-src.zip http://project-rainbowcrack.com/rainbowcrack-1.2-src-algorithmpatch.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=049abb6cfb14d97d7cf7c3511839bbcd
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83 b/metadata/md5-cache/app-crypt/rotix-0.83
index 84d890124bb2..86027f3dfb8a 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83
+++ b/metadata/md5-cache/app-crypt/rotix-0.83
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext
 SLOT=0
 SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50294aa3a69410e7c7ac9df3eb39296d
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
index 1dd962a02475..518daf7ebc73 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ccbe9913203f2f55d5145f2436d572a
diff --git a/metadata/md5-cache/app-crypt/truecrypt-7.1a b/metadata/md5-cache/app-crypt/truecrypt-7.1a
index da6683e37dc4..78f87e2e7776 100644
--- a/metadata/md5-cache/app-crypt/truecrypt-7.1a
+++ b/metadata/md5-cache/app-crypt/truecrypt-7.1a
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) sys-fs/fuse x11-libs/w
 RESTRICT=mirror fetch bindist
 SLOT=0
 SRC_URI=truecrypt-7.1a.tar.gz mirror://gentoo/truecrypt-pkcs11.h.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=0bae482a7cf1cc43fb96375d332b3da1
diff --git a/metadata/md5-cache/app-crypt/xca-0.9.0 b/metadata/md5-cache/app-crypt/xca-0.9.0
index 44f9c3c6515d..71619ffb6036 100644
--- a/metadata/md5-cache/app-crypt/xca-0.9.0
+++ b/metadata/md5-cache/app-crypt/xca-0.9.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-0.9.8[-bindist] x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/xca/xca-0.9.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9ba2b0f1db1e3ba8538bb135c05858b
diff --git a/metadata/md5-cache/app-dicts/dikt-2d b/metadata/md5-cache/app-dicts/dikt-2d
index 78564a18ccbb..0ab1c4aa4e6d 100644
--- a/metadata/md5-cache/app-dicts/dikt-2d
+++ b/metadata/md5-cache/app-dicts/dikt-2d
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dikt.googlecode.com/files/dikt-2d.tbz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cadb394b57198705504de115e18140ad
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r2 b/metadata/md5-cache/app-dicts/wordnet-3.0-r2
index 89791ddb16bf..c8f78a9f0506 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r2
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r2
@@ -8,5 +8,5 @@ LICENSE=Princeton
 RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c91514a8c73280687a1ee4229252155e
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r3 b/metadata/md5-cache/app-dicts/wordnet-3.0-r3
index 3d824dde708c..379b86d7feb2 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r3
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r3
@@ -9,5 +9,5 @@ LICENSE=Princeton
 RDEPEND=dev-lang/tcl dev-lang/tk
 SLOT=0
 SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ae9ee418f768dc6d05c1f8958dadfd6
diff --git a/metadata/md5-cache/app-doc/doxygen-1.4.7 b/metadata/md5-cache/app-doc/doxygen-1.4.7
index 521f4c08bb02..05bc4f506f10 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.4.7
+++ b/metadata/md5-cache/app-doc/doxygen-1.4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/graphviz-2.6 latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended ) app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.4.7.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png unicode? ( mirror://gentoo/doxygen-1.4.7-utf8-ru.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=213557d3b2365c51223fb0492604f29c
diff --git a/metadata/md5-cache/app-doc/doxygen-1.5.4 b/metadata/md5-cache/app-doc/doxygen-1.5.4
index ec5325900484..7190c7c70b53 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.5.4
+++ b/metadata/md5-cache/app-doc/doxygen-1.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=latex? ( app-text/texlive-core dev-texlive/texlive-latexrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra ) dev-lang/python virtual/libiconv app-text/ghostscript-gpl !nodot? ( >=media-gfx/graphviz-2.6 media-libs/freetype )
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.5.4.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad9702f934f2fdb61547f56c55859157
diff --git a/metadata/md5-cache/app-doc/doxygen-1.5.8-r1 b/metadata/md5-cache/app-doc/doxygen-1.5.8-r1
index 9c1dfac8b8ee..257fb09619d9 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.5.8-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.5.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( app-text/texlive-core dev-texlive/texlive-genericrecommended dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra ) dev-lang/python virtual/libiconv media-libs/libpng app-text/ghostscript-gpl !nodot? ( >=media-gfx/graphviz-2.6 media-libs/freetype )
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.5.8.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79303dabaa3b9202d4db89e803fe3515
diff --git a/metadata/md5-cache/app-doc/doxygen-1.6.3 b/metadata/md5-cache/app-doc/doxygen-1.6.3
index ab820e1b1974..ba2b068cc449 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.6.3
+++ b/metadata/md5-cache/app-doc/doxygen-1.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) dev-lang/python virtual/libiconv media-libs/libpng app-text/ghostscript-gpl !nodot? ( >=media-gfx/graphviz-2.20.0 media-libs/freetype )
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c4268961b4b2dc2595e8deabc89c0e5
diff --git a/metadata/md5-cache/app-doc/doxygen-1.7.2 b/metadata/md5-cache/app-doc/doxygen-1.7.2
index e3fdf962f03b..1de0214ddf6b 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.7.2
+++ b/metadata/md5-cache/app-doc/doxygen-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) dev-lang/python virtual/libiconv media-libs/libpng app-text/ghostscript-gpl !nodot? ( >=media-gfx/graphviz-2.20.0 media-libs/freetype )
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.2.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png tcl? ( mirror://gentoo/doxygen-1.7-tcl_support.patch.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79dcba8333cb3fbd6f714980309af836
diff --git a/metadata/md5-cache/app-doc/doxygen-1.7.3 b/metadata/md5-cache/app-doc/doxygen-1.7.3
index 3997e8ccbc78..b72de66c234e 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.7.3
+++ b/metadata/md5-cache/app-doc/doxygen-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) dev-lang/python virtual/libiconv media-libs/libpng app-text/ghostscript-gpl !nodot? ( >=media-gfx/graphviz-2.20.0 media-libs/freetype )
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.3.src.tar.gz tcl? ( mirror://gentoo/doxygen-1.7-tcl_support.patch.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c195b66e6799b1cb0c6e8ee655b5aec
diff --git a/metadata/md5-cache/app-doc/doxygen-1.7.5.1 b/metadata/md5-cache/app-doc/doxygen-1.7.5.1
index 43c3b3f50113..54551b21b674 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.7.5.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.7.5.1
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) dev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.5.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e98f30dbc20a8f2c1c727cf6a3546bf
diff --git a/metadata/md5-cache/app-doc/doxygen-1.7.6.1 b/metadata/md5-cache/app-doc/doxygen-1.7.6.1
index ffdfcb1df674..345415ad9208 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.7.6.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.7.6.1
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/p
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.6.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fdf289b15032026bf73a14793f1d9fb8
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.0 b/metadata/md5-cache/app-doc/doxygen-1.8.0
index 08ced1139784..5029908798b2 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.0
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/p
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.0.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43464fe46cf4ea991323267eed63d40a
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.1 b/metadata/md5-cache/app-doc/doxygen-1.8.1
index d48282c007ab..ffba1b0dde9d 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/p
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5b133b7f38d835f565d964721d6e3ed
diff --git a/metadata/md5-cache/app-doc/halibut-0.9 b/metadata/md5-cache/app-doc/halibut-0.9
index 6254a97ff8b1..7c094c20ed6f 100644
--- a/metadata/md5-cache/app-doc/halibut-0.9
+++ b/metadata/md5-cache/app-doc/halibut-0.9
@@ -5,5 +5,5 @@ KEYWORDS=~x86 ~ppc
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7ce44b3788e09a4807caeda91c7df53
diff --git a/metadata/md5-cache/app-editors/efte-1.1 b/metadata/md5-cache/app-editors/efte-1.1
index 2a1747513907..e7123b0f4f3a 100644
--- a/metadata/md5-cache/app-editors/efte-1.1
+++ b/metadata/md5-cache/app-editors/efte-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gpm? ( sys-libs/gpm ) X? ( x11-libs/libXpm x11-libs/libXdmcp x11-libs/libXau media-fonts/font-misc-misc )
 SLOT=0
 SRC_URI=mirror://sourceforge/efte/efte-1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dda0bda5449e368384738624d433af3a
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r8 b/metadata/md5-cache/app-editors/emacs-18.59-r8
index 5dd595d26778..bec57b321b17 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r8
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r8
@@ -8,5 +8,5 @@ LICENSE=GPL-1 GPL-2 BSD
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 amd64? ( app-emulation/emul-linux-x86-baselibs )
 SLOT=18
 SRC_URI=mirror://gnu/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz mirror://gentoo/emacs-18.59-patches-7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5af78308c7f1aced58bf696c1f506067
diff --git a/metadata/md5-cache/app-editors/emacs-21.4-r24 b/metadata/md5-cache/app-editors/emacs-21.4-r24
index 032c4a3f5bb5..f0090d77d99b 100644
--- a/metadata/md5-cache/app-editors/emacs-21.4-r24
+++ b/metadata/md5-cache/app-editors/emacs-21.4-r24
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 BSD as-is MIT
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXpm x11-misc/xbitmaps >=media-libs/giflib-4.1.0.1b virtual/jpeg >=media-libs/tiff-3.5.5-r3 >=media-libs/libpng-1.4:0 Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?] sendmail? ( virtual/mta )
 SLOT=21
 SRC_URI=mirror://gnu/emacs/emacs-21.4a.tar.gz mirror://gentoo/emacs-21.4-patches-13.tar.bz2 leim? ( mirror://gnu/emacs/leim-21.4.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aece9b4c78b964222cee4ef8edeb22ef
diff --git a/metadata/md5-cache/app-editors/emacs-22.3-r10 b/metadata/md5-cache/app-editors/emacs-22.3-r10
index 076bf2a27f8f..1d8c281eea5b 100644
--- a/metadata/md5-cache/app-editors/emacs-22.3-r10
+++ b/metadata/md5-cache/app-editors/emacs-22.3-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-3 FDL-1.2 BSD as-is MIT
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) )
 SLOT=22
 SRC_URI=mirror://gnu/emacs/emacs-22.3.tar.gz mirror://gentoo/emacs-22.3-patches-8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83e4b510eb1048e45cd52ca6d5160172
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r1 b/metadata/md5-cache/app-editors/emacs-23.4-r1
index da58cb8c72ad..ac8e79b927dd 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r1
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesi
 REQUIRED_USE=aqua? ( !X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 mirror://gentoo/emacs-23.4-patches-2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba5cd7b76d728091a20177b4b956735b
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r3 b/metadata/md5-cache/app-editors/emacs-23.4-r3
index ee92a4e8ec41..b5930e5eef13 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r3
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-
 REQUIRED_USE=aqua? ( !X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 mirror://gentoo/emacs-23.4-patches-4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f0d5f52e16e682f2a1aefb65d6e448ff
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1fd177d158676f2bc65dc94a680f0977
diff --git a/metadata/md5-cache/app-editors/emacs-24.1 b/metadata/md5-cache/app-editors/emacs-24.1
index c3bcc987fbb7..d7e7ed056723 100644
--- a/metadata/md5-cache/app-editors/emacs-24.1
+++ b/metadata/md5-cache/app-editors/emacs-24.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-
 REQUIRED_USE=aqua? ( !X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.1.tar.bz2 mirror://gentoo/emacs-24.1-patches-2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8b9a8495cd3870688686b99a39ff5b95
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a83925ce43cd8be225c78e49fdb92688
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-vcs-24.1.9999-r1
index 5939c72bbc1a..26b9f5407045 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.1.9999-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-f
 LICENSE=GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3[X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) )
 SLOT=24
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bzr	ec4306b727be7630f6d5abaf08c8b818	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=24e3a50d3d598594869e2277868a314a
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bzr	ec4306b727be7630f6d5abaf08c8b818	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=39e00f5716cafaf4b4dc43447dac3635
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.266 b/metadata/md5-cache/app-editors/gvim-7.3.266
index fe7eef2360d3..eba086e68a52 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.266
+++ b/metadata/md5-cache/app-editors/gvim-7.3.266
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.266 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=6375142621a9c42b50380aead53f2b39
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.409 b/metadata/md5-cache/app-editors/gvim-7.3.409
index aae9562db9a5..c7165145caa1 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.409
+++ b/metadata/md5-cache/app-editors/gvim-7.3.409
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.409 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=5a469bebffb1ad4260769e190459910a
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.444 b/metadata/md5-cache/app-editors/gvim-7.3.444
index a3e2bfcd4db0..5b7fa134aaeb 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.444
+++ b/metadata/md5-cache/app-editors/gvim-7.3.444
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.444 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=86fb332d10a61783fc2b4dca8251103c
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.456 b/metadata/md5-cache/app-editors/gvim-7.3.456
index 21d0018bbfd8..a15e42a8bd49 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.456
+++ b/metadata/md5-cache/app-editors/gvim-7.3.456
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.456 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=413c24a82fc216011a90c6c50fc08cef
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.462 b/metadata/md5-cache/app-editors/gvim-7.3.462
index 5155679a3d23..592abf4a177b 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.462
+++ b/metadata/md5-cache/app-editors/gvim-7.3.462
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.462 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=542809498389ddb7bd65c587152bc0d6
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.487 b/metadata/md5-cache/app-editors/gvim-7.3.487
index c322dd10c08b..085c090e138c 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.487
+++ b/metadata/md5-cache/app-editors/gvim-7.3.487
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.487 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=9a036cb4fb1a1119df1e8e02781fa6c3
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.498 b/metadata/md5-cache/app-editors/gvim-7.3.498
index 4c5d7e224f6f..d7337ae27464 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.498
+++ b/metadata/md5-cache/app-editors/gvim-7.3.498
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.498 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=d5a684704408fd2aeac91f882a3d4acb
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.502 b/metadata/md5-cache/app-editors/gvim-7.3.502
index 40a57eefd87a..517bdc772e26 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.502
+++ b/metadata/md5-cache/app-editors/gvim-7.3.502
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.502 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=268deead4078b6065d35848f29e5d1c9
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.515 b/metadata/md5-cache/app-editors/gvim-7.3.515
index 44e1096c0aa4..2b4d8c83b95b 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.515
+++ b/metadata/md5-cache/app-editors/gvim-7.3.515
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.515 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7e6da8a90d99900bb3325df5e6dff77d
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.537 b/metadata/md5-cache/app-editors/gvim-7.3.537
index dc2bddb44be6..60ed9bef6b39 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.537
+++ b/metadata/md5-cache/app-editors/gvim-7.3.537
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.537 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=5599e55d655ed3c91b506ccd1190455b
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.556 b/metadata/md5-cache/app-editors/gvim-7.3.556
index 00cf640d2fed..548783b5d7b6 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.556
+++ b/metadata/md5-cache/app-editors/gvim-7.3.556
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 ~app-editors/vim-core-7.3.556 dev-util/ctags x11-libs/libXext !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=2d344e88f1b1d7213406d883e2c55c10
diff --git a/metadata/md5-cache/app-editors/joe-3.5 b/metadata/md5-cache/app-editors/joe-3.5
index be1515dc62cc..37e8e9eac3be 100644
--- a/metadata/md5-cache/app-editors/joe-3.5
+++ b/metadata/md5-cache/app-editors/joe-3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-3.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f17c4c0ebce6d26559d018a431ea3d3
diff --git a/metadata/md5-cache/app-editors/joe-3.7-r1 b/metadata/md5-cache/app-editors/joe-3.7-r1
index 82bc2a2a5efb..a26c29c70599 100644
--- a/metadata/md5-cache/app-editors/joe-3.7-r1
+++ b/metadata/md5-cache/app-editors/joe-3.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-3.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a1a6d195bddd629f8bc77c9a614201b
diff --git a/metadata/md5-cache/app-editors/juffed-0.8.1 b/metadata/md5-cache/app-editors/juffed-0.8.1
index 875ba9bf4da9..5ebe5c776cdb 100644
--- a/metadata/md5-cache/app-editors/juffed-0.8.1
+++ b/metadata/md5-cache/app-editors/juffed-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qscintilla x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/juffed/juffed_0.8.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94b1328a280a3751ad64d2046135cae4
diff --git a/metadata/md5-cache/app-editors/kile-2.1.2 b/metadata/md5-cache/app-editors/kile-2.1.2
index fdd170f9bc44..6f3f21f041ac 100644
--- a/metadata/md5-cache/app-editors/kile-2.1.2
+++ b/metadata/md5-cache/app-editors/kile-2.1.2
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=x11-misc/shared-mime-info >=kde-base/kdebase-data-4.4:4[aqua=] || ( >=kde-base/okular-4.4:4[aqua=,pdf?,postscript] app-text/acroread ) virtual/latex-base virtual/tex-base pdf? ( app-text/dvipdfmx app-text/ghostscript-gpl ) png? ( app-text/dvipng media-gfx/imagemagick[png] ) >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kile/kile-2.1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d2918a98e20e682fffe12f7b2993dc19
diff --git a/metadata/md5-cache/app-editors/kile-2.1.2-r1 b/metadata/md5-cache/app-editors/kile-2.1.2-r1
index 1775bc9a0db8..381cb7cf18a7 100644
--- a/metadata/md5-cache/app-editors/kile-2.1.2-r1
+++ b/metadata/md5-cache/app-editors/kile-2.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=x11-misc/shared-mime-info >=kde-base/kdebase-data-4.4:4[aqua=] || ( >=kde-base/okular-4.4:4[aqua=,pdf?,postscript] app-text/acroread ) virtual/latex-base virtual/tex-base pdf? ( app-text/dvipdfmx app-text/ghostscript-gpl ) png? ( app-text/dvipng media-gfx/imagemagick[png] ) >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kile/kile-2.1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bd56bd7744fca79a7cad31ab1d34f36c
diff --git a/metadata/md5-cache/app-editors/latexila-2.4.0 b/metadata/md5-cache/app-editors/latexila-2.4.0
index 6db2224e2775..9b0cae73b6b0 100644
--- a/metadata/md5-cache/app-editors/latexila-2.4.0
+++ b/metadata/md5-cache/app-editors/latexila-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/gtkspell:2 >=dev-libs/glib-2.30:2 dev-libs/libgee:0 dev-libs/libunique:1 >=x11-libs/gtk+-2.16:2 >=x11-libs/gtksourceview-2.10:2.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango gnome? ( gnome-base/gsettings-desktop-schemas ) vala? ( >=dev-lang/vala-0.16.0:0.16 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/2.4/latexila-2.4.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e757c5ddd0af31918ecfc26a4a6cffa7
diff --git a/metadata/md5-cache/app-editors/latexila-2.4.1 b/metadata/md5-cache/app-editors/latexila-2.4.1
index 301354020aab..ae3128271280 100644
--- a/metadata/md5-cache/app-editors/latexila-2.4.1
+++ b/metadata/md5-cache/app-editors/latexila-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/gtkspell:2 >=dev-libs/glib-2.30:2 dev-libs/libgee:0 dev-libs/libunique:1 >=x11-libs/gtk+-2.16:2 >=x11-libs/gtksourceview-2.10:2.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango gnome? ( gnome-base/gsettings-desktop-schemas ) vala? ( >=dev-lang/vala-0.16.0:0.16 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/2.4/latexila-2.4.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=50ff1f3b6ab8ce30c31371f2508f0a51
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-0.4.99 b/metadata/md5-cache/app-editors/leechcraft-popishu-0.4.99
index ce904d1af56e..b9bfec60ffac 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-0.4.99
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=feeab5c99c41d6043e9c958ef6fbf1e8
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.0 b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.0
index 8c0624256fab..edf8485549bd 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.0
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=979c22569b15c1e664e54bbe8c5dfc26
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.60 b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.60
index d0552bf1a071..8fae4fb6ea46 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.60
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fde2a06ccdd721f1dc150e6b5eb3c1d3
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.65 b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.65
index b4248afada0f..922e6d25f3b7 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.65
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ef6f647536bfdfda5bb1b09de1219b5
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.70 b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.70
index 9ba6a2dbe0d9..af79c7b2748b 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.70
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3129e29fa241fe5ce5333e8f1bc167f0
diff --git a/metadata/md5-cache/app-editors/leechcraft-popishu-9999 b/metadata/md5-cache/app-editors/leechcraft-popishu-9999
index 41f233f51dfd..10fd73039d91 100644
--- a/metadata/md5-cache/app-editors/leechcraft-popishu-9999
+++ b/metadata/md5-cache/app-editors/leechcraft-popishu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qscintilla
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27a751fae97fd680b409c67c89eca754
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r3 b/metadata/md5-cache/app-editors/nvi-1.81.6-r3
index 2097a9077561..0194413ba28a 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r3
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) app-admin/eselect-vi
 SLOT=0
 SRC_URI=http://www.kotnet.org/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36f2aa952641bfa2d18ea9a1385d0214
diff --git a/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420-r1 b/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420-r1
index d6a7b7246fcd..45aefc37ee83 100644
--- a/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420-r1
+++ b/metadata/md5-cache/app-editors/qemacs-0.4.0_pre20090420-r1
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/qemacs-0.4.0_pre20090420.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd4d46b4d32a786f54af7137c0f9bfed
diff --git a/metadata/md5-cache/app-editors/teco-1.00-r3 b/metadata/md5-cache/app-editors/teco-1.00-r3
index fdf179eb66e9..a453858f82ac 100644
--- a/metadata/md5-cache/app-editors/teco-1.00-r3
+++ b/metadata/md5-cache/app-editors/teco-1.00-r3
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz doc? ( mirror://gentoo/tecolore.txt.gz mirror://gentoo/tech.txt.gz mirror://gentoo/teco.doc.gz mirror://gentoo/tecoprog.doc.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b974e042d70e25283ef27d6b6d9178e0
diff --git a/metadata/md5-cache/app-editors/vile-9.8e b/metadata/md5-cache/app-editors/vile-9.8e
deleted file mode 100644
index 3a1caf4f3923..000000000000
--- a/metadata/md5-cache/app-editors/vile-9.8e
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) sys-devel/flex app-admin/eselect-vi
-DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
-EAPI=4
-HOMEPAGE=http://invisible-island.net/vile/
-IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8e.tgz
-_md5_=665a31524bae518fdc22e8bad6730576
diff --git a/metadata/md5-cache/app-editors/vile-9.8f b/metadata/md5-cache/app-editors/vile-9.8f
deleted file mode 100644
index 0bdb2ceb9b6c..000000000000
--- a/metadata/md5-cache/app-editors/vile-9.8f
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) sys-devel/flex app-admin/eselect-vi
-DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
-EAPI=4
-HOMEPAGE=http://invisible-island.net/vile/
-IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8f.tgz
-_md5_=f4b25ab50c357c6673734bc54ad5c600
diff --git a/metadata/md5-cache/app-editors/vile-9.8g b/metadata/md5-cache/app-editors/vile-9.8g
index 029bdf7440e9..768c0eecf9cc 100644
--- a/metadata/md5-cache/app-editors/vile-9.8g
+++ b/metadata/md5-cache/app-editors/vile-9.8g
@@ -4,9 +4,9 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=4
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8g.tgz
-_md5_=395acab35e5a31edbcc03990385f97ae
+_md5_=c4d63372bce39556cc8981ce4f10a916
diff --git a/metadata/md5-cache/app-editors/vim-7.3.266 b/metadata/md5-cache/app-editors/vim-7.3.266
index 722456ec0ee4..77c56e1d4c5b 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.266
+++ b/metadata/md5-cache/app-editors/vim-7.3.266
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.266 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=de62f056968408e8fb785b7b0c97e649
diff --git a/metadata/md5-cache/app-editors/vim-7.3.409 b/metadata/md5-cache/app-editors/vim-7.3.409
index 726ef4983b4d..1226053d5d2f 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.409
+++ b/metadata/md5-cache/app-editors/vim-7.3.409
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.409 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=973bcc3a7990f954bff68f82a5b32461
diff --git a/metadata/md5-cache/app-editors/vim-7.3.444 b/metadata/md5-cache/app-editors/vim-7.3.444
index 24917d5f1aae..9025501aaaa5 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.444
+++ b/metadata/md5-cache/app-editors/vim-7.3.444
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.444 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=851e37480b80e34bbb94d07fb3fe35f4
diff --git a/metadata/md5-cache/app-editors/vim-7.3.456 b/metadata/md5-cache/app-editors/vim-7.3.456
index 7df6fcec9393..154d123ca25d 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.456
+++ b/metadata/md5-cache/app-editors/vim-7.3.456
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.456 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=130f70c6fd25a4b421bb0de8b1def2c7
diff --git a/metadata/md5-cache/app-editors/vim-7.3.462 b/metadata/md5-cache/app-editors/vim-7.3.462
index e105d6b1e476..8ccfe4af4996 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.462
+++ b/metadata/md5-cache/app-editors/vim-7.3.462
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.462 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=ff9e64ff0d72b5cda2629f62a9a0012d
diff --git a/metadata/md5-cache/app-editors/vim-7.3.487 b/metadata/md5-cache/app-editors/vim-7.3.487
index 1592d4e6de55..7c1cb73e5932 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.487
+++ b/metadata/md5-cache/app-editors/vim-7.3.487
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.487 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=79800640a0ac220f66bc44994f1c06eb
diff --git a/metadata/md5-cache/app-editors/vim-7.3.498 b/metadata/md5-cache/app-editors/vim-7.3.498
index 6717ef80bf41..6cf535ea03f2 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.498
+++ b/metadata/md5-cache/app-editors/vim-7.3.498
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.498 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=abf370046d861f132a35d9c0e8afc0a3
diff --git a/metadata/md5-cache/app-editors/vim-7.3.502 b/metadata/md5-cache/app-editors/vim-7.3.502
index 8cb581780455..bef2a63056a6 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-7.3.502
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.502 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=2f51f8669d329e773bc95e714fbbf133
diff --git a/metadata/md5-cache/app-editors/vim-7.3.515 b/metadata/md5-cache/app-editors/vim-7.3.515
index 774d7a6abdde..34468b39ee77 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.515
+++ b/metadata/md5-cache/app-editors/vim-7.3.515
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.515 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=16ebb54fed16a1d5fcf53ddd0ac1ceac
diff --git a/metadata/md5-cache/app-editors/vim-7.3.537 b/metadata/md5-cache/app-editors/vim-7.3.537
index 0197fc54824f..390c14ce2057 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.537
+++ b/metadata/md5-cache/app-editors/vim-7.3.537
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.537 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=b894a78e8e48eafbde6163fc8fb9a0e3
diff --git a/metadata/md5-cache/app-editors/vim-7.3.556 b/metadata/md5-cache/app-editors/vim-7.3.556
index 0829183a08ee..f0f7db1339a5 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.556
+++ b/metadata/md5-cache/app-editors/vim-7.3.556
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.556 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=686b635f7964a5033a41dc62805e71ea
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.266 b/metadata/md5-cache/app-editors/vim-core-7.3.266
index 859fa5ac3877..e38ec2335c79 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.266
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.266
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.266.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=319e9326c21fb8e40822607b21e356ba
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.409 b/metadata/md5-cache/app-editors/vim-core-7.3.409
index 6245ecc8a37b..cd82019fe501 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.409
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.409
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.409.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=dcf96d6f244e9f634fa7e0ece7008d87
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.444 b/metadata/md5-cache/app-editors/vim-core-7.3.444
index 25652439e928..6737b11b37fa 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.444
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.444
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.444.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=0d46db4884f59dd273e98df4cfac14bd
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.456 b/metadata/md5-cache/app-editors/vim-core-7.3.456
index c5870bdd4d10..819d50007349 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.456
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.456
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.456.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=4cf6d922dffdc1b8953fb39dbcee6f28
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.462 b/metadata/md5-cache/app-editors/vim-core-7.3.462
index 02d9eed6eb56..b713dab9a025 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.462
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.462
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.462.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=b34fd0bd8fa8cf34e06f7bdb58df0384
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.487 b/metadata/md5-cache/app-editors/vim-core-7.3.487
index bee01081b778..807df3e3ae8e 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.487
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.487
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.487.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=641613c5438c26601c6c73bfcea910ee
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.498 b/metadata/md5-cache/app-editors/vim-core-7.3.498
index cd0dc1a1860c..5462908ffae7 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.498
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.498
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.498.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=8458f9598fc578659a30cdd991160a86
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.502 b/metadata/md5-cache/app-editors/vim-core-7.3.502
index fb95496d99b0..716dcd4c9156 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.502
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=e16c0d02c308be2eb4387c8da3827abe
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.515 b/metadata/md5-cache/app-editors/vim-core-7.3.515
index d6372bc31a48..909b1c21ac4e 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.515
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.515
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.515.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=23e3f8bb9bd50f6100bca2274905a426
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.537 b/metadata/md5-cache/app-editors/vim-core-7.3.537
index 17045176d9e5..6247f2e975a1 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.537
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.537
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.537.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=0ef6b7843062320c667780d2ed583a71
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.556 b/metadata/md5-cache/app-editors/vim-core-7.3.556
index d13be693c4c0..5b6fdb26a696 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.556
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.556
@@ -10,5 +10,5 @@ PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.556.patch.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	1995efaa9f4f696e1f97fb4bbfc976cb	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=af31745bfd5ac50ec6ff9c52d247b0f1
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.29-r2 b/metadata/md5-cache/app-editors/xemacs-21.5.29-r2
index 7ba4559ff248..4f99b32be7b1 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.29-r2
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.29-r2
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/openmotif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2 ) jpeg? ( virtual/jpeg ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.29.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2846602e28298446fc771f1c8eacf727
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.30 b/metadata/md5-cache/app-editors/xemacs-21.5.30
index 089dea15c56b..1c54bff9942a 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.30
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.30
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/openmotif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2 ) jpeg? ( virtual/jpeg ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.30.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df4db344ec503000f06422318d9a7f9b
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.31 b/metadata/md5-cache/app-editors/xemacs-21.5.31
index f016e28645ab..54c2ef99b474 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.31
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.31
@@ -10,5 +10,5 @@ PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/openmotif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2 ) jpeg? ( virtual/jpeg ) canna? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.31.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36ca218e7719146ad82ae3edf76d7d1c
diff --git a/metadata/md5-cache/app-editors/xvile-9.8e b/metadata/md5-cache/app-editors/xvile-9.8e
deleted file mode 100644
index aa9ee0a61fd2..000000000000
--- a/metadata/md5-cache/app-editors/xvile-9.8e
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8e >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
-DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
-EAPI=4
-HOMEPAGE=http://invisible-island.net/vile/
-IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8e >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
-SLOT=0
-SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8e.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dd736c212151fbffa977920c2cbb1a30
diff --git a/metadata/md5-cache/app-editors/xvile-9.8f b/metadata/md5-cache/app-editors/xvile-9.8f
deleted file mode 100644
index c553e4b185a7..000000000000
--- a/metadata/md5-cache/app-editors/xvile-9.8f
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8f >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
-DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
-EAPI=4
-HOMEPAGE=http://invisible-island.net/vile/
-IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8f >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
-SLOT=0
-SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8f.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=27032d90e3b7541fc28b3762634fd354
diff --git a/metadata/md5-cache/app-editors/xvile-9.8g b/metadata/md5-cache/app-editors/xvile-9.8g
index 6315f37f7c9b..575e29497496 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8g
+++ b/metadata/md5-cache/app-editors/xvile-9.8g
@@ -4,10 +4,10 @@ DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
 EAPI=4
 HOMEPAGE=http://invisible-island.net/vile/
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8g >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
 SLOT=0
 SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8g.tgz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5fc9cf3d939ab18ad02e4b46f1e2f545
+_md5_=34fda4e2b56b723e68c768af52e285da
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
index 541706f2a1f6..e17b7761c78f 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-22
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9db80168ea77b7f6029bec9adc729e4d
diff --git a/metadata/md5-cache/app-emulation/aqemu-0.8.2-r2 b/metadata/md5-cache/app-emulation/aqemu-0.8.2-r2
index 874fd16508b7..df910604a1ae 100644
--- a/metadata/md5-cache/app-emulation/aqemu-0.8.2-r2
+++ b/metadata/md5-cache/app-emulation/aqemu-0.8.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kvm? ( app-emulation/qemu-kvm ) !kvm? ( >=app-emulation/qemu-0.9.0 ) vnc? ( net-libs/libvncserver ) x11-libs/qt-gui:4 x11-libs/qt-test:4 x11-libs/qt-xmlpatterns:4
 SLOT=0
 SRC_URI=mirror://sourceforge/aqemu/aqemu-0.8.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8eef834b4c674a2f38a2c8369a8e0501
diff --git a/metadata/md5-cache/app-emulation/aranym-0.9.10 b/metadata/md5-cache/app-emulation/aranym-0.9.10
index cabfac44ffdb..e00729849c43 100644
--- a/metadata/md5-cache/app-emulation/aranym-0.9.10
+++ b/metadata/md5-cache/app-emulation/aranym-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl games-emulation/emutos opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/aranym/aranym-0.9.10.tar.gz mirror://sourceforge/aranym/afros812.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d7264469ecfeeacf7ace719ce12ca10
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.0.1 b/metadata/md5-cache/app-emulation/dosemu-1.4.0.1
index 33dbff336460..5a9743797820 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.0.1
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) >=sys-libs/slang-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz mirror://sourceforge/dosemu/dosemu-1.4.0.tgz http://dosemu.sourceforge.net/prereleases/patch-1.4.0.1.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f283223f28c8f983bb55ff92b215df2d
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20091009 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20091009
index 1d534dc8c7cb..96168accae8b 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20091009
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20091009
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) >=sys-libs/slang-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz mirror://gentoo/dosemu-1.4.1_pre20091009.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b92cc2fe498864aee1ac65092bd16f4
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.28-r3 b/metadata/md5-cache/app-emulation/e-uae-0.8.28-r3
index 178b65eaef18..61e5bd82a2d6 100644
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.28-r3
+++ b/metadata/md5-cache/app-emulation/e-uae-0.8.28-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) gtk? ( x11-libs/gtk+:2 ) capslib? ( games-emulation/caps ) sys-libs/zlib virtual/cdrtools
 SLOT=0
 SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.28/e-uae-0.8.28.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55e5d352755f84d4dc8325a632bf9b35
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r1 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r1
index 779c4ae4f9e8..f969dd322715 100644
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r1
+++ b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) gtk? ( x11-libs/gtk+:2 ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools
 SLOT=0
 SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b869705c2f62b4891f6034ed3ff35ce
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-glibc-errno-compat-2.5 b/metadata/md5-cache/app-emulation/emul-linux-x86-glibc-errno-compat-2.5
index 0822e0604d7d..d7234581ad9b 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-glibc-errno-compat-2.5
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-glibc-errno-compat-2.5
@@ -5,5 +5,5 @@ KEYWORDS=~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://gnu/glibc/glibc-2.5.tar.bz2 mirror://gnu/glibc/glibc-linuxthreads-2.5.tar.bz2 mirror://gentoo/glibc-2.5-patches-1.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=248fa5abbbdffb3adbbea9c5bca3df36
diff --git a/metadata/md5-cache/app-emulation/hercules-3.04 b/metadata/md5-cache/app-emulation/hercules-3.04
index cbe7a8c0fcb8..8bbbabe3321f 100644
--- a/metadata/md5-cache/app-emulation/hercules-3.04
+++ b/metadata/md5-cache/app-emulation/hercules-3.04
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=QPL-1.0
 SLOT=0
 SRC_URI=http://www.hercules-390.org/hercules-3.04.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8087d8e0af504bc5f89d4eb8277e46a0
diff --git a/metadata/md5-cache/app-emulation/hercules-3.05 b/metadata/md5-cache/app-emulation/hercules-3.05
index 4d09da583311..b2897e29d251 100644
--- a/metadata/md5-cache/app-emulation/hercules-3.05
+++ b/metadata/md5-cache/app-emulation/hercules-3.05
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=QPL-1.0
 SLOT=0
 SRC_URI=http://www.hercules-390.org/hercules-3.05.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3e451d0b3020203a942567752900c19
diff --git a/metadata/md5-cache/app-emulation/hercules-3.06 b/metadata/md5-cache/app-emulation/hercules-3.06
index 5fc982684845..4439a42491b2 100644
--- a/metadata/md5-cache/app-emulation/hercules-3.06
+++ b/metadata/md5-cache/app-emulation/hercules-3.06
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=QPL-1.0
 SLOT=0
 SRC_URI=http://www.hercules-390.org/hercules-3.06.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8292774c3c7fdd38c7a4fdc846320e63
diff --git a/metadata/md5-cache/app-emulation/hercules-3.07 b/metadata/md5-cache/app-emulation/hercules-3.07
index 6f3467bdae5b..5e6179c6a8e2 100644
--- a/metadata/md5-cache/app-emulation/hercules-3.07
+++ b/metadata/md5-cache/app-emulation/hercules-3.07
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=QPL-1.0
 SLOT=0
 SRC_URI=http://www.hercules-390.org/hercules-3.07.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=491160e25303d9bbe77f352b57b23f7f
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre11 b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre11
index 82c55d63a1a3..ad0484a37ca4 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre11
+++ b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre11
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b463fdb690479cefdb002a6f0310487
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre5 b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre5
index 9864c2db48b8..f5b4e25a4981 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre5
+++ b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre5
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a277a16a66407bbc0ec5272fcb9d058
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre7 b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre7
index b7a1fac07ba6..f3153a66c2b6 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre7
+++ b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre7
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25bb5658d9d23d9abd82f99bf954ea6d
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre9 b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre9
index 159b5d77bbcb..d6597e1dc0e0 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre9
+++ b/metadata/md5-cache/app-emulation/kqemu-1.3.0_pre9
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89e12f63d02a02b67c82777d53562bb2
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1 b/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1
index c3b2f825b115..0ee4196fb6cd 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1
+++ b/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://bellard.org/qemu/kqemu-1.4.0pre1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3030875ac27abfd90778ed1173e750b
diff --git a/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1-r1 b/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1-r1
index fe297e4b0d62..d16d3eff2d13 100644
--- a/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1-r1
+++ b/metadata/md5-cache/app-emulation/kqemu-1.4.0_pre1-r1
@@ -9,5 +9,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://bellard.org/qemu/kqemu-1.4.0pre1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac7652aa0e8f80be092dea01b6e0738e
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.8.16 b/metadata/md5-cache/app-emulation/libguestfs-1.8.16
index 269d4d8f7ec5..5a42d205d032 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.8.16
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.8.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Getopt-Long >=dev-perl/Sys-Virt-0.2.4 >=app-misc/hivex-1.2.1[perl] dev-perl/libintl-perl dev-perl/String-ShellQuote dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools perl? ( virtual/perl-ExtUtils-MakeMaker ) fuse? ( sys-fs/fuse ) readline? ( sys-libs/readline ) doc? ( dev-libs/libxml2 ) ocaml? ( dev-lang/ocaml dev-ml/findlib dev-ml/xml-light ) ruby? ( dev-lang/ruby dev-ruby/rake ) java? ( virtual/jre ) haskell? ( dev-lang/ghc ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) php? ( || ( =app-emulation/libguestfs-1.8.16[php_targets_php5-3] =app-emulation/libguestfs-1.8.16[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/1.8-stable/libguestfs-1.8.16.tar.gz http://rion-overlay.googlecode.com/files/libguestfs-1.7.18-x86_64.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4cd1ded5d65c4ea7e05fdfa98f17b127
diff --git a/metadata/md5-cache/app-emulation/lxc-0.8.0_rc1-r5 b/metadata/md5-cache/app-emulation/lxc-0.8.0_rc1-r5
index 2ed091459c4a..6c7870a422bb 100644
--- a/metadata/md5-cache/app-emulation/lxc-0.8.0_rc1-r5
+++ b/metadata/md5-cache/app-emulation/lxc-0.8.0_rc1-r5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/libcap !vanilla? ( sys-apps/util-linux app-misc/pax-utils >=sys-apps/openrc-0.9.9.1 )
 SLOT=0
 SRC_URI=http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc1.tar.gz http://dev.gentoo.org/~flameeyes/lxc/lxc-0.8.0-rc1-backports-1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c51ccc58a919ec7ca5df4606b7360d9
diff --git a/metadata/md5-cache/app-emulation/mol-0.9.72.1 b/metadata/md5-cache/app-emulation/mol-0.9.72.1
index 765a57c5ea55..2f1a228314f8 100644
--- a/metadata/md5-cache/app-emulation/mol-0.9.72.1
+++ b/metadata/md5-cache/app-emulation/mol-0.9.72.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/dhcp sys-libs/zlib net-firewall/iptables alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXext dga? ( x11-libs/libXxf86dga ) ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://gentoo/mol-0.9.72.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46ef2e8821448b530484edb847a3fb0a
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-2012.03.13.651368 b/metadata/md5-cache/app-emulation/open-vm-tools-2012.03.13.651368
index 4c92db716437..a0ebdf911a69 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-2012.03.13.651368
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2012.03.13.651368
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2012.03.13-651368.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27325c95987af940e6431789b68f1154
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-2012.05.21.724730 b/metadata/md5-cache/app-emulation/open-vm-tools-2012.05.21.724730
index 2d92c82a98ae..481822f9cb9b 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-2012.05.21.724730
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2012.05.21.724730
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2012.05.21-724730.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=182cc653c35daaed33574c945a6a91b2
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212 b/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212
index 3e342880f963..a4e6d6d7aa41 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-8.8.2-590212.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b05fef3c37f15638fdbee5fe347273a3
diff --git a/metadata/md5-cache/app-emulation/q4wine-0.121 b/metadata/md5-cache/app-emulation/q4wine-0.121
index d901cc865ddf..ec9a8f3522ce 100644
--- a/metadata/md5-cache/app-emulation/q4wine-0.121
+++ b/metadata/md5-cache/app-emulation/q4wine-0.121
@@ -9,5 +9,5 @@ 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-0.121.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=784d6b8e68751aeb0b01b3acdc251bac
diff --git a/metadata/md5-cache/app-emulation/q4wine-0.999_rc7 b/metadata/md5-cache/app-emulation/q4wine-0.999_rc7
index fa41f8c40a21..80c94d74fe58 100644
--- a/metadata/md5-cache/app-emulation/q4wine-0.999_rc7
+++ b/metadata/md5-cache/app-emulation/q4wine-0.999_rc7
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83fc02f4a6538d2436bb6c058004041d
diff --git a/metadata/md5-cache/app-emulation/qemu-0.11.1 b/metadata/md5-cache/app-emulation/qemu-0.11.1
index 51a632ba852e..cdf0e40287f5 100644
--- a/metadata/md5-cache/app-emulation/qemu-0.11.1
+++ b/metadata/md5-cache/app-emulation/qemu-0.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/qemu-user sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.13 ) pulseaudio? ( media-sound/pulseaudio ) gnutls? ( net-libs/gnutls ) ncurses? ( sys-libs/ncurses ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) vde? ( net-misc/vde ) kvm? ( >=sys-kernel/linux-headers-2.6.29 ) bluetooth? ( net-wireless/bluez ) kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/qemu/qemu-0.11.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75ddf5695e802286542bb2230f8c0e5c
diff --git a/metadata/md5-cache/app-emulation/qemu-0.11.1-r1 b/metadata/md5-cache/app-emulation/qemu-0.11.1-r1
index fe33e15041e9..67f745525b87 100644
--- a/metadata/md5-cache/app-emulation/qemu-0.11.1-r1
+++ b/metadata/md5-cache/app-emulation/qemu-0.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/qemu-user sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.13 ) pulseaudio? ( media-sound/pulseaudio ) gnutls? ( net-libs/gnutls ) ncurses? ( sys-libs/ncurses ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) vde? ( net-misc/vde ) kvm? ( >=sys-kernel/linux-headers-2.6.29 ) bluetooth? ( net-wireless/bluez ) kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/qemu/qemu-0.11.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f9ded578f41312817e9ebafd9536eed
diff --git a/metadata/md5-cache/app-emulation/qemu-1.0-r2 b/metadata/md5-cache/app-emulation/qemu-1.0-r2
index d64405a683a5..86d5fdef6258 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.0-r2
+++ b/metadata/md5-cache/app-emulation/qemu-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/qemu-kvm !app-emulation/qemu-user >=dev-libs/glib-2.0 sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9876cbec67cd024ba5869a117763341e
diff --git a/metadata/md5-cache/app-emulation/qemu-1.0-r3 b/metadata/md5-cache/app-emulation/qemu-1.0-r3
index 683829b31ada..70c30732c510 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/qemu-user[qemu_user_targets_i386?] !app-emulation/qemu-us
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.0.tar.gz http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.0-patches.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f5785cbd0856c2e17aafeb064b1a219
diff --git a/metadata/md5-cache/app-emulation/qemu-1.0.1 b/metadata/md5-cache/app-emulation/qemu-1.0.1
index 5fec8156da6e..4d9a241acf22 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.0.1
+++ b/metadata/md5-cache/app-emulation/qemu-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/qemu-kvm !app-emulation/qemu-user >=dev-libs/glib-2.0 sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.0.1.tar.gz http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.0-patches.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0ced6fc4fed89a78cd7e8af54886da6
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 8356d8847835..9eb62291e0f7 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/qemu-kvm !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) xfs? ( sys-fs/xfsprogs )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8f48aaaeb5d2970257d953c37a42211
diff --git a/metadata/md5-cache/app-emulation/qemu-kvm-0.15.1-r1 b/metadata/md5-cache/app-emulation/qemu-kvm-0.15.1-r1
index f596e4b95dfe..c43bf10b53cb 100644
--- a/metadata/md5-cache/app-emulation/qemu-kvm-0.15.1-r1
+++ b/metadata/md5-cache/app-emulation/qemu-kvm-0.15.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.15.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1ce0da557028c0743d4aaadef87bd1d
diff --git a/metadata/md5-cache/app-emulation/qemu-kvm-1.0-r3 b/metadata/md5-cache/app-emulation/qemu-kvm-1.0-r3
index 6fed7392e590..9d8aa815bd74 100644
--- a/metadata/md5-cache/app-emulation/qemu-kvm-1.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-kvm-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 media-libs/libpng sys-apps/pciutils >=sys-apps/util-linux-2.16.0 virtual/jpeg amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] ) !static? ( >=media-libs/libsdl-1.2.11[X] ) ) static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) smartcard? ( dev-libs/nss ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) tls? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36c73d0264a80563d9f6bedc2cf45fa3
diff --git a/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1 b/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1
index 3b52ea532fdd..6918636c3266 100644
--- a/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1
+++ b/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 media-libs/libpng sys-apps/pciutils >=sys-apps/util-linux-2.16.0 virtual/jpeg amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] ) !static? ( >=media-libs/libsdl-1.2.11[X] ) ) static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) smartcard? ( dev-libs/nss ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) tls? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff7b1f35085fc6419cf56b594051d660
diff --git a/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1-r1 b/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1-r1
index 4609c058b324..af9a2178bd1b 100644
--- a/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1-r1
+++ b/metadata/md5-cache/app-emulation/qemu-kvm-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 media-libs/libpng sys-apps/pciutils >=sys-apps/util-linux-2.16.0 virtual/jpeg amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] ) !static? ( >=media-libs/libsdl-1.2.11[X] ) ) static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) smartcard? ( dev-libs/nss ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) tls? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b972d3561e29ff1763673fe779abf72
diff --git a/metadata/md5-cache/app-emulation/qemu-kvm-9999 b/metadata/md5-cache/app-emulation/qemu-kvm-9999
index 231d0163d9a4..a59216c26597 100644
--- a/metadata/md5-cache/app-emulation/qemu-kvm-9999
+++ b/metadata/md5-cache/app-emulation/qemu-kvm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d021f9aac0aafaa2d0c48c6b3f59514
diff --git a/metadata/md5-cache/app-emulation/qemu-user-0.12.2 b/metadata/md5-cache/app-emulation/qemu-user-0.12.2
index 5cc12e86cc15..28e5a337539b 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-0.12.2
+++ b/metadata/md5-cache/app-emulation/qemu-user-0.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/qemu/qemu-0.12.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be1d10b86d571bffda7fbb540fa74b4e
diff --git a/metadata/md5-cache/app-emulation/qemu-user-0.9.0 b/metadata/md5-cache/app-emulation/qemu-user-0.9.0
index 15cb973bbe5c..745e171a79f5 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-0.9.0
+++ b/metadata/md5-cache/app-emulation/qemu-user-0.9.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=strip test
 SLOT=0
 SRC_URI=http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5934bc296df4b66861d170ea8bef3178
diff --git a/metadata/md5-cache/app-emulation/qemu-user-1.0 b/metadata/md5-cache/app-emulation/qemu-user-1.0
index f1cb82de8ab4..217172683307 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-1.0
+++ b/metadata/md5-cache/app-emulation/qemu-user-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.0.tar.gz http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.0-patches.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=755016f00510c403d79ae0d1a50ef41b
diff --git a/metadata/md5-cache/app-emulation/qemu-user-1.1.0 b/metadata/md5-cache/app-emulation/qemu-user-1.1.0
index a4d607bb37b8..26a15897d5fa 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-1.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-user-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.1.0-1.tar.bz2 http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-patches.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d914c950be5cad47e35786cec397ef6
diff --git a/metadata/md5-cache/app-emulation/qemu-user-1.1.0-r1 b/metadata/md5-cache/app-emulation/qemu-user-1.1.0-r1
index b2bf829b3120..22829c0ebecd 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-1.1.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-user-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.1.0-1.tar.bz2 http://dev.gentoo.org/~lu_zero/distfiles/qemu-1.1.0-r1-patches.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b9f5da24268f9e90a05c82502e834f3
diff --git a/metadata/md5-cache/app-emulation/qemu-user-9999 b/metadata/md5-cache/app-emulation/qemu-user-9999
index e4f698e584c1..05bf622b67ec 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-9999
+++ b/metadata/md5-cache/app-emulation/qemu-user-9999
@@ -7,5 +7,5 @@ IUSE=+qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha
 LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa719e10cf3c1917646396e9f016b964
diff --git a/metadata/md5-cache/app-emulation/qtemu-1.0.5 b/metadata/md5-cache/app-emulation/qtemu-1.0.5
index 6189b1c21c7a..577b40f95f4f 100644
--- a/metadata/md5-cache/app-emulation/qtemu-1.0.5
+++ b/metadata/md5-cache/app-emulation/qtemu-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1 CCPL-Attribution-3.0
 RDEPEND=x11-libs/qt-gui:4 || ( app-emulation/qemu app-emulation/qemu-kvm )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtemu/qtemu-1.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec509c1b7d1481787b9b05057220d0ce
diff --git a/metadata/md5-cache/app-emulation/simh-3.9.0 b/metadata/md5-cache/app-emulation/simh-3.9.0-r1
similarity index 93%
rename from metadata/md5-cache/app-emulation/simh-3.9.0
rename to metadata/md5-cache/app-emulation/simh-3.9.0-r1
index f1410a98f5c3..89be6617a0a0 100644
--- a/metadata/md5-cache/app-emulation/simh-3.9.0
+++ b/metadata/md5-cache/app-emulation/simh-3.9.0-r1
@@ -9,4 +9,4 @@ RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://simh.trailing-edge.com/sources/simhv39-0.zip
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a99415e9aa6bbf0766b8c0314d83dd89
+_md5_=231dae03cad18c7eb65ae1699e2ea196
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.12 b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
index 88981112afd9..8f3eaac1afb4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.12 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c43f604ee72bb752231c352763e0f0af
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.16 b/metadata/md5-cache/app-emulation/virtualbox-4.1.16
index eec5b8dc2335..1f77227fead2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.16
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.16 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.16/VirtualBox-4.1.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d90ad8254de1df7b79e8d8a9fc18619
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.18 b/metadata/md5-cache/app-emulation/virtualbox-4.1.18
index 610db247882e..d41a154f4e31 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.18
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.18 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.18/VirtualBox-4.1.18.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa04495045bcd8e647b4e944306030a5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-9999 b/metadata/md5-cache/app-emulation/virtualbox-9999
index bcf07dfea608..88d6e8bb936d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-9999
+++ b/metadata/md5-cache/app-emulation/virtualbox-9999
@@ -7,5 +7,5 @@ IUSE=alsa headless pulseaudio python +qt4 sdk kernel_linux
 LICENSE=GPL-2
 RDEPEND=!app-emulation/virtualbox-bin !app-emulation/virtualbox-additions !app-emulation/virtualbox-modules app-arch/makeself app-cdr/cdrtools dev-libs/libIDL >=dev-libs/libxslt-1.1.19 dev-libs/xalan-c dev-libs/xerces-c net-misc/curl sys-libs/libcap !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-opengl:4 ) x11-libs/libXcursor x11-libs/libXinerama media-libs/libsdl[X] x11-libs/libXt media-libs/mesa ) sys-apps/usermode-utilities net-misc/bridge-utils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	qt4-r2	2111bb601bba6402257079dab64c7310	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	qt4-r2	2111bb601bba6402257079dab64c7310	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c84db689693cf715c27941fc6a8b2667
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-238.6 b/metadata/md5-cache/app-emulation/vmware-modules-238.6
index 58f4e95d57cd..e1477d786013 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-238.6
+++ b/metadata/md5-cache/app-emulation/vmware-modules-238.6
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f01db6ceec88c89cb5d3fb2362d3621
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-264.4 b/metadata/md5-cache/app-emulation/vmware-modules-264.4
index c6e5878ade83..beea975dff7c 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-264.4
+++ b/metadata/md5-cache/app-emulation/vmware-modules-264.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7516ab7c273791b84aa09a3cda8da0e6
diff --git a/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1 b/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1
index 3fcba5cf6d9c..e01d6942e4ed 100644
--- a/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanva
 RESTRICT=binchecks mirror strip
 SLOT=0
 SRC_URI=x86? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/8.0.4/744019/linux/core/VMware-Workstation-8.0.4-744019.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/8.0.4/744019/linux/core/VMware-Workstation-8.0.4-744019.x86_64.bundle.tar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
 _md5_=4c598c46f32ebc36f4677044c2777e64
diff --git a/metadata/md5-cache/app-emulation/vov-2.0.0 b/metadata/md5-cache/app-emulation/vov-2.0.0
index edd2ab3e642f..103be124ddb9 100644
--- a/metadata/md5-cache/app-emulation/vov-2.0.0
+++ b/metadata/md5-cache/app-emulation/vov-2.0.0
@@ -7,5 +7,5 @@ KEYWORDS=x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.gna.org/vov/vov-2.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe70ac159720ebbe1d9098d14c916d31
diff --git a/metadata/md5-cache/app-emulation/wine-1.2 b/metadata/md5-cache/app-emulation/wine-1.2
index 752df47bf99e..891cc6b21cf6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.2
+++ b/metadata/md5-cache/app-emulation/wine-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.2.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03a852a5c04f39ad43f9b3111fb3529b
diff --git a/metadata/md5-cache/app-emulation/wine-1.2.1 b/metadata/md5-cache/app-emulation/wine-1.2.1
index d83c3759b745..06db47c604df 100644
--- a/metadata/md5-cache/app-emulation/wine-1.2.1
+++ b/metadata/md5-cache/app-emulation/wine-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.2.1.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5739d7c145c5c45158e581cda7c8d3d
diff --git a/metadata/md5-cache/app-emulation/wine-1.2.2 b/metadata/md5-cache/app-emulation/wine-1.2.2
index abdbe6318d5d..4ade1195a159 100644
--- a/metadata/md5-cache/app-emulation/wine-1.2.2
+++ b/metadata/md5-cache/app-emulation/wine-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.2.2.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=428a566102adfecd1a0f6c302cc59827
diff --git a/metadata/md5-cache/app-emulation/wine-1.2.3 b/metadata/md5-cache/app-emulation/wine-1.2.3
index 6d9f5f3e4c7f..0a21d29a8bf0 100644
--- a/metadata/md5-cache/app-emulation/wine-1.2.3
+++ b/metadata/md5-cache/app-emulation/wine-1.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.2.3.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=507ab297d547362c0534e8281f33fe27
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.0 b/metadata/md5-cache/app-emulation/wine-1.3.0
index b4ce6a36165b..e70d41524f81 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.0
+++ b/metadata/md5-cache/app-emulation/wine-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.0.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9cf418814799bd4e83dd4c8859d6672
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.1 b/metadata/md5-cache/app-emulation/wine-1.3.1
index 39fa721d88f2..5f62c5fe2ed6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.1
+++ b/metadata/md5-cache/app-emulation/wine-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.1.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.0.0-x86/wine_gecko-1.0.0-x86.cab )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ade10da131474e84665c5fcc5ee48228
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.10 b/metadata/md5-cache/app-emulation/wine-1.3.10
index ad391e1d2c3b..33d4b06d92a9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.10
+++ b/metadata/md5-cache/app-emulation/wine-1.3.10
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.10.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9075cdce28947975b2fdc980db3ccbf0
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.11 b/metadata/md5-cache/app-emulation/wine-1.3.11
index 9b44091d501b..eee8e19baeeb 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.11
+++ b/metadata/md5-cache/app-emulation/wine-1.3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.11.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c6b19cd87d1680e3508e1fd9ef30397
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.12 b/metadata/md5-cache/app-emulation/wine-1.3.12
index 7bb2de3ef449..3c7da5b661c7 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.12
+++ b/metadata/md5-cache/app-emulation/wine-1.3.12
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.12.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63b2efff5dcdb7df988d59b340ecc4d5
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.13 b/metadata/md5-cache/app-emulation/wine-1.3.13
index 27136da7cd4b..aa85d35a86b1 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.13
+++ b/metadata/md5-cache/app-emulation/wine-1.3.13
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.13.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26f4e405692e59d94f879fb789e93927
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.14 b/metadata/md5-cache/app-emulation/wine-1.3.14
index af8e66e84115..6dc7ea38a859 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.14
+++ b/metadata/md5-cache/app-emulation/wine-1.3.14
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.14.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0eb02f135e5f658f3d9f11579fc9e74c
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.15 b/metadata/md5-cache/app-emulation/wine-1.3.15
index 332fb7d95a22..0c717850c9cc 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.15
+++ b/metadata/md5-cache/app-emulation/wine-1.3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.15.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=140977c2b9870ac6c0a4d3345579490d
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.16 b/metadata/md5-cache/app-emulation/wine-1.3.16
index a6dc4a347187..67b8395fe215 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.16
+++ b/metadata/md5-cache/app-emulation/wine-1.3.16
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.16.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c858de0bc2e63f06e62f2a72918294b2
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.17 b/metadata/md5-cache/app-emulation/wine-1.3.17
index 6108a08f1896..d329a59245f9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.17
+++ b/metadata/md5-cache/app-emulation/wine-1.3.17
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.17.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4727c4c279ddeeb58c0d487dff7bcf9b
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.18 b/metadata/md5-cache/app-emulation/wine-1.3.18
index 2138369dafd6..e3904dcac96c 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.18
+++ b/metadata/md5-cache/app-emulation/wine-1.3.18
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.18.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a7306ca1561f0202d954f8ed775e7d8
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.19 b/metadata/md5-cache/app-emulation/wine-1.3.19
index b7269e7dc3eb..fa969b89b826 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.19
+++ b/metadata/md5-cache/app-emulation/wine-1.3.19
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.19.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1f5209bfb30783899cd29ec69285a96
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.2 b/metadata/md5-cache/app-emulation/wine-1.3.2
index 7dc546aba651..e25a8dac6587 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.2
+++ b/metadata/md5-cache/app-emulation/wine-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.2.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd018ebfeacdf76cd904da2baf0c2974
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.20 b/metadata/md5-cache/app-emulation/wine-1.3.20
index 1d05a46b4b3e..a2a2c50019ef 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.20
+++ b/metadata/md5-cache/app-emulation/wine-1.3.20
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.20.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d124974516635b0a3e2feec3d36efd30
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.21 b/metadata/md5-cache/app-emulation/wine-1.3.21
index 5f720228a0b0..325bdae8d307 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.21
+++ b/metadata/md5-cache/app-emulation/wine-1.3.21
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.21.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c637325de7c7504489567eb7ee69c8e
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.22 b/metadata/md5-cache/app-emulation/wine-1.3.22
index f2130f9daac8..fc7f870003d5 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.22
+++ b/metadata/md5-cache/app-emulation/wine-1.3.22
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.22.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22871303b729fb42a425d9a6ec87eac9
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.23 b/metadata/md5-cache/app-emulation/wine-1.3.23
index 7be81e3b3975..0537182ef918 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.23
+++ b/metadata/md5-cache/app-emulation/wine-1.3.23
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.23.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce96e95bb84b1c87550344dc01422811
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.24 b/metadata/md5-cache/app-emulation/wine-1.3.24
index b8db9bfc0930..b480de6e600d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.24
+++ b/metadata/md5-cache/app-emulation/wine-1.3.24
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.24.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1d5bf5794bb92783d82500e282c320c
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.25 b/metadata/md5-cache/app-emulation/wine-1.3.25
index 22be3d94704e..4fddc3c56ab6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.25
+++ b/metadata/md5-cache/app-emulation/wine-1.3.25
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.25.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2750dff8c0f635897b4e39f4534da59a
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.26 b/metadata/md5-cache/app-emulation/wine-1.3.26
index c8c700439db1..05d935026795 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.26
+++ b/metadata/md5-cache/app-emulation/wine-1.3.26
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.26.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.2.0/wine_gecko-1.2.0-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32ac74d12a63f3cc22215877a8eeee5c
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.27 b/metadata/md5-cache/app-emulation/wine-1.3.27
index ea2e0ed48ff7..64c966a1c555 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.27
+++ b/metadata/md5-cache/app-emulation/wine-1.3.27
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.27.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a05e5a097468ac2141ec6ed04d94ae6
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.28 b/metadata/md5-cache/app-emulation/wine-1.3.28
index 61723543a4cc..7fa3cf7b997b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.28
+++ b/metadata/md5-cache/app-emulation/wine-1.3.28
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.28.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cce838a3dcf85d8d83a1893a2d1befe
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.29 b/metadata/md5-cache/app-emulation/wine-1.3.29
index 30c96ea06789..352fc4df3beb 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.29
+++ b/metadata/md5-cache/app-emulation/wine-1.3.29
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.29.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06064473ef7d444ce0814a10a7ef8a6a
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.3 b/metadata/md5-cache/app-emulation/wine-1.3.3
index 24a46e1dc9f1..68937f213f7b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.3
+++ b/metadata/md5-cache/app-emulation/wine-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.3.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fc07099afda7afffe4e805edc22a544
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.30 b/metadata/md5-cache/app-emulation/wine-1.3.30
index 72e0c8e097b4..37f30b238e25 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.30
+++ b/metadata/md5-cache/app-emulation/wine-1.3.30
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.30.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97a547119384bfc0e83154c94ce9b811
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.31 b/metadata/md5-cache/app-emulation/wine-1.3.31
index 18aa3d711318..d4035fc1b82b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.31
+++ b/metadata/md5-cache/app-emulation/wine-1.3.31
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.31.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=505c607b2878de9f7730735741fe51c8
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.32 b/metadata/md5-cache/app-emulation/wine-1.3.32
index 0e00b00aa8ad..03f25c02e134 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.32
+++ b/metadata/md5-cache/app-emulation/wine-1.3.32
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.32.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.3/wine_gecko-1.3-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=125fefc44177b3c22620bd4f09a56a48
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.33 b/metadata/md5-cache/app-emulation/wine-1.3.33
index 28f357df12c1..37d23bd2de53 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.33
+++ b/metadata/md5-cache/app-emulation/wine-1.3.33
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.33.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f24a6263c21c483e790327eb63d79bf3
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.34 b/metadata/md5-cache/app-emulation/wine-1.3.34
index dc7958fe0a4e..9d4f2c3a7da7 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.34
+++ b/metadata/md5-cache/app-emulation/wine-1.3.34
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.34.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2a3545db63b251df83278d2009ef4d8
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.35 b/metadata/md5-cache/app-emulation/wine-1.3.35
index 87a48a303fa5..32aecc48c94e 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.35
+++ b/metadata/md5-cache/app-emulation/wine-1.3.35
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.35.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=607ae0e61ee0db871daead118a43bc5a
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.36 b/metadata/md5-cache/app-emulation/wine-1.3.36
index 29d1492592bd..c4b414a7a19c 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.36
+++ b/metadata/md5-cache/app-emulation/wine-1.3.36
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.36.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc122992dbaa1f74b679b2c774c1e4fb
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.37 b/metadata/md5-cache/app-emulation/wine-1.3.37
index f441727b815e..e4e5267baae6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.37
+++ b/metadata/md5-cache/app-emulation/wine-1.3.37
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.37.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebbcc177f9a6140bc3f6fbded7508177
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.4 b/metadata/md5-cache/app-emulation/wine-1.3.4
index eab9ab3c3c85..f09e19a3983a 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.4
+++ b/metadata/md5-cache/app-emulation/wine-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.4.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b95b875fb0d219a4d79545db8444b5d
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.5 b/metadata/md5-cache/app-emulation/wine-1.3.5
index e083664f317a..5bc95476d021 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.5
+++ b/metadata/md5-cache/app-emulation/wine-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.5.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a64bd75fbe5c4e1ad7c354d18c5abd41
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.6 b/metadata/md5-cache/app-emulation/wine-1.3.6
index 1d981912a844..07dda4789155 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.6
+++ b/metadata/md5-cache/app-emulation/wine-1.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.6.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e727e4ff55a1988c658a2d5595e1e2a
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.7 b/metadata/md5-cache/app-emulation/wine-1.3.7
index 1867f84a796e..194a76871ecd 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.7
+++ b/metadata/md5-cache/app-emulation/wine-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.7.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b97625553711ac043ea6c656ac476ce
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.8 b/metadata/md5-cache/app-emulation/wine-1.3.8
index 437e7c1c9514..7636d61b578f 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.8
+++ b/metadata/md5-cache/app-emulation/wine-1.3.8
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.8.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b207a78b45b20e97621f354ae7ce8df
diff --git a/metadata/md5-cache/app-emulation/wine-1.3.9 b/metadata/md5-cache/app-emulation/wine-1.3.9
index 4540d37a9beb..5a6092ed9a9d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.3.9
+++ b/metadata/md5-cache/app-emulation/wine-1.3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.3.9.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.1.0/wine_gecko-1.1.0-x86_64.cab ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88ebae6c53580df946f7f138719c711c
diff --git a/metadata/md5-cache/app-emulation/wine-1.4 b/metadata/md5-cache/app-emulation/wine-1.4
index 79b9be1b9fc0..bea7d8b45627 100644
--- a/metadata/md5-cache/app-emulation/wine-1.4
+++ b/metadata/md5-cache/app-emulation/wine-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.4.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.4/wine_gecko-1.4-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=186942cf2a9976ee11e66f47a8750a01
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.0 b/metadata/md5-cache/app-emulation/wine-1.5.0
index 3b6c379926f4..08dfd32d9af5 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.0
+++ b/metadata/md5-cache/app-emulation/wine-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.0.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cada76a538e7eeab94be94a02a214cf
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.1 b/metadata/md5-cache/app-emulation/wine-1.5.1
index 1030e46ebb48..b08f704bff93 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.1
+++ b/metadata/md5-cache/app-emulation/wine-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.1.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b51629c2bd115f7201c508e855ff4e6
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.2 b/metadata/md5-cache/app-emulation/wine-1.5.2
index a29dd551f28e..e6b719d95f76 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.2
+++ b/metadata/md5-cache/app-emulation/wine-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.2.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66078e57978a5c933bf63212ae887dbc
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.3 b/metadata/md5-cache/app-emulation/wine-1.5.3
index 376d812b69ce..59107f66ebf5 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.3
+++ b/metadata/md5-cache/app-emulation/wine-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.3.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6f76f3c42268c33fa8dcf12790c1503
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.4 b/metadata/md5-cache/app-emulation/wine-1.5.4
index 7cd2b8a04d9e..d262ab98d564 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.4
+++ b/metadata/md5-cache/app-emulation/wine-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.4.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c04205e426d4968d5bdf9ba2b416103
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.5 b/metadata/md5-cache/app-emulation/wine-1.5.5
index 5b6857c0c810..fa3748b8c5f8 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.5
+++ b/metadata/md5-cache/app-emulation/wine-1.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.5.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b782f45484514c4ea419dca85b5bbf5
diff --git a/metadata/md5-cache/app-emulation/wine-1.5.6 b/metadata/md5-cache/app-emulation/wine-1.5.6
index bcfb7e16d84e..d017cf228a29 100644
--- a/metadata/md5-cache/app-emulation/wine-1.5.6
+++ b/metadata/md5-cache/app-emulation/wine-1.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.5.6.tar.bz2 gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=559406ba7ddd76b59c1747906862b0f2
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index 18d63ad50a0b..601a56f0baae 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=elibc_glibc? ( threads ) mono? ( || ( win32 !win64 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=gecko? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/Wine%20Gecko/1.5/wine_gecko-1.5-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.4/wine-mono-0.0.4.msi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=868d58eaa39f91ac435c2e34eeefe9b5
diff --git a/metadata/md5-cache/app-emulation/xen-4.1.1-r2 b/metadata/md5-cache/app-emulation/xen-4.1.1-r2
index 0f4ccc2be662..4e6039f008bf 100644
--- a/metadata/md5-cache/app-emulation/xen-4.1.1-r2
+++ b/metadata/md5-cache/app-emulation/xen-4.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=flask? ( xsm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.1/xen-4.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b50737421ce15f2d6bfbafea6ee8b0ed
diff --git a/metadata/md5-cache/app-emulation/xen-4.1.2 b/metadata/md5-cache/app-emulation/xen-4.1.2
index 5ee2265534b9..0945e06ffc7f 100644
--- a/metadata/md5-cache/app-emulation/xen-4.1.2
+++ b/metadata/md5-cache/app-emulation/xen-4.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=flask? ( xsm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.2/xen-4.1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=569059ccb62a5a72ff6810893001ae35
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.1-r1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.1-r1
index e742458de803..ccca13b09851 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.1-r1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emulation/xen-4.1.1
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.1/xen-4.1.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://caml.inria.fr/pub/distrib/ocaml-3.11
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=103a1414d329fdd6e06975c15d38d1da
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.2
index 4174f486d710..d1b619b98536 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.2
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emulation/xen-4.1.2
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.2/xen-4.1.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://caml.inria.fr/pub/distrib/ocaml-3.11
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58b4be227274a1f254f65f867be81eaa
diff --git a/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r3 b/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r3
index bf9e6efa6348..bdc9bd07bed9 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r3
+++ b/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python[ncurses,threads] sys-libs/zlib hvm? ( media-libs/libsdl ) acm? ( dev-libs/libxml2 ) api? ( dev-libs/libxml2 net-misc/curl ) sys-apps/iproute2 net-misc/bridge-utils dev-python/pyxml screen? ( app-misc/screen app-admin/logrotate ) || ( sys-fs/udev sys-apps/hotplug )
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/3.4.2/xen-3.4.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17e12adf872e0e9af81987c7e73e6180
diff --git a/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r5 b/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r5
index 657d5c20c4a8..3817e7199e16 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r5
+++ b/metadata/md5-cache/app-emulation/xen-tools-3.4.2-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python[ncurses,threads] sys-libs/zlib hvm? ( media-libs/libsdl ) acm? ( dev-libs/libxml2 ) api? ( dev-libs/libxml2 net-misc/curl ) sys-apps/iproute2 net-misc/bridge-utils dev-python/pyxml screen? ( app-misc/screen app-admin/logrotate ) || ( sys-fs/udev sys-apps/hotplug )
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/3.4.2/xen-3.4.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7ce3c499c9f3162d5cf54a2c12b17cb
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r5 b/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r5
index d8afd6e0891d..1031862a8e00 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r5
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python dev-python/lxml sys-libs/zlib hvm? ( media-libs/libsdl sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) sys-apps/iproute2 net-misc/bridge-utils dev-python/pyxml >=dev-lang/ocaml-3.12.0 screen? ( app-misc/screen app-admin/logrotate ) || ( sys-fs/udev sys-apps/hotplug )
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.1/xen-4.1.1.tar.gz http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9b178f9e21aead25094d56eb7a05689
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r6 b/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r6
index 77530720d456..4f69f954c2a0 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r6
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.1.1-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python dev-python/lxml sys-libs/zlib hvm? ( media-libs/libsdl sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) sys-apps/iproute2 net-misc/bridge-utils dev-python/pyxml >=dev-lang/ocaml-3.12.0 screen? ( app-misc/screen app-admin/logrotate ) || ( sys-fs/udev sys-apps/hotplug )
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.1/xen-4.1.1.tar.gz http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68e5da12a7fe3a10c99166fc22627bb6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.1.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.1.2-r2
index 26c6f259d731..5964a0202a31 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.1.2-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.1.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=hvm? ( qemu )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.1.2/xen-4.1.2.tar.gz http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=486586f60b29171c63304996d45f3558
diff --git a/metadata/md5-cache/app-emulation/xtrs-4.9d b/metadata/md5-cache/app-emulation/xtrs-4.9d
index 5c4989cf6023..01276dd7c495 100644
--- a/metadata/md5-cache/app-emulation/xtrs-4.9d
+++ b/metadata/md5-cache/app-emulation/xtrs-4.9d
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=sys-libs/ncurses sys-libs/readline >=x11-libs/libX11-1.0.0
 SLOT=0
 SRC_URI=http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz http://www.tim-mann.org/trs80/ld4-631.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ce8c1a362e4f93f5643fd17c30e72dd
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.1 b/metadata/md5-cache/app-i18n/fcitx-4.2.1
index 20d5c25df92d..81d437ae5cdc 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.1
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrender media-libs/fontconfig pango? ( x11-libs/pango ) opencc? ( app-i18n/opencc ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) cairo? ( x11-libs/cairo[X] ) dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-4.2.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2ed821c6b7a43abb928ffefe972fe0f
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.4 b/metadata/md5-cache/app-i18n/fcitx-4.2.4
index a996f22213fa..495dd01273ce 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.4
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=cairo? ( x11-libs/cairo[X] pango? ( x11-libs/pango[X] ) !pango? ( media-libs/fontconfig ) ) gtk? ( x11-libs/gtk+:2 dev-libs/glib:2 dev-libs/dbus-glib ) gtk3? ( x11-libs/gtk+:3 dev-libs/glib:2 dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua ) opencc? ( app-i18n/opencc ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 ) sys-apps/dbus x11-libs/libX11
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-4.2.4.tar.xz http://fcitx.googlecode.com/files/pinyin.tar.gz table? ( http://fcitx.googlecode.com/files/table.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b57a372c396628b613c55edff5fb3ba7
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.2.2 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.2.2
index c39f13249218..5057056ab931 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.2.2
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.2.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-cloudpinyin-0.2.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d5e7639681d3d7272f499534e34cd3c
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.2.0 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.2.0
index 321358488be0..8d83337fd4ed 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.2.0
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-configtool-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bab9eb1011cd7c4ea9fd3b6bc1cc647a
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.1 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.1
index 0271c8af1ae5..69d7e0a1068e 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.1
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-configtool-0.4.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db3d83beb3ad71eb5dccd2bb8fa042b2
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.4 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.4
index 6169ef68b4b5..581d45438b9f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.4
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-configtool-0.4.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=557b5e9152d0f3ec606752ad1466becc
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.0 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.0
index 9cf8606e27a6..ed20d471f986 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.0
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/sunpinyin-2.0.2 =app-i18n/fcitx-4.0.0
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-sunpinyin-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60b67033a23928e25d92ed5d2871f174
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.1 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.1
index fb1f693947a3..a7cd7ceb04ea 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.1
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/sunpinyin-2.0.2 =app-i18n/fcitx-4.0.1
 SLOT=0
 SRC_URI=http://fcitx.googlecode.com/files/fcitx-sunpinyin-0.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e56a4e11f00d462c575bbf9954d55edd
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10 b/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10
index d2f9042c15be..9c3b111ecfea 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst >=app-i18n/ibus-1.1 >=dev-libs/libchewing-0.3.2 x11-libs/gtk+:2 dev-util/gob:2
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-chewing-1.3.10-Source.tar.gz https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c46d6b53cf3065375b5cb37049ee65e7
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10-r1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10-r1
index a276ae658afc..5001affbac54 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10-r1
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.3.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst >=app-i18n/ibus-1.1 >=dev-libs/libchewing-0.3.2 x11-libs/gtk+:2 dev-util/gob:2
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-chewing-1.3.10-Source.tar.gz https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bec4dc66d3cb625ad20b248febffaaf2
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091216 b/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091216
index 57e78b5565fb..b3179f965075 100644
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091216
+++ b/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091216
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.2 >=sys-apps/dbus-1.2 x11-libs/libX11 >=x11-libs/qt-core-4.5:4 >=x11-libs/qt-dbus-4.5:4
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-qt-1.2.0.20091216-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28c139035fe69d402d15b598ff43a7ab
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091217 b/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091217
index 3ffb8d24d649..83a1c9908297 100644
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091217
+++ b/metadata/md5-cache/app-i18n/ibus-qt-1.2.0.20091217
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.2 >=sys-apps/dbus-1.2 x11-libs/libX11 >=x11-libs/qt-core-4.5:4 >=x11-libs/qt-dbus-4.5:4
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-qt-1.2.0.20091217-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49c1778a56fe2db5bf80f6e2f3459e05
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.3.0 b/metadata/md5-cache/app-i18n/ibus-qt-1.3.0
index 32a045f52671..3ee8389f435b 100644
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.3.0
+++ b/metadata/md5-cache/app-i18n/ibus-qt-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.2 >=sys-apps/dbus-1.2 x11-libs/libX11 >=x11-libs/qt-core-4.5:4 >=x11-libs/qt-dbus-4.5:4
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-qt-1.3.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2750b621a31866baedb8ec00ee6d2a1
diff --git a/metadata/md5-cache/app-i18n/ibus-qt-1.3.1 b/metadata/md5-cache/app-i18n/ibus-qt-1.3.1
index eda9aaae9b29..b0a8c54c22c0 100644
--- a/metadata/md5-cache/app-i18n/ibus-qt-1.3.1
+++ b/metadata/md5-cache/app-i18n/ibus-qt-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-1.3.7 >=sys-apps/dbus-1.2 x11-libs/libX11 >=x11-libs/qt-core-4.5:4 >=x11-libs/qt-dbus-4.5:4
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-qt-1.3.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36da387fcb7bffad15f85ad4180528d0
diff --git a/metadata/md5-cache/app-i18n/ibus-table-array30-1.2.0.20090729 b/metadata/md5-cache/app-i18n/ibus-table-array30-1.2.0.20090729
index f3555a567c6f..d60fa44ebb78 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-array30-1.2.0.20090729
+++ b/metadata/md5-cache/app-i18n/ibus-table-array30-1.2.0.20090729
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/ibus-table-1.1
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-table-array30-1.2.0.20090729-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ea00a848bf74fbbfbdd84627131fc4f
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.3.5 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.3.5
index 2ec314cb6861..cf134a3ead18 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.3.5
+++ b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-i18n/ibus-table-1.2.0
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-table-chinese-1.3.5-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1d751d6eaa009551c505b9adf1d9529
diff --git a/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4 b/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
index 67304882d8a9..9e79f66fba87 100644
--- a/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
+++ b/metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-fonts/unifont media-fonts/font-misc-misc media-fonts/intlfonts
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/jfbterm/13501/jfbterm-0.4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=433dbd7ee8475e88469ae379a2502c44
diff --git a/metadata/md5-cache/app-i18n/opencc-0.2.0 b/metadata/md5-cache/app-i18n/opencc-0.2.0
index bd27e4c5ee55..397833267da1 100644
--- a/metadata/md5-cache/app-i18n/opencc-0.2.0
+++ b/metadata/md5-cache/app-i18n/opencc-0.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://open-chinese-convert.googlecode.com/files/opencc-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95abfee4e058e686c3e407dcb690c35d
diff --git a/metadata/md5-cache/app-i18n/poedit-1.4.6.1 b/metadata/md5-cache/app-i18n/poedit-1.4.6.1
index a5929bff71aa..5f11af31dd8c 100644
--- a/metadata/md5-cache/app-i18n/poedit-1.4.6.1
+++ b/metadata/md5-cache/app-i18n/poedit-1.4.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/wxGTK:2.8[X] >=sys-libs/db-3.1 spell? ( >=app-text/gtkspell-2.0.0:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/poedit/poedit-1.4.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=f2cf61b0c1032bb76dc71f54be259791
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.11 b/metadata/md5-cache/app-i18n/scim-1.4.11
index 3af95087766d..ee2bac4b36e6 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.11
+++ b/metadata/md5-cache/app-i18n/scim-1.4.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72bf8d095b916be7ff5c2d77ba4a7372
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.11-r1 b/metadata/md5-cache/app-i18n/scim-1.4.11-r1
index 5c330430b2c1..cd7fbdd043a6 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.11-r1
+++ b/metadata/md5-cache/app-i18n/scim-1.4.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65df6ba334c1cad686fb30b77881daf6
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.9-r1 b/metadata/md5-cache/app-i18n/scim-1.4.9-r1
index 6a3ecdb76e87..1ae818a14f7a 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.9-r1
+++ b/metadata/md5-cache/app-i18n/scim-1.4.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8d893f8c7ef22a2b5ee560932d4736d
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.9-r2 b/metadata/md5-cache/app-i18n/scim-1.4.9-r2
index bfade9513def..197abb7270f7 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.9-r2
+++ b/metadata/md5-cache/app-i18n/scim-1.4.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f89f3c1d97abc4065a0d606dacbc1c6e
diff --git a/metadata/md5-cache/app-i18n/uim-1.4.2 b/metadata/md5-cache/app-i18n/uim-1.4.2
index 05ac18a2e55b..532a5eb92ec5 100644
--- a/metadata/md5-cache/app-i18n/uim-1.4.2
+++ b/metadata/md5-cache/app-i18n/uim-1.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 LGPL-2.1
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) ) canna? ( app-i18n/canna ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) libedit? ( dev-libs/libedit ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( media-fonts/font-isas-misc ) linguas_ja? ( media-fonts/font-jis-misc ) linguas_ko? ( media-fonts/font-daewoo-misc ) )
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.4.2.tar.bz2
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97a9ad91405cc4f52afec4d63748dab3
diff --git a/metadata/md5-cache/app-i18n/uim-1.5.7 b/metadata/md5-cache/app-i18n/uim-1.5.7
index 41dfdda374ab..87df46188e6c 100644
--- a/metadata/md5-cache/app-i18n/uim-1.5.7
+++ b/metadata/md5-cache/app-i18n/uim-1.5.7
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 LGPL-2.1
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4.5 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.5.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4ee05f494a53f240d4710df17b99a36
diff --git a/metadata/md5-cache/app-i18n/uim-1.6.1 b/metadata/md5-cache/app-i18n/uim-1.6.1
index 9e18a8559aed..d521f5cbde0b 100644
--- a/metadata/md5-cache/app-i18n/uim-1.6.1
+++ b/metadata/md5-cache/app-i18n/uim-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=018e2edb206eea1cccd807df28b23254
diff --git a/metadata/md5-cache/app-i18n/uim-1.7.1 b/metadata/md5-cache/app-i18n/uim-1.7.1
index 612e6e982be6..1a99835d860a 100644
--- a/metadata/md5-cache/app-i18n/uim-1.7.1
+++ b/metadata/md5-cache/app-i18n/uim-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.7.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5d2782cd541806b93b64d01cebdc8d3
diff --git a/metadata/md5-cache/app-i18n/uim-1.7.1-r1 b/metadata/md5-cache/app-i18n/uim-1.7.1-r1
index 291896b7aebd..da13aa5c5874 100644
--- a/metadata/md5-cache/app-i18n/uim-1.7.1-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.7.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f07b946d0b0da9df888b3854838faf8
diff --git a/metadata/md5-cache/app-i18n/uim-1.7.3 b/metadata/md5-cache/app-i18n/uim-1.7.3
index 64508b8d0ef2..2db37cf285d5 100644
--- a/metadata/md5-cache/app-i18n/uim-1.7.3
+++ b/metadata/md5-cache/app-i18n/uim-1.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3a06e4aa81be83cf5f1f68c68d31934
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.0 b/metadata/md5-cache/app-i18n/uim-1.8.0
index b3af14d1681a..db985882bc40 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.0
+++ b/metadata/md5-cache/app-i18n/uim-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) qt4? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://uim.googlecode.com/files/uim-1.8.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f798779293964996e548aa144e690d5
diff --git a/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5 b/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5
index c3562250b53a..f1309063f0e2 100644
--- a/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5
+++ b/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/db-4.1
 SLOT=0
 SRC_URI=mirror://berlios/xsim/xsim-0.3.9.4.tar.gz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ed22e6b6619fa6d7f276b533703a4cb
diff --git a/metadata/md5-cache/app-i18n/zinnia-0.06-r1 b/metadata/md5-cache/app-i18n/zinnia-0.06-r1
index 912845365301..2b8e3f2bec9d 100644
--- a/metadata/md5-cache/app-i18n/zinnia-0.06-r1
+++ b/metadata/md5-cache/app-i18n/zinnia-0.06-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/zinnia/zinnia-0.06.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1d7e911795c5e92e5f9a857aa0f9373
diff --git a/metadata/md5-cache/app-laptop/macbook-backlight-0.2 b/metadata/md5-cache/app-laptop/macbook-backlight-0.2
index bb1aa8e5cc49..2ed3bc94dfb8 100644
--- a/metadata/md5-cache/app-laptop/macbook-backlight-0.2
+++ b/metadata/md5-cache/app-laptop/macbook-backlight-0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~cedk/macbook-backlight/macbook-backlight-0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0cea67e8a7cd8a5893a4b41037ba64a0
diff --git a/metadata/md5-cache/app-laptop/macbook-backlight-0.3 b/metadata/md5-cache/app-laptop/macbook-backlight-0.3
index 40f8ab759d0b..ade5e3e91758 100644
--- a/metadata/md5-cache/app-laptop/macbook-backlight-0.3
+++ b/metadata/md5-cache/app-laptop/macbook-backlight-0.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~cedk/macbook-backlight/macbook-backlight-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3760e23ec81b33e2ab74f5ca3d312047
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r2 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r2
index 2b52589023e0..74e389ade675 100644
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r2
+++ b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ef36bdc3f13795f4f9f1091b01897bc
diff --git a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3 b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
index dd78a09f1480..01d62d901da4 100644
--- a/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
+++ b/metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0 ) >=dev-libs/glib-2.6
 SLOT=0
 SRC_URI=mirror://sourceforge/pbbuttons/pbbuttonsd-0.8.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=091a763555a834532f2eaafc66539ceb
diff --git a/metadata/md5-cache/app-laptop/thinkfan-0.8_alpha2 b/metadata/md5-cache/app-laptop/thinkfan-0.8_alpha2
deleted file mode 100644
index 4eb3cced8fb1..000000000000
--- a/metadata/md5-cache/app-laptop/thinkfan-0.8_alpha2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=simple fan control program for thinkpads
-EAPI=4
-HOMEPAGE=http://thinkfan.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/thinkfan/thinkfan-0.8_alpha2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=256cc2e9aa125b2ec4f22bac40853945
diff --git a/metadata/md5-cache/app-misc/away-0.9.5-r1 b/metadata/md5-cache/app-misc/away-0.9.5-r1
index a61c8868aa0b..4667bb43e0cb 100644
--- a/metadata/md5-cache/app-misc/away-0.9.5-r1
+++ b/metadata/md5-cache/app-misc/away-0.9.5-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=http://unbeatenpath.net/software/away/away-0.9.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=923fa2ab3073a7dd06212091c9fc826a
diff --git a/metadata/md5-cache/app-misc/brewtarget-1.2.4 b/metadata/md5-cache/app-misc/brewtarget-1.2.4
index 104e48df2489..633ac875f13d 100644
--- a/metadata/md5-cache/app-misc/brewtarget-1.2.4
+++ b/metadata/md5-cache/app-misc/brewtarget-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3 WTFPL-2
 RDEPEND=>=x11-libs/qt-core-4.6:4 >=x11-libs/qt-gui-4.6:4 >=x11-libs/qt-svg-4.6:4 >=x11-libs/qt-webkit-4.6:4 kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/brewtarget/brewtarget_1.2.4.orig.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcaed6f925015e6410f51a2ca20da396
diff --git a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4 b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
index 5b5bd2e5abf7..a93d3522c77e 100644
--- a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
+++ b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
@@ -8,5 +8,5 @@ LICENSE=Kermit
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2 ) net-dialup/lrzsz
 SLOT=0
 SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0412a0f1d3e5396fe6f4a254d13ac150
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20 b/metadata/md5-cache/app-misc/devtodo-0.1.20
index 881d5dfa6084..211a1b962da7 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0ca6b68ec8e94856d0569c52b3c9ef9
diff --git a/metadata/md5-cache/app-misc/fdutils-5.5-r2 b/metadata/md5-cache/app-misc/fdutils-5.5-r2
index 4bb1e0068ef4..a28fb11cae87 100644
--- a/metadata/md5-cache/app-misc/fdutils-5.5-r2
+++ b/metadata/md5-cache/app-misc/fdutils-5.5-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/mtools-3
 SLOT=0
 SRC_URI=http://fdutils.linux.lu/fdutils-5.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44bd889caac62e9328edd060e5db55d1
diff --git a/metadata/md5-cache/app-misc/gcal-3.6 b/metadata/md5-cache/app-misc/gcal-3.6
index ae37fa8b214e..51c338308a79 100644
--- a/metadata/md5-cache/app-misc/gcal-3.6
+++ b/metadata/md5-cache/app-misc/gcal-3.6
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~arm ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~pp
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gcal/gcal-3.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f72f8251ed58d415593537ab25d282b3
diff --git a/metadata/md5-cache/app-misc/gcal-3.6.1 b/metadata/md5-cache/app-misc/gcal-3.6.1
index 4b1103c43c81..cb20953f43d9 100644
--- a/metadata/md5-cache/app-misc/gcal-3.6.1
+++ b/metadata/md5-cache/app-misc/gcal-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/gcal/gcal-3.6.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db02b93e10431250a3166a43f96d9b40
diff --git a/metadata/md5-cache/app-misc/glimpse-4.18.5 b/metadata/md5-cache/app-misc/glimpse-4.18.5
index 00989f8e0789..252c091946a3 100644
--- a/metadata/md5-cache/app-misc/glimpse-4.18.5
+++ b/metadata/md5-cache/app-misc/glimpse-4.18.5
@@ -7,5 +7,5 @@ LICENSE=glimpse
 RDEPEND=!dev-libs/tre !app-text/agrep
 SLOT=0
 SRC_URI=http://webglimpse.net/trial/glimpse-4.18.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c50183ee4dd152aeb6cef1d135dc10a
diff --git a/metadata/md5-cache/app-misc/gpsdrive-2.11-r3 b/metadata/md5-cache/app-misc/gpsdrive-2.11-r3
index bcf19d3639b2..0164cce1b6ca 100644
--- a/metadata/md5-cache/app-misc/gpsdrive-2.11-r3
+++ b/metadata/md5-cache/app-misc/gpsdrive-2.11-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-libs/libxml2:2 net-misc/curl >=sci-geosciences/gpsd-2.96 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dbus? ( dev-libs/dbus-glib ) gdal? ( sci-libs/gdal ) kismet? ( net-wireless/kismet ) mapnik? ( >=sci-geosciences/mapnik-0.7.0[postgres] >=dev-db/postgis-1.5.2 ) speech? ( >=app-accessibility/speech-dispatcher-0.6.7 ) media-fonts/dejavu sci-geosciences/openstreetmap-icons sci-geosciences/mapnik-world-boundaries
 SLOT=0
 SRC_URI=http://www.gpsdrive.de//packages/gpsdrive-2.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ae548ee61a561c81d0bef6c728134f7
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-0.1.5-r1 b/metadata/md5-cache/app-misc/graphlcd-base-0.1.5-r1
index 7baa01345239..6c5a53cf49cb 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-0.1.5-r1
+++ b/metadata/md5-cache/app-misc/graphlcd-base-0.1.5-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=truetype? ( media-libs/freetype media-fonts/corefonts ) unicode? ( media-libs/freetype media-fonts/corefonts ) g15? ( app-misc/g15daemon )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/226/graphlcd-base-0.1.5.tgz mirror://vdrfiles/graphlcd-base/graphlcd-base-0.1.5_utf8.diff.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfd0be7ac61546f015fd1949244018ce
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-0.1.9 b/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
index 77999397b51f..ce35e0863418 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
+++ b/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=g15? ( app-misc/g15daemon )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/501/graphlcd-base-0.1.9.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f5b8ce4de037cdcdb9746b682ca34712
diff --git a/metadata/md5-cache/app-misc/iguanaIR-0.93 b/metadata/md5-cache/app-misc/iguanaIR-0.93
index be3afe804c30..335cd3b31703 100644
--- a/metadata/md5-cache/app-misc/iguanaIR-0.93
+++ b/metadata/md5-cache/app-misc/iguanaIR-0.93
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt virtual/libusb:0
 SLOT=0
 SRC_URI=http://iguanaworks.net/downloads/iguanaIR-0.93.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28e27dec60728a2c44a22084aefac00d
diff --git a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05 b/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05
index e0db0ceedce0..1a8e0f70ecf3 100644
--- a/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05
+++ b/metadata/md5-cache/app-misc/irtrans-irclient-6.01.05
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-6.01.05.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irtrans-irclient-5.11.04-ip_assign-1.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e03345fd0cbb2461ba206c1ca7dc724
diff --git a/metadata/md5-cache/app-misc/irtrans-irserver-6.03.08 b/metadata/md5-cache/app-misc/irtrans-irserver-6.03.08
index 9739f8584b93..843269d1d5cf 100644
--- a/metadata/md5-cache/app-misc/irtrans-irserver-6.03.08
+++ b/metadata/md5-cache/app-misc/irtrans-irserver-6.03.08
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.03.08.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.03.08.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b371deef30666d3357ee824721f7339
diff --git a/metadata/md5-cache/app-misc/irtrans-irserver-6.03.09 b/metadata/md5-cache/app-misc/irtrans-irserver-6.03.09
index 34ceaf88b4c3..b4e130422708 100644
--- a/metadata/md5-cache/app-misc/irtrans-irserver-6.03.09
+++ b/metadata/md5-cache/app-misc/irtrans-irserver-6.03.09
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.03.09.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.03.09.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37271d209a0c0687a2680847018726ca
diff --git a/metadata/md5-cache/app-misc/jail-1.9-r2 b/metadata/md5-cache/app-misc/jail-1.9-r2
index 4561e8f0994c..5664fa401dab 100644
--- a/metadata/md5-cache/app-misc/jail-1.9-r2
+++ b/metadata/md5-cache/app-misc/jail-1.9-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-util/strace
 SLOT=0
 SRC_URI=mirror://sourceforge/jail/jail_1.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15ff01d3a49e3ab9cf0e10a6475810a9
diff --git a/metadata/md5-cache/app-misc/jail-1.9-r3 b/metadata/md5-cache/app-misc/jail-1.9-r3
index 53021fb46658..e1fb9a9ad8b7 100644
--- a/metadata/md5-cache/app-misc/jail-1.9-r3
+++ b/metadata/md5-cache/app-misc/jail-1.9-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-util/strace
 SLOT=0
 SRC_URI=mirror://sourceforge/jail/jail_1.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a00b4195ea95256e9b509d362912c96
diff --git a/metadata/md5-cache/app-misc/lirc-0.8.5 b/metadata/md5-cache/app-misc/lirc-0.8.5
index 45ba11f9620f..abe108497beb 100644
--- a/metadata/md5-cache/app-misc/lirc-0.8.5
+++ b/metadata/md5-cache/app-misc/lirc-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.8.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f263703002e8bc7a8bcc99953d5e904
diff --git a/metadata/md5-cache/app-misc/lirc-0.8.7 b/metadata/md5-cache/app-misc/lirc-0.8.7
index fd3ca7063372..542e80d30527 100644
--- a/metadata/md5-cache/app-misc/lirc-0.8.7
+++ b/metadata/md5-cache/app-misc/lirc-0.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.8.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e6b814acf8b282e2ed4e1768f16148c
diff --git a/metadata/md5-cache/app-misc/lirc-0.8.7_pre1 b/metadata/md5-cache/app-misc/lirc-0.8.7_pre1
index 3a2ceff39d33..2f05328fa2e3 100644
--- a/metadata/md5-cache/app-misc/lirc-0.8.7_pre1
+++ b/metadata/md5-cache/app-misc/lirc-0.8.7_pre1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.lirc.org/software/snapshots/lirc-0.8.7pre1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f087a89e73cc01485275da6ab53b2b92
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.0 b/metadata/md5-cache/app-misc/lirc-0.9.0
index 8db34ef42d0e..fe25928e97c3 100644
--- a/metadata/md5-cache/app-misc/lirc-0.9.0
+++ b/metadata/md5-cache/app-misc/lirc-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.9.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=158a435ac22e68f650fed0ebf08e5dc1
diff --git a/metadata/md5-cache/app-misc/mc-4.7.5.6-r1 b/metadata/md5-cache/app-misc/mc-4.7.5.6-r1
index b4cd7530f835..5f32e289fa5d 100644
--- a/metadata/md5-cache/app-misc/mc-4.7.5.6-r1
+++ b/metadata/md5-cache/app-misc/mc-4.7.5.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsp
 REQUIRED_USE=^^ ( ncurses slang )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.7.5.6.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbb5ae0cceede0a020652eaf773318f3
diff --git a/metadata/md5-cache/app-misc/mc-4.8.1-r1 b/metadata/md5-cache/app-misc/mc-4.8.1-r1
index 9c8b803b7d69..1fe84244901f 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.1-r1
+++ b/metadata/md5-cache/app-misc/mc-4.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsp
 REQUIRED_USE=^^ ( ncurses slang )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae7c128afe577442d06290f8bcd30b4f
diff --git a/metadata/md5-cache/app-misc/mc-4.8.1-r2 b/metadata/md5-cache/app-misc/mc-4.8.1-r2
index 95cdded860e6..58c19749c811 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.1-r2
+++ b/metadata/md5-cache/app-misc/mc-4.8.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsp
 REQUIRED_USE=^^ ( ncurses slang )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3305177e849112e2bf9fd82239eff29a
diff --git a/metadata/md5-cache/app-misc/mc-4.8.2-r2 b/metadata/md5-cache/app-misc/mc-4.8.2-r2
index 807db554ff81..043d6cbf12b3 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.2-r2
+++ b/metadata/md5-cache/app-misc/mc-4.8.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b23d1d232f73f788eb459e937758fed0
diff --git a/metadata/md5-cache/app-misc/mc-4.8.3-r2 b/metadata/md5-cache/app-misc/mc-4.8.3-r2
index 6bf03397a369..aa89f03dfc1b 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.3-r2
+++ b/metadata/md5-cache/app-misc/mc-4.8.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8407c81696f39e37ad9f8454dbdc2319
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index 4255de78e38f..b00aa0a668f7 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -7,5 +7,5 @@ IUSE=+edit gpm mclib nls samba sftp +slang test X +xdg linguas_az linguas_be lin
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c921c14b4b2f48e83992279b74d7351c
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p15 b/metadata/md5-cache/app-misc/mmv-1.01b_p15
index 569bf662dd3a..cfa887dbe679 100644
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p15
+++ b/metadata/md5-cache/app-misc/mmv-1.01b_p15
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-maco
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-15.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8bb10c9c78fbd01da143a7ffadb5b29
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1 b/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1
index ec30751e0446..e25bce7ce895 100644
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1
+++ b/metadata/md5-cache/app-misc/ps3pf_utils-2.1.1
@@ -5,5 +5,5 @@ KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/ps3pf_utils-2.1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c85c5058fbecdfb285465778aec1d7a4
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0 b/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0
index 79605c9806fc..6654c35c909b 100644
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0
+++ b/metadata/md5-cache/app-misc/ps3pf_utils-2.2.0
@@ -5,5 +5,5 @@ KEYWORDS=-ppc -ppc64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/ps3-utils-2.2.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76fe95851fb35c7e31fa7d9856f738de
diff --git a/metadata/md5-cache/app-misc/ps3pf_utils-2.3 b/metadata/md5-cache/app-misc/ps3pf_utils-2.3
index 586574f13904..b6ae54906ea6 100644
--- a/metadata/md5-cache/app-misc/ps3pf_utils-2.3
+++ b/metadata/md5-cache/app-misc/ps3pf_utils-2.3
@@ -5,5 +5,5 @@ KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-2.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7512d018fc016826a91f8086aff993cc
diff --git a/metadata/md5-cache/app-misc/ranger-1.5.4 b/metadata/md5-cache/app-misc/ranger-1.5.4
index 7d406d39b90e..0cc809f06319 100644
--- a/metadata/md5-cache/app-misc/ranger-1.5.4
+++ b/metadata/md5-cache/app-misc/ranger-1.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pager || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] )
 SLOT=0
 SRC_URI=http://nongnu.org/ranger/ranger-1.5.4.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=26646d620bac487e9faf1c60479a599a
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=9c030823ed22f8bb8fab6d7eb9942f73
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
new file mode 100644
index 000000000000..09a8e0fab873
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup unpack
+DEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] ) dev-vcs/git
+DESCRIPTION=A vim-inspired file manager for the console
+EAPI=4
+HOMEPAGE=http://ranger.nongnu.org/
+LICENSE=GPL-3
+RDEPEND=virtual/pager || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] )
+SLOT=0
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=2d3b091bed4d37d706f0989fc212c327
diff --git a/metadata/md5-cache/app-misc/realpath-1.16 b/metadata/md5-cache/app-misc/realpath-1.16
index 772c4c23bfb7..1c83f69c6aea 100644
--- a/metadata/md5-cache/app-misc/realpath-1.16
+++ b/metadata/md5-cache/app-misc/realpath-1.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.16.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.16_i386.deb )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=382f480c6c0e001c42a16af73f075a5e
diff --git a/metadata/md5-cache/app-misc/reptyr-0.3 b/metadata/md5-cache/app-misc/reptyr-0.3
index 513739f971c9..50571c75daf4 100644
--- a/metadata/md5-cache/app-misc/reptyr-0.3
+++ b/metadata/md5-cache/app-misc/reptyr-0.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/nelhage/reptyr/tarball/reptyr-0.3 -> reptyr-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58f38c5d8f8a2d58cf3ec8d6caff9351
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r4 b/metadata/md5-cache/app-misc/screen-4.0.3-r4
index 3453f4da6758..59798e969e26 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r4
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4492b011dd006eabf94ec1eec609f75f
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r5 b/metadata/md5-cache/app-misc/screen-4.0.3-r5
index 40f8ac413724..c75d88883f17 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r5
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57d5bcd989433e43d46c610d0f7b5f59
diff --git a/metadata/md5-cache/app-misc/secure-delete-3.1-r1 b/metadata/md5-cache/app-misc/secure-delete-3.1-r1
index db3c6c75ef64..f3f2b5dd455c 100644
--- a/metadata/md5-cache/app-misc/secure-delete-3.1-r1
+++ b/metadata/md5-cache/app-misc/secure-delete-3.1-r1
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RDEPEND=!app-misc/srm
 SLOT=0
 SRC_URI=http://www.thc.org/releases/secure_delete-3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04e70534e5cdecae61d447814ef2c8a3
diff --git a/metadata/md5-cache/app-misc/sl-3.03-r1 b/metadata/md5-cache/app-misc/sl-3.03-r1
index e7b312dad89e..dc2ace1b75c8 100644
--- a/metadata/md5-cache/app-misc/sl-3.03-r1
+++ b/metadata/md5-cache/app-misc/sl-3.03-r1
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/sl.tar http://www.linet.gr.jp/~izumi/sl/sl5-1.patch http://www.sodan.ecc.u-tokyo.ac.jp/~okayama/sl/sl.en.1.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb0b961320b54a791acc25131be4bf72
diff --git a/metadata/md5-cache/app-misc/strigi-0.7.7 b/metadata/md5-cache/app-misc/strigi-0.7.7
index bf594c7958a8..de8f27ac6711 100644
--- a/metadata/md5-cache/app-misc/strigi-0.7.7
+++ b/metadata/md5-cache/app-misc/strigi-0.7.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:0 dev-libs/libxml2:2 sys-libs/zlib:0 virtual/libiconv clucene? ( >=dev-cpp/clucene-0.9.21[-debug] ) dbus? ( sys-apps/dbus qt4? ( x11-libs/qt-dbus:4 ) ) exif? ( >=media-gfx/exiv2-0.17 ) fam? ( virtual/fam ) ffmpeg? ( virtual/ffmpeg ) hyperestraier? ( app-text/hyperestraier ) log? ( >=dev-libs/log4cxx-0.10.0 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/strigi-0.7.7.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f5e5f199106f25172861fbda2e9a201
diff --git a/metadata/md5-cache/app-misc/strigi-0.7.7-r1 b/metadata/md5-cache/app-misc/strigi-0.7.7-r1
index 27d28910d7c2..3b85a8545afb 100644
--- a/metadata/md5-cache/app-misc/strigi-0.7.7-r1
+++ b/metadata/md5-cache/app-misc/strigi-0.7.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:0 dev-libs/libxml2:2 sys-libs/zlib:0 virtual/libiconv clucene? ( >=dev-cpp/clucene-0.9.21[-debug] ) dbus? ( sys-apps/dbus qt4? ( x11-libs/qt-dbus:4 ) ) exif? ( >=media-gfx/exiv2-0.17 ) fam? ( virtual/fam ) ffmpeg? ( virtual/ffmpeg ) hyperestraier? ( app-text/hyperestraier ) log? ( >=dev-libs/log4cxx-0.10.0 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/strigi-0.7.7.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b14189fd9a123924441f9866111c015a
diff --git a/metadata/md5-cache/app-misc/symlinks-1.4 b/metadata/md5-cache/app-misc/symlinks-1.4
index 07d76f596d6a..92f22ebcb4b5 100644
--- a/metadata/md5-cache/app-misc/symlinks-1.4
+++ b/metadata/md5-cache/app-misc/symlinks-1.4
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/utils/file/symlinks-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c34901eaea7b16294b413d98c633647
diff --git a/metadata/md5-cache/app-misc/symlinks-1.4-r2 b/metadata/md5-cache/app-misc/symlinks-1.4-r2
index 171450e74d75..226912e255c7 100644
--- a/metadata/md5-cache/app-misc/symlinks-1.4-r2
+++ b/metadata/md5-cache/app-misc/symlinks-1.4-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/utils/file/symlinks-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e42f72af3cb5c56413de54423593490e
diff --git a/metadata/md5-cache/app-misc/task-1.9.4-r1 b/metadata/md5-cache/app-misc/task-1.9.4-r1
index 0c65310959e4..8aa0078ea278 100644
--- a/metadata/md5-cache/app-misc/task-1.9.4-r1
+++ b/metadata/md5-cache/app-misc/task-1.9.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( dev-lang/lua )
 SLOT=0
 SRC_URI=http://taskwarrior.org/download/task-1.9.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=713fc0a4003b051ea6851045628b2dec
diff --git a/metadata/md5-cache/app-misc/task-2.0.0-r1 b/metadata/md5-cache/app-misc/task-2.0.0-r1
index d1228bc2eebc..0232b9f747e2 100644
--- a/metadata/md5-cache/app-misc/task-2.0.0-r1
+++ b/metadata/md5-cache/app-misc/task-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=lua? ( dev-lang/lua )
 SLOT=0
 SRC_URI=http://taskwarrior.org/download/task-2.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8801f2a7a4eda7a6a41a986178e7701
diff --git a/metadata/md5-cache/app-misc/tdl-1.5.2-r1 b/metadata/md5-cache/app-misc/tdl-1.5.2-r1
index ddf8cf53c570..155e70de6b71 100644
--- a/metadata/md5-cache/app-misc/tdl-1.5.2-r1
+++ b/metadata/md5-cache/app-misc/tdl-1.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/tdl-screenshot.png.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=876429a503e852f887c0cbd866ae3fdc
diff --git a/metadata/md5-cache/app-misc/tdl-1.5.2-r2 b/metadata/md5-cache/app-misc/tdl-1.5.2-r2
index 265412d833b1..e40d6a489314 100644
--- a/metadata/md5-cache/app-misc/tdl-1.5.2-r2
+++ b/metadata/md5-cache/app-misc/tdl-1.5.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/tdl-screenshot.png.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf9840632ee1dcb31f21cd96db033adf
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.1.0 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.1.0
index 406913cdec36..f0192146c4e5 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.1.0
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.1.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://www.github.com/thewtex/tmux-mem-cpu-load/tarball/v2.1.0 -> tmux-mem-cpu-load-2.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f48319590a86b8fc300fef3f356c6fe
diff --git a/metadata/md5-cache/app-misc/ttyrec-1.0.8 b/metadata/md5-cache/app-misc/ttyrec-1.0.8
index f47902aac046..1f2db8b7d8ff 100644
--- a/metadata/md5-cache/app-misc/ttyrec-1.0.8
+++ b/metadata/md5-cache/app-misc/ttyrec-1.0.8
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-maco
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://namazu.org/~satoru/ttyrec/ttyrec-1.0.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15f334520f6b37c7cb5012836e57153d
diff --git a/metadata/md5-cache/app-misc/vcp-2.2-r1 b/metadata/md5-cache/app-misc/vcp-2.2-r1
index 22bafd477221..7e5cee5972b5 100644
--- a/metadata/md5-cache/app-misc/vcp-2.2-r1
+++ b/metadata/md5-cache/app-misc/vcp-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://members.iinet.net.au/~lynx/vcp/vcp-2.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3da6a79a4ebb2c8b5bc50a31c67c3007
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3 b/metadata/md5-cache/app-misc/vlock-2.2.3
index 778f9d26c4b4..a58aab3a732b 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=http://cthulhu.c3d2.de/~toidinamai/vlock/archive/vlock-2.2.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e04242f87f952527faed96bc121032ba
diff --git a/metadata/md5-cache/app-misc/zisofs-tools-1.0.6 b/metadata/md5-cache/app-misc/zisofs-tools-1.0.6
index ee98fd669652..d900fd7d83ec 100644
--- a/metadata/md5-cache/app-misc/zisofs-tools-1.0.6
+++ b/metadata/md5-cache/app-misc/zisofs-tools-1.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/fs/zisofs/zisofs-tools-1.0.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08859265aa15291af7941cfd57d7b167
diff --git a/metadata/md5-cache/app-misc/zisofs-tools-1.0.8 b/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
index 3a6a89c6267a..b3dc87008822 100644
--- a/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
+++ b/metadata/md5-cache/app-misc/zisofs-tools-1.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/fs/zisofs/zisofs-tools-1.0.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0098f4b4d9e2a67d21f27722fb4a5159
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.25.0-r1 b/metadata/md5-cache/app-mobilephone/gammu-1.25.0-r1
index c2e4ed39a5df..3a5a9158318f 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.25.0-r1
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.25.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) curl? ( net-misc/curl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) dbi? ( >=dev-db/libdbi-0.8.3 ) dev-util/dialog dev-lang/python !dev-python/python-gammu
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.25.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbaf00280dd1eac27465cf4630a9654b
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.28.0 b/metadata/md5-cache/app-mobilephone/gammu-1.28.0
index 6a5cd4451357..2e0f31d576c2 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.28.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.28.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) curl? ( net-misc/curl ) usb? ( virtual/libusb:1 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) dbi? ( >=dev-db/libdbi-0.8.3 ) dev-util/dialog !dev-python/python-gammu python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.28.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3af0a31643970ff707ca0b990e0dc12
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.29.0 b/metadata/md5-cache/app-mobilephone/gammu-1.29.0
index 83ebb8af53a9..4c2dce9066ee 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.29.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.29.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) curl? ( net-misc/curl ) usb? ( virtual/libusb:1 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) dbi? ( >=dev-db/libdbi-0.8.3 ) dev-util/dialog !dev-python/python-gammu python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.29.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17d5413947bdcfeba4ce03962103cbae
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.30.0 b/metadata/md5-cache/app-mobilephone/gammu-1.30.0
index 1f618aa31a48..1d7b0dcc576b 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.30.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) curl? ( net-misc/curl ) usb? ( virtual/libusb:1 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) dbi? ( >=dev-db/libdbi-0.8.3 ) dev-util/dialog !dev-python/python-gammu python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.30.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3740d0103089d8b2d741ed0d840ffbbe
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1 b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
index 7a61c59c8501..1b2c89b02f03 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2 dev-lang/perl sys-libs/zlib ssl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.4.3/gateway-1.4.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d284016268e43db1dfd48a18a5d21b07
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1 b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
index 8e7228b4af3c..1d55f5b293de 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.8 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.23.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b04c73df5ad558812eb893fea33d578
diff --git a/metadata/md5-cache/app-mobilephone/past-0.0.4 b/metadata/md5-cache/app-mobilephone/past-0.0.4
index 0293e94f8c98..64044a132513 100644
--- a/metadata/md5-cache/app-mobilephone/past-0.0.4
+++ b/metadata/md5-cache/app-mobilephone/past-0.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 app-mobilephone/gnokii[sms]
 SLOT=0
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/74036-past-0.0.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95fe9db7faebb01836d8d5a92b1a7f2a
diff --git a/metadata/md5-cache/app-office/akonadi-server-1.7.2 b/metadata/md5-cache/app-office/akonadi-server-1.7.2
index 75088a1186cc..0f2550dfff83 100644
--- a/metadata/md5-cache/app-office/akonadi-server-1.7.2
+++ b/metadata/md5-cache/app-office/akonadi-server-1.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( sqlite mysql postgres )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/akonadi/src/akonadi-1.7.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef005738cba792050ae183c3e2524250
diff --git a/metadata/md5-cache/app-office/calligra-2.4.1 b/metadata/md5-cache/app-office/calligra-2.4.1
deleted file mode 100644
index e2ccd545ba10..000000000000
--- a/metadata/md5-cache/app-office/calligra-2.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-DESCRIPTION=KDE Office Suite
-EAPI=4
-HOMEPAGE=http://www.calligra.org/
-IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=app-office/calligra-l10n-2.4
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=be692a7f36d8e98a110ef9fcc9732aaa
diff --git a/metadata/md5-cache/app-office/calligra-2.4.2 b/metadata/md5-cache/app-office/calligra-2.4.2
index 7aaaec812d0e..95030b20627d 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.2
+++ b/metadata/md5-cache/app-office/calligra-2.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=>=app-office/calligra-l10n-2.4
 RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
@@ -12,5 +12,5 @@ REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_featu
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.4.2/calligra-2.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4f29c59fd07aa5af5b8e63d9acd5a112
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=4b3dd71ee86361e4e9f865d9dfc95fe4
diff --git a/metadata/md5-cache/app-office/calligra-2.4.49.9999 b/metadata/md5-cache/app-office/calligra-2.4.49.9999
index cc47dd71de70..c6910423b6dc 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.49.9999
+++ b/metadata/md5-cache/app-office/calligra-2.4.49.9999
@@ -10,5 +10,5 @@ RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=c71fa9e238bdd19753a44052a5f395c2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=edf7a578fcdfa1151949293ba22dcd30
diff --git a/metadata/md5-cache/app-office/calligra-2.4.90 b/metadata/md5-cache/app-office/calligra-2.4.90
deleted file mode 100644
index 0fd1b907028d..000000000000
--- a/metadata/md5-cache/app-office/calligra-2.4.90
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-DESCRIPTION=KDE Office Suite
-EAPI=4
-HOMEPAGE=http://www.calligra.org/
-IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=app-office/calligra-l10n-2.4
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/unstable/calligra-2.4.90/calligra-2.4.90.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=84568b6cffe77f844542357af79779c4
diff --git a/metadata/md5-cache/app-office/calligra-2.4.91 b/metadata/md5-cache/app-office/calligra-2.4.91
index 3a6a0e59fc5b..ba1abb42121d 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.91
+++ b/metadata/md5-cache/app-office/calligra-2.4.91
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
-IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=app-office/calligra-l10n-2.4
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/unstable/calligra-2.4.91/calligra-2.4.91.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=cfef0590fe5325c3fbe80ca6c506829c
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=a7d348806cb0de645ca702ce7a473ee1
diff --git a/metadata/md5-cache/app-office/calligra-9999 b/metadata/md5-cache/app-office/calligra-9999
index 4b6b59ee6ef4..1f7886ca29ee 100644
--- a/metadata/md5-cache/app-office/calligra-9999
+++ b/metadata/md5-cache/app-office/calligra-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
-IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular opengtl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 LICENSE=GPL-2
 PDEPEND=>=app-office/calligra-l10n-2.4
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) opengtl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4e15cdae2cfb13e165949b3f0c031ab0
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=c8d55a77a4049fbc16f8c17bb6b734a5
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.1 b/metadata/md5-cache/app-office/calligra-l10n-2.4.1
deleted file mode 100644
index 4aab671c3343..000000000000
--- a/metadata/md5-cache/app-office/calligra-l10n-2.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Calligra localization package
-EAPI=4
-HOMEPAGE=http://www.kde.org/
-IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-office/koffice-l10n >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca-2.4.1.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca@valencia-2.4.1.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-cs-2.4.1.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-da-2.4.1.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-de-2.4.1.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-el-2.4.1.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-en_GB-2.4.1.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-es-2.4.1.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-et-2.4.1.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fi-2.4.1.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fr-2.4.1.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-hu-2.4.1.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-it-2.4.1.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-kk-2.4.1.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nb-2.4.1.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nds-2.4.1.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nl-2.4.1.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pl-2.4.1.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt-2.4.1.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt_BR-2.4.1.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ru-2.4.1.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sk-2.4.1.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sv-2.4.1.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-uk-2.4.1.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_CN-2.4.1.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_TW-2.4.1.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=f9ec6ae64e20ca31659eb8c828aaffad
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.2 b/metadata/md5-cache/app-office/calligra-l10n-2.4.2
index 04c468dcd684..3398893192dc 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.4.2
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Calligra localization package
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!app-office/koffice-l10n >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ca? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-ca-2.4.2.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-ca@valencia-2.4.2.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-cs-2.4.2.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-da-2.4.2.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-de-2.4.2.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-el-2.4.2.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-en_GB-2.4.2.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-es-2.4.2.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-et-2.4.2.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-fi-2.4.2.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-fr-2.4.2.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-hu-2.4.2.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-it-2.4.2.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-kk-2.4.2.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-nb-2.4.2.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-nds-2.4.2.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-nl-2.4.2.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-pl-2.4.2.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-pt-2.4.2.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-pt_BR-2.4.2.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-ru-2.4.2.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-sk-2.4.2.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-sv-2.4.2.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-uk-2.4.2.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-zh_CN-2.4.2.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.2/calligra-l10n//calligra-l10n-zh_TW-2.4.2.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=a6bd10bccbba705b90a44fe600de2e66
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=717c04ae00028dec007f16259443410b
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.90 b/metadata/md5-cache/app-office/calligra-l10n-2.4.90
index c89ce19a78fd..291fe3afb511 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.4.90
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.4.90
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-office/koffice-l10n >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ca? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-ca-2.4.90.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-ca@valencia-2.4.90.tar.bz2 ) linguas_da? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-da-2.4.90.tar.bz2 ) linguas_de? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-de-2.4.90.tar.bz2 ) linguas_el? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-el-2.4.90.tar.bz2 ) linguas_en_GB? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-en_GB-2.4.90.tar.bz2 ) linguas_es? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-es-2.4.90.tar.bz2 ) linguas_et? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-et-2.4.90.tar.bz2 ) linguas_fi? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-fi-2.4.90.tar.bz2 ) linguas_fr? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-fr-2.4.90.tar.bz2 ) linguas_hu? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-hu-2.4.90.tar.bz2 ) linguas_it? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-it-2.4.90.tar.bz2 ) linguas_kk? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-kk-2.4.90.tar.bz2 ) linguas_nb? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-nb-2.4.90.tar.bz2 ) linguas_nds? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-nds-2.4.90.tar.bz2 ) linguas_nl? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-nl-2.4.90.tar.bz2 ) linguas_pl? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-pl-2.4.90.tar.bz2 ) linguas_pt? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-pt-2.4.90.tar.bz2 ) linguas_pt_BR? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-pt_BR-2.4.90.tar.bz2 ) linguas_ru? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-ru-2.4.90.tar.bz2 ) linguas_sk? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-sk-2.4.90.tar.bz2 ) linguas_sv? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-sv-2.4.90.tar.bz2 ) linguas_uk? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-uk-2.4.90.tar.bz2 ) linguas_zh_CN? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-zh_CN-2.4.90.tar.bz2 ) linguas_zh_TW? ( mirror://kde/unstable/calligra-2.4.90/calligra-l10n//calligra-l10n-zh_TW-2.4.90.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6047b770614fcd45eacfd600b7d5a004
diff --git a/metadata/md5-cache/app-office/dia2code-0.8.1 b/metadata/md5-cache/app-office/dia2code-0.8.1
index b45866e6dee2..05f28b291728 100644
--- a/metadata/md5-cache/app-office/dia2code-0.8.1
+++ b/metadata/md5-cache/app-office/dia2code-0.8.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=app-office/dia-0.90.0
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-0.8.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44c48caa603470dbd5ef42aebf886d0d
diff --git a/metadata/md5-cache/app-office/dia2code-0.8.3 b/metadata/md5-cache/app-office/dia2code-0.8.3
index ccf9f65380b0..62b33628e37a 100644
--- a/metadata/md5-cache/app-office/dia2code-0.8.3
+++ b/metadata/md5-cache/app-office/dia2code-0.8.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=app-office/dia-0.90.0
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-0.8.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1da1ef0caa9bbf4b4d0ed16aac11efb
diff --git a/metadata/md5-cache/app-office/gnumeric-1.10.17 b/metadata/md5-cache/app-office/gnumeric-1.10.17
index 39bedc704380..1095865769cc 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.10.17
+++ b/metadata/md5-cache/app-office/gnumeric-1.10.17
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib app-arch/bzip2 >=dev-libs/glib-2.12:2 >=gnome-extra/libgsf
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.10/gnumeric-1.10.17.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd91f4454a9a4f24bfdb9481834ee0d7
diff --git a/metadata/md5-cache/app-office/karbon-2.3.3-r1 b/metadata/md5-cache/app-office/karbon-2.3.3-r1
deleted file mode 100644
index 673da43d04ed..000000000000
--- a/metadata/md5-cache/app-office/karbon-2.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libart_lgpl pstoedit? ( media-gfx/pstoedit ) wpg? ( app-text/libwpg[tools(+)] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice vector drawing application.
-EAPI=4
-HOMEPAGE=http://www.koffice.org/
-IUSE=+pstoedit wpg aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libart_lgpl pstoedit? ( media-gfx/pstoedit ) wpg? ( app-text/libwpg[tools(+)] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/karbon:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=f1cc83ae2513e86fdeec3ab8c7df440e
diff --git a/metadata/md5-cache/app-office/kexi-2.3.3 b/metadata/md5-cache/app-office/kexi-2.3.3
deleted file mode 100644
index d7f94da6f795..000000000000
--- a/metadata/md5-cache/app-office/kexi-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-libs/readline app-arch/bzip2 ~app-office/kspread-2.3.3:2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) postgres? ( >=dev-libs/libpqxx-3 ) reports? ( ~app-office/koffice-libs-2.3.3:2[reports] ) xbase? ( dev-db/xbase ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice integrated environment for database management
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=freetds mysql postgres reports xbase aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline app-arch/bzip2 ~app-office/kspread-2.3.3:2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) postgres? ( >=dev-libs/libpqxx-3 ) reports? ( ~app-office/koffice-libs-2.3.3:2[reports] ) xbase? ( dev-db/xbase ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kexi:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=60144f815b2f910a41e74339089c9ab4
diff --git a/metadata/md5-cache/app-office/kmymoney-4.6.2 b/metadata/md5-cache/app-office/kmymoney-4.6.2
index 75b3961b0a72..0fb1573d3440 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.6.2
+++ b/metadata/md5-cache/app-office/kmymoney-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-cpp/glibmm:2 dev-cpp/l
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/kmymoney2/kmymoney-4.6.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=872baba01280f56834c5b1160e1d2d9d
diff --git a/metadata/md5-cache/app-office/kmymoney-4.6.2-r1 b/metadata/md5-cache/app-office/kmymoney-4.6.2-r1
index 157bd8affcb3..19179198d0bc 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.6.2-r1
+++ b/metadata/md5-cache/app-office/kmymoney-4.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-cpp/glibmm:2 dev-cpp/l
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/kmymoney2/kmymoney-4.6.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4744b088dd0ce64e0a379b96f2430f48
diff --git a/metadata/md5-cache/app-office/kmymoney-4.6.2-r2 b/metadata/md5-cache/app-office/kmymoney-4.6.2-r2
index 8e8c3b0b0221..e5768561804c 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.6.2-r2
+++ b/metadata/md5-cache/app-office/kmymoney-4.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-cpp/glibmm:2 dev-cpp/l
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/kmymoney2/kmymoney-4.6.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04fea6d3bb41a9a8d0ce9d248aeed476
diff --git a/metadata/md5-cache/app-office/koffice-data-2.3.3 b/metadata/md5-cache/app-office/koffice-data-2.3.3
deleted file mode 100644
index d3e2c902c552..000000000000
--- a/metadata/md5-cache/app-office/koffice-data-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/lcms:0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-DESCRIPTION=Shared KOffice data files
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/lcms:0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-data:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=bfc65931668efd08d093a46dea480081
diff --git a/metadata/md5-cache/app-office/koffice-l10n-2.3.3 b/metadata/md5-cache/app-office/koffice-l10n-2.3.3
deleted file mode 100644
index f9e48b2759f8..000000000000
--- a/metadata/md5-cache/app-office/koffice-l10n-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=KOffice localization package
-EAPI=3
-HOMEPAGE=http://www.kde.org/
-IUSE=doc linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=2
-SRC_URI=linguas_ca? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ca-2.3.2.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ca@valencia-2.3.2.tar.bz2 ) linguas_da? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-da-2.3.2.tar.bz2 ) linguas_de? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-de-2.3.2.tar.bz2 ) linguas_el? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-el-2.3.2.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-en_GB-2.3.2.tar.bz2 ) linguas_es? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-es-2.3.2.tar.bz2 ) linguas_et? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-et-2.3.2.tar.bz2 ) linguas_fr? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-fr-2.3.2.tar.bz2 ) linguas_gl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-gl-2.3.2.tar.bz2 ) linguas_hu? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-hu-2.3.2.tar.bz2 ) linguas_it? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-it-2.3.2.tar.bz2 ) linguas_ja? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ja-2.3.2.tar.bz2 ) linguas_kk? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-kk-2.3.2.tar.bz2 ) linguas_nb? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nb-2.3.2.tar.bz2 ) linguas_nds? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nds-2.3.2.tar.bz2 ) linguas_nl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-nl-2.3.2.tar.bz2 ) linguas_pl? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pl-2.3.2.tar.bz2 ) linguas_pt? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pt-2.3.2.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-pt_BR-2.3.2.tar.bz2 ) linguas_ru? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-ru-2.3.2.tar.bz2 ) linguas_sv? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-sv-2.3.2.tar.bz2 ) linguas_tr? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-tr-2.3.2.tar.bz2 ) linguas_uk? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-uk-2.3.2.tar.bz2 ) linguas_wa? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-wa-2.3.2.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-zh_CN-2.3.2.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/koffice-2.3.3/koffice-l10n//koffice-l10n-zh_TW-2.3.2.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=e0a25e5e52d1a71085f69940f67c0d15
diff --git a/metadata/md5-cache/app-office/koffice-libs-2.3.3-r1 b/metadata/md5-cache/app-office/koffice-libs-2.3.3-r1
deleted file mode 100644
index b3c89568a8f2..000000000000
--- a/metadata/md5-cache/app-office/koffice-libs-2.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-DESCRIPTION=Shared KOffice libraries
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=crypt openexr reports opengl test aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-libs:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=c00b0e55917f9a67e3170befd3aca67f
diff --git a/metadata/md5-cache/app-office/koffice-libs-2.3.3-r2 b/metadata/md5-cache/app-office/koffice-libs-2.3.3-r2
deleted file mode 100644
index c2013146281e..000000000000
--- a/metadata/md5-cache/app-office/koffice-libs-2.3.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-DESCRIPTION=Shared KOffice libraries
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=crypt openexr reports opengl test aqua debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/koffice-data-2.3.3:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/lcms:0 crypt? ( app-crypt/qca:2 ) openexr? ( media-libs/openexr ) opengl? ( media-libs/mesa ) !app-office/kchart >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/koffice-libs:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=c7698fbaf795d54ae3c47494cbac5a05
diff --git a/metadata/md5-cache/app-office/koffice-meta-2.3.3 b/metadata/md5-cache/app-office/koffice-meta-2.3.3
deleted file mode 100644
index d679592cc744..000000000000
--- a/metadata/md5-cache/app-office/koffice-meta-2.3.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KOffice - merge this to pull in all KOffice-derived packages
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=nls reports
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/karbon-2.3.3:2 >=app-office/kexi-2.3.3:2 >=app-office/koffice-data-2.3.3:2 >=app-office/koffice-libs-2.3.3:2[reports?] >=app-office/kpresenter-2.3.3:2 >=app-office/krita-2.3.3:2 >=app-office/kspread-2.3.3:2 >=app-office/kword-2.3.3:2 nls? ( >=app-office/koffice-l10n-2.3.3:2 ) reports? ( >=app-office/kplato-2.3.3:2 ) !app-office/kchart
-SLOT=2
-_md5_=ef675cb78a9ad0dc479728bb01add469
diff --git a/metadata/md5-cache/app-office/kplato-2.3.3 b/metadata/md5-cache/app-office/kplato-2.3.3
deleted file mode 100644
index 698329ac3f2f..000000000000
--- a/metadata/md5-cache/app-office/kplato-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=~app-office/koffice-libs-2.3.3:2[reports] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice project management application
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=python test aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=~app-office/koffice-libs-2.3.3:2[reports] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kplato:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=f7ae03323bff2cd48bcfd6a1e10c472d
diff --git a/metadata/md5-cache/app-office/kpresenter-2.3.3 b/metadata/md5-cache/app-office/kpresenter-2.3.3
deleted file mode 100644
index 4732fe5778ef..000000000000
--- a/metadata/md5-cache/app-office/kpresenter-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.35.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice presentation program
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.35.0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kpresenter:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=ed78611e334a7626baa21184db34b836
diff --git a/metadata/md5-cache/app-office/krita-2.3.3 b/metadata/md5-cache/app-office/krita-2.3.3
deleted file mode 100644
index f38023c0de8c..000000000000
--- a/metadata/md5-cache/app-office/krita-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/koffice-libs-2.3.3:2[openexr=] >=dev-cpp/eigen-2.0.3:2 >=media-libs/qimageblitz-0.0.4 >=media-gfx/exiv2-0.16 sci-libs/fftw:3.0 sys-devel/gcc[openmp] gmm? ( sci-mathematics/gmm ) kdcraw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) opengl? ( media-libs/glew ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice image manipulation program.
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=gmm +kdcraw openexr +pdf +tiff opengl aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/koffice-libs-2.3.3:2[openexr=] >=dev-cpp/eigen-2.0.3:2 >=media-libs/qimageblitz-0.0.4 >=media-gfx/exiv2-0.16 sci-libs/fftw:3.0 sys-devel/gcc[openmp] gmm? ( sci-mathematics/gmm ) kdcraw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) opengl? ( media-libs/glew ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4] ) >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/krita:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=e01d34b2732f8a113e56756c40444b7c
diff --git a/metadata/md5-cache/app-office/kspread-2.3.3 b/metadata/md5-cache/app-office/kspread-2.3.3
deleted file mode 100644
index 35ff95e8ee0d..000000000000
--- a/metadata/md5-cache/app-office/kspread-2.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/eigen:2 solver? ( sci-libs/gsl ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice spreadsheet application
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=+solver aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:2 solver? ( sci-libs/gsl ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kspread:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=8c04a9a51c42ea7b231597977e5dbcd2
diff --git a/metadata/md5-cache/app-office/kword-2.3.3 b/metadata/md5-cache/app-office/kword-2.3.3
deleted file mode 100644
index 73fbff2dc3b1..000000000000
--- a/metadata/md5-cache/app-office/kword-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=wpd? ( app-text/libwpd ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice word processor
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=wpd aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=wpd? ( app-text/libwpd ) !app-text/wv2 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kword:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=511bf1295089e4537865af11a1879dea
diff --git a/metadata/md5-cache/app-office/kword-2.3.3-r1 b/metadata/md5-cache/app-office/kword-2.3.3-r1
deleted file mode 100644
index aea09b9e5b0f..000000000000
--- a/metadata/md5-cache/app-office/kword-2.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib gnome-extra/libgsf wpd? ( app-text/libwpd ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-DESCRIPTION=KOffice word processor
-EAPI=3
-HOMEPAGE=http://www.koffice.org/
-IUSE=wpd aqua debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib gnome-extra/libgsf wpd? ( app-text/libwpd ) !app-text/wv2 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] !app-office/kword:0 !app-office/koffice:0 !app-office/koffice-meta:0 media-gfx/imagemagick dev-cpp/eigen:2 media-libs/fontconfig media-libs/freetype:2 >=app-office/koffice-libs-2.3.3:2
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://kde/stable/koffice-2.3.3/koffice-2.3.3.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=f3f9e535af811d20ef5657d7167cfbcb
diff --git a/metadata/md5-cache/app-office/libalkimia-4.3.2 b/metadata/md5-cache/app-office/libalkimia-4.3.2
index a99f54dea0e2..cdde1a3f348c 100644
--- a/metadata/md5-cache/app-office/libalkimia-4.3.2
+++ b/metadata/md5-cache/app-office/libalkimia-4.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp[cxx] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-apps.org/CONTENT/content-files/137323-libalkimia-4.3.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e12e207434ca20888a5d97a0b0a1d8a
diff --git a/metadata/md5-cache/app-office/libreoffice-3.5.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-3.5.4.2-r1
index d9c7b08e2f30..43c59205e6a3 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.5.4.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-3.5.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) nlpsolver? ( java )
 RESTRICT=test
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.5.4.2.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.5.4.2.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.5.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/libreoffice-core-3.5.4.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/libreoffice-binfilter-3.5.4.2.tar.xz ) http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.5.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/src/libreoffice-core-3.5.4.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/src/libreoffice-binfilter-3.5.4.2.tar.xz ) http://download.documentfoundation.org/libreoffice/old/src/libreoffice-help-3.5.4.2.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3b87c538f6b4299f829bc7add65c088f
diff --git a/metadata/md5-cache/app-office/libreoffice-3.5.9999 b/metadata/md5-cache/app-office/libreoffice-3.5.9999
index 6387eab9bc56..c236e89fe976 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.5.9999
+++ b/metadata/md5-cache/app-office/libreoffice-3.5.9999
@@ -11,5 +11,5 @@ REQUIRED_USE=nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) nlpsolver? ( java )
 RESTRICT=test
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e7cf5c52b5ea16cc59aea79e0a0f260
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.9999 b/metadata/md5-cache/app-office/libreoffice-3.6.9999
index 5e157320202c..6516723af538 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.9999
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.9999
@@ -10,5 +10,5 @@ RDEPEND=app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes
 REQUIRED_USE=nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=973a72cf031505d3155ededd85b75436
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index d042d4a71a28..71669432ad48 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes
 REQUIRED_USE=nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=12464a983a70aaf0b0d932193afa3fde
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-3.5.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-3.5.4.2-r1
index c74b968e097f..56f32c4a72f5 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-3.5.4.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-3.5.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( kde? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-kde-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-base-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-bin-libreoffice-kde-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-bin-libreoffice-base-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz ) ) ) )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=56bafdfb9043e6fcd592757234bc20ff
diff --git a/metadata/md5-cache/app-office/lyx-1.6.10 b/metadata/md5-cache/app-office/lyx-1.6.10
index 37da01c9a957..fd0d8ca92097 100644
--- a/metadata/md5-cache/app-office/lyx-1.6.10
+++ b/metadata/md5-cache/app-office/lyx-1.6.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXrender x11-libs/libXfixes x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp dev-libs/libxml2 app-text/aiksaurus app-text/aspell media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick media-gfx/graphicsmagick ) cups? ( net-print/cups ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/noweb dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-1.6.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb3c4ff59e66a201c5fd6f85edede835
diff --git a/metadata/md5-cache/app-office/lyx-2.0.1 b/metadata/md5-cache/app-office/lyx-2.0.1
index 09bfeba8507a..a61e27d3ce26 100644
--- a/metadata/md5-cache/app-office/lyx-2.0.1
+++ b/metadata/md5-cache/app-office/lyx-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXrender x11-libs/libXfixes x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp dev-libs/libxml2 media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick media-gfx/graphicsmagick ) cups? ( net-print/cups ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science dev-texlive/texlive-genericextra dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) xetex? ( dev-texlive/texlive-xetex ) luatex? ( >=dev-texlive/texlive-luatex-2010 ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c11f2084f36a1859b858ce4e572b18f6
diff --git a/metadata/md5-cache/app-office/lyx-2.0.2 b/metadata/md5-cache/app-office/lyx-2.0.2
index 30acc3a30fa8..dc358a41bd89 100644
--- a/metadata/md5-cache/app-office/lyx-2.0.2
+++ b/metadata/md5-cache/app-office/lyx-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXrender x11-libs/libXfixes x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp dev-libs/libxml2 media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) cups? ( net-print/cups ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science dev-texlive/texlive-genericextra dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) xetex? ( dev-texlive/texlive-xetex ) luatex? ( >=dev-texlive/texlive-luatex-2010 ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] ) || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95d96db311fc2795b832c66c1bacbbda
diff --git a/metadata/md5-cache/app-office/lyx-2.0.3 b/metadata/md5-cache/app-office/lyx-2.0.3
index 3973426a9fc5..4d00844854fc 100644
--- a/metadata/md5-cache/app-office/lyx-2.0.3
+++ b/metadata/md5-cache/app-office/lyx-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) cups? ( net-print/cups ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science dev-texlive/texlive-genericextra dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) xetex? ( dev-texlive/texlive-xetex ) luatex? ( >=dev-texlive/texlive-luatex-2010 ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] ) || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=376f322234b94ae3830141fc02862001
diff --git a/metadata/md5-cache/app-office/osmo-0.2.10 b/metadata/md5-cache/app-office/osmo-0.2.10
index 83855876a4cf..b56a6603e7c6 100644
--- a/metadata/md5-cache/app-office/osmo-0.2.10
+++ b/metadata/md5-cache/app-office/osmo-0.2.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/libtar-1.2.11-r3 dev-libs/libxml2:2 dev-libs/libgringotts >=dev-libs/libical-0.33 app-text/gtkspell:2 gnome-extra/gtkhtml:2 >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=mirror://sourceforge/osmo-pim/osmo-0.2.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=109fc51f14d92020b833982398de398f
diff --git a/metadata/md5-cache/app-office/scribus-1.4.0-r2 b/metadata/md5-cache/app-office/scribus-1.4.0-r2
index 009a06e58efc..6d2337a551e8 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.0-r2
+++ b/metadata/md5-cache/app-office/scribus-1.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] x11-libs/qt-core:4 x11-libs/qt-gui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) app-text/ghostscript-gpl =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/scribus/scribus-1.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86163646eaa8f8f1b3d3e0a6b3a39e5d
diff --git a/metadata/md5-cache/app-office/scribus-1.4.1 b/metadata/md5-cache/app-office/scribus-1.4.1
index 5baca94ccf65..ec9a3964bc76 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.1
+++ b/metadata/md5-cache/app-office/scribus-1.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] x11-libs/qt-core:4 x11-libs/qt-gui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) app-text/ghostscript-gpl =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/scribus/1.4.1/scribus-1.4.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=803520c127b9db19086a42025dc885f7
diff --git a/metadata/md5-cache/app-office/scribus-1.4.9999 b/metadata/md5-cache/app-office/scribus-1.4.9999
index a0bbac4f7e2b..113b0cbfc944 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.9999
+++ b/metadata/md5-cache/app-office/scribus-1.4.9999
@@ -7,5 +7,5 @@ IUSE=cairo debug examples +minimal +pdf spell templates linguas_af linguas_ar li
 LICENSE=GPL-2
 RDEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] x11-libs/qt-core:4 x11-libs/qt-gui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) app-text/ghostscript-gpl =dev-lang/python-2*
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=099a477fc1ffdb1bd128a73c1e20aa7e
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 6e4686418639..72ae9adeefab 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -7,5 +7,5 @@ IUSE=cairo debug examples +minimal +pdf spell templates linguas_af linguas_ar li
 LICENSE=GPL-2
 RDEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib x11-libs/qt-core:4 x11-libs/qt-gui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) app-text/ghostscript-gpl =dev-lang/python-2*
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a00f53fec4073f8657f3a23c2caa4c7e
diff --git a/metadata/md5-cache/app-office/skrooge-1.3.0 b/metadata/md5-cache/app-office/skrooge-1.3.0
index 6c8f8eca594f..435afbcb7d36 100644
--- a/metadata/md5-cache/app-office/skrooge-1.3.0
+++ b/metadata/md5-cache/app-office/skrooge-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 dev-libs/grantlee >=dev-libs/libofx-0.9.1 x11-libs/qt-sql:4[sqlite] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.skrooge.org/files/skrooge-1.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4de7b0a098b186563dc4dc8d99cb93f
diff --git a/metadata/md5-cache/app-office/teapot-2.2.0 b/metadata/md5-cache/app-office/teapot-2.2.0
index f908554df379..47e1d8d33160 100644
--- a/metadata/md5-cache/app-office/teapot-2.2.0
+++ b/metadata/md5-cache/app-office/teapot-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses fltk? ( >=x11-libs/fltk-1.3.0:1 )
 SLOT=0
 SRC_URI=http://www.syntax-k.de/projekte/teapot/teapot-2.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0702a19e269c6f2d71e3b470892e366a
diff --git a/metadata/md5-cache/app-pda/coldsync-2.2.5-r1 b/metadata/md5-cache/app-pda/coldsync-2.2.5-r1
index 92361c9f07cc..ecedb61cf314 100644
--- a/metadata/md5-cache/app-pda/coldsync-2.2.5-r1
+++ b/metadata/md5-cache/app-pda/coldsync-2.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=perl? ( dev-lang/perl ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.coldsync.org/download/coldsync-2.2.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58e1f8d4c31db74873fe40febc11b196
diff --git a/metadata/md5-cache/app-pda/coldsync-3.0_pre4 b/metadata/md5-cache/app-pda/coldsync-3.0_pre4
index c767e4eef467..3d13829b089a 100644
--- a/metadata/md5-cache/app-pda/coldsync-3.0_pre4
+++ b/metadata/md5-cache/app-pda/coldsync-3.0_pre4
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=caps? ( sys-libs/libcap ) perl? ( dev-lang/perl ) usb? ( virtual/libusb:0 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.coldsync.org/download/coldsync-3.0-pre4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a43365295242124f75b731b55dceba0
diff --git a/metadata/md5-cache/app-pda/jpilot-backup-0.60 b/metadata/md5-cache/app-pda/jpilot-backup-0.60
index 5cf52c55cd7a..30603eef134d 100644
--- a/metadata/md5-cache/app-pda/jpilot-backup-0.60
+++ b/metadata/md5-cache/app-pda/jpilot-backup-0.60
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.18.9:2 >=app-pda/pilot-link-0.12.3 >=app-pda/jpilot-0.99.9 sys-libs/gdbm
 SLOT=0
 SRC_URI=http://www.jlogday.com/code/jpilot-backup/jpilot-backup-0.60.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d1a52b76997a99f9f22ddfe75f460a4
diff --git a/metadata/md5-cache/app-pda/libopensync-0.36-r2 b/metadata/md5-cache/app-pda/libopensync-0.36-r2
index b6f90ac00dfc..dcdf93e9ea95 100644
--- a/metadata/md5-cache/app-pda/libopensync-0.36-r2
+++ b/metadata/md5-cache/app-pda/libopensync-0.36-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/libxslt
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.36/libopensync-0.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ff58bb6f0975e9c6ce22855371b847b
diff --git a/metadata/md5-cache/app-pda/libopensync-0.39-r1 b/metadata/md5-cache/app-pda/libopensync-0.39-r1
index 4ed2c8ffe96f..7808d92d680b 100644
--- a/metadata/md5-cache/app-pda/libopensync-0.39-r1
+++ b/metadata/md5-cache/app-pda/libopensync-0.39-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.12:2 dev-libs/libxml2 dev-libs/libxslt
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/libopensync-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5823af502515fc265f882d78dc4e2d74
diff --git a/metadata/md5-cache/app-pda/libopensync-9999 b/metadata/md5-cache/app-pda/libopensync-9999
index c4f711a792e5..fd1e52331a00 100644
--- a/metadata/md5-cache/app-pda/libopensync-9999
+++ b/metadata/md5-cache/app-pda/libopensync-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.12:2 dev-libs/libxml2 dev-libs/libxslt
 RESTRICT=test
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9605b1303899da56c56e803e86aa01d
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.36 b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.36
index 69bb83376c48..5b9ff880689b 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.36
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.36
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND==app-pda/libopensync-0.36* gnome-extra/evolution-data-server
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.36/libopensync-plugin-evolution2-0.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0af638824c569d0a967b427f9beb3388
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.39 b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.39
index 5a008cc6a974..7e47f7aa6486 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.39
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-0.39
@@ -9,5 +9,5 @@ RDEPEND==app-pda/libopensync-0.39* dev-libs/glib:2 gnome-extra/evolution-data-se
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/libopensync-plugin-evolution2-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e35e28148f5706edcb22b0e46c3a00da
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-9999
index 815d84cb6c0e..06476109012f 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-evolution2-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND==app-pda/libopensync-9999* dev-libs/glib:2 gnome-extra/evolution-data-server
 RESTRICT=test
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=806f75cf20efe8772e09c4a8f788ba46
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-file-0.36 b/metadata/md5-cache/app-pda/libopensync-plugin-file-0.36
index 1fdb180232b6..902fd2977725 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-file-0.36
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-file-0.36
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-0.36 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.36/libopensync-plugin-file-0.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6871068813906443bb3ef2da10fafcd8
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-file-0.39 b/metadata/md5-cache/app-pda/libopensync-plugin-file-0.39
index f8a3e99725f9..bb661ab47876 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-file-0.39
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-file-0.39
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-0.39 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/libopensync-plugin-file-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7e1c48551b2b4abfbcb03b04d18134b
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-file-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-file-9999
index 11248ac37a2f..b91a70a965bf 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-file-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-file-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-9999 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1af6af78f5db0f24a662fd0192958db
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.22 b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.22
index 26d1b4447fae..ea91e38ac440 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.22
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.22
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==app-pda/libopensync-0.22* >=app-mobilephone/gnokii-0.6.14
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~peper/distfiles/libopensync-plugin-gnokii-0.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bae143b0e464424233752e2bfda534e
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.36 b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.36
index 26db4c35f318..59d07c75cb78 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.36
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-0.36
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==app-pda/libopensync-0.36* >=app-mobilephone/gnokii-0.6.14
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.36/libopensync-plugin-gnokii-0.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e11da1a197aa6aab817c4afc0c0d969
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-9999
index fe39fa545b40..b86a4991b331 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-gnokii-9999
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND==app-pda/libopensync-9999* >=app-mobilephone/gnokii-0.6.14
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ce48fa93b42f4e2aab07815de1c40c6
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-gpe-0.36 b/metadata/md5-cache/app-pda/libopensync-plugin-gpe-0.36
index 05ccc939ff45..ded1893ff807 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-gpe-0.36
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-gpe-0.36
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==app-pda/libopensync-0.36*
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.36/libopensync-plugin-gpe-0.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3115aeee63c5803c1afe5e26f7d9e8ff
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-gpe-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-gpe-9999
index 4e5384bd713c..450bfdcf20cd 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-gpe-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-gpe-9999
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND==app-pda/libopensync-9999*
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=229ce946c9932affbd7d427ea96298a1
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-irmc-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-irmc-9999
index e0345fcb6bf6..7329e00d94ad 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-irmc-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-irmc-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~app-pda/libopensync-9999 dev-libs/glib:2 dev-libs/libxml2 >=dev-libs/openobex-1.0[bluetooth?,irda?] bluetooth? ( net-wireless/bluez )
 REQUIRED_USE=|| ( bluetooth irda )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14a623d8a23e017bb632f153404c7d66
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-palm-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-palm-9999
index 13520a9b1691..fadd06151496 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-palm-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-palm-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-9999 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f78ae93ec9d7d23829967a2d082c2449
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-python-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-python-9999
index 6cd31c139198..4fa4d2c28e20 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-python-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-python-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-9999 dev-libs/glib:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ac25e4db539fed6300f5bf39bc49d72
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-syncml-0.39 b/metadata/md5-cache/app-pda/libopensync-plugin-syncml-0.39
index bc0a35c7ea6a..888c272c6150 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-syncml-0.39
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-syncml-0.39
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( http obex )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/libopensync-plugin-syncml-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c76c09985b2cbf52d41a1b6a24b761b
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-syncml-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-syncml-9999
index 4a0ba6142d0e..7b05c219a30f 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-syncml-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-syncml-9999
@@ -10,5 +10,5 @@ RDEPEND=~app-pda/libopensync-9999 ~app-pda/libsyncml-9999[obex?,http?] dev-libs/
 REQUIRED_USE=|| ( http obex )
 RESTRICT=test
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48c390195d7424520dc06a62991847e7
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-vformat-0.39 b/metadata/md5-cache/app-pda/libopensync-plugin-vformat-0.39
index e842fafc0d49..9856501edc9b 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-vformat-0.39
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-vformat-0.39
@@ -9,5 +9,5 @@ RDEPEND=~app-pda/libopensync-0.39 dev-libs/glib:2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/libopensync-plugin-vformat-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2e3cbfb87ac8e3e2227b66be05c1c94
diff --git a/metadata/md5-cache/app-pda/libopensync-plugin-vformat-9999 b/metadata/md5-cache/app-pda/libopensync-plugin-vformat-9999
index ecb82fc80dca..dbf7f834a4b5 100644
--- a/metadata/md5-cache/app-pda/libopensync-plugin-vformat-9999
+++ b/metadata/md5-cache/app-pda/libopensync-plugin-vformat-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~app-pda/libopensync-9999 dev-libs/glib:2
 RESTRICT=test
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0b75b61b9a37e38252271b4a771519c
diff --git a/metadata/md5-cache/app-pda/libplist-1.8 b/metadata/md5-cache/app-pda/libplist-1.8
index 733ec18c3bf4..5520bd439d9b 100644
--- a/metadata/md5-cache/app-pda/libplist-1.8
+++ b/metadata/md5-cache/app-pda/libplist-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 cython? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/libplist-1.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ba09e2a8f98229859ace4c5c0fa5c4f
diff --git a/metadata/md5-cache/app-pda/libplist-1.8-r1 b/metadata/md5-cache/app-pda/libplist-1.8-r1
index 6a031eb61f62..16b149b5ece7 100644
--- a/metadata/md5-cache/app-pda/libplist-1.8-r1
+++ b/metadata/md5-cache/app-pda/libplist-1.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 python? ( =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/libplist-1.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=405bb84304e5156916cab273eae3eef7
diff --git a/metadata/md5-cache/app-pda/libsyncml-0.5.4 b/metadata/md5-cache/app-pda/libsyncml-0.5.4
index 2f376758dff7..867e3b31f9b0 100644
--- a/metadata/md5-cache/app-pda/libsyncml-0.5.4
+++ b/metadata/md5-cache/app-pda/libsyncml-0.5.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.12 >=dev-libs/libwbxml-0.10 dev-libs/libxml2 http? ( net-libs/libsoup:2.4 ) obex? ( net-wireless/bluez >=dev-libs/openobex-1.1[bluetooth] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libsyncml/libsyncml-0.5.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3514b5f26a504338a8b1a910ed65f2ed
diff --git a/metadata/md5-cache/app-pda/libsyncml-9999 b/metadata/md5-cache/app-pda/libsyncml-9999
index cc0ac9b45dce..a5696403222a 100644
--- a/metadata/md5-cache/app-pda/libsyncml-9999
+++ b/metadata/md5-cache/app-pda/libsyncml-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.12 >=dev-libs/libwbxml-0.10 dev-libs/libxml2 http? ( net-libs/libsoup:2.4 ) obex? ( net-wireless/bluez >=dev-libs/openobex-1.1[bluetooth] )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a46bf23b213bced67aa5037686d367ae
diff --git a/metadata/md5-cache/app-pda/multisync-gui-0.92.0_pre20080531 b/metadata/md5-cache/app-pda/multisync-gui-0.92.0_pre20080531
index 09cca79be1bd..71043726c5d6 100644
--- a/metadata/md5-cache/app-pda/multisync-gui-0.92.0_pre20080531
+++ b/metadata/md5-cache/app-pda/multisync-gui-0.92.0_pre20080531
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=~app-pda/libopensync-0.36 >=dev-libs/libxml2-2.6.30 >=gnome-base/libglade-2.6.2:2.0 >=x11-libs/gtk+-2.21:2
 SLOT=0
 SRC_URI=mirror://gentoo/multisync-gui-0.92.0_pre20080531.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bb4706febbd75432332a2b1d23aefbd
diff --git a/metadata/md5-cache/app-pda/osynctool-0.39 b/metadata/md5-cache/app-pda/osynctool-0.39
index de6c578562a4..fb6247f005ba 100644
--- a/metadata/md5-cache/app-pda/osynctool-0.39
+++ b/metadata/md5-cache/app-pda/osynctool-0.39
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=~app-pda/libopensync-0.39 dev-libs/glib:2 !app-pda/msynctool
 SLOT=0
 SRC_URI=http://www.opensync.org/download/releases/0.39/osynctool-0.39.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b982a16ac2e739dd0f7d84ad02ec5bda
diff --git a/metadata/md5-cache/app-pda/osynctool-9999 b/metadata/md5-cache/app-pda/osynctool-9999
index 0523bf692d0b..0d1e6affb1a8 100644
--- a/metadata/md5-cache/app-pda/osynctool-9999
+++ b/metadata/md5-cache/app-pda/osynctool-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=~app-pda/libopensync-9999 dev-libs/glib:2 !app-pda/msynctool
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d71dc482edefcdb58c105dca90dd5e6
diff --git a/metadata/md5-cache/app-pda/p3nfs-5.19-r2 b/metadata/md5-cache/app-pda/p3nfs-5.19-r2
index c8eee56a2074..911b1820b345 100644
--- a/metadata/md5-cache/app-pda/p3nfs-5.19-r2
+++ b/metadata/md5-cache/app-pda/p3nfs-5.19-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( net-nds/portmap net-nds/rpcbind )
 SLOT=0
 SRC_URI=http://www.koeniglich.de/packages/p3nfs-5.19.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed35949fe1f2266e4accc219deed92d9
diff --git a/metadata/md5-cache/app-pda/synce-core-0.16 b/metadata/md5-cache/app-pda/synce-core-0.16
index bfd82eab4251..d1f21ca4a9c4 100644
--- a/metadata/md5-cache/app-pda/synce-core-0.16
+++ b/metadata/md5-cache/app-pda/synce-core-0.16
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!app-pda/synce-connector >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 !dev-libs/librapi2 !dev-libs/libsynce net-dialup/ppp sys-apps/net-tools || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) python? ( >=dev-python/pyrex-0.9.6 dev-python/python-gudev ) python? ( =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=mirror://sourceforge/synce/synce-core-0.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14f1d1f5f9739c34cfc8a47ce27f3f04
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.0.7-r1 b/metadata/md5-cache/app-pda/usbmuxd-1.0.7-r1
index 31fcc190278a..6a6091560a1b 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.0.7-r1
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1
 RDEPEND=app-pda/libplist virtual/libusb:1
 SLOT=0
 SRC_URI=http://marcansoft.com/uploads/usbmuxd/usbmuxd-1.0.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a63b37c87fcc6a2295ed61eb2bff013b
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.0.8 b/metadata/md5-cache/app-pda/usbmuxd-1.0.8
index 2d738b2542d0..b5470d4c4f8c 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.0.8
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1
 RDEPEND=>=app-pda/libplist-1.8-r1 virtual/libusb:1
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/usbmuxd-1.0.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=936e7f5887a2003ecea1c27268a8adef
diff --git a/metadata/md5-cache/app-portage/deltup-0.4.4 b/metadata/md5-cache/app-portage/deltup-0.4.4
index 191918d69c31..fe97daf07db5 100644
--- a/metadata/md5-cache/app-portage/deltup-0.4.4
+++ b/metadata/md5-cache/app-portage/deltup-0.4.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sys-libs/zlib >=app-arch/bzip2-1.0.0 || ( dev-util/bdelta =dev-util/xdelta-1* ) >=app-arch/bzip2-1.0.4
 SLOT=0
 SRC_URI=http://deltup.org/e107_files/downloads//deltup-0.4.4.tar.gz http://www.bzip.org/1.0.2/bzip2-1.0.2.tar.gz http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14112334b77430e834695759c220b540
diff --git a/metadata/md5-cache/app-portage/kportagetray-0.2.4 b/metadata/md5-cache/app-portage/kportagetray-0.2.4
index d932f3e03f23..389e13242313 100644
--- a/metadata/md5-cache/app-portage/kportagetray-0.2.4
+++ b/metadata/md5-cache/app-portage/kportagetray-0.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/PyQt4[svg,dbus] >=kde-base/pykde4-4.4:4[aqua=] app-portage/eix app-portage/genlop >=kde-base/kdesu-4.4:4[aqua=] >=kde-base/knotify-4.4:4[aqua=] >=kde-base/konsole-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://sourceforge/kportagetray/kportagetray-0.2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f44a3fb13238a1e41a1852aa8fe5b814
diff --git a/metadata/md5-cache/app-portage/kportagetray-0.2.4-r1 b/metadata/md5-cache/app-portage/kportagetray-0.2.4-r1
index 9c2bf3862a08..b0fab6625858 100644
--- a/metadata/md5-cache/app-portage/kportagetray-0.2.4-r1
+++ b/metadata/md5-cache/app-portage/kportagetray-0.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/PyQt4[svg,dbus] >=kde-base/pykde4-4.4:4[aqua=] app-portage/eix app-portage/genlop >=kde-base/kdesu-4.4:4[aqua=] >=kde-base/knotify-4.4:4[aqua=] >=kde-base/konsole-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://sourceforge/kportagetray/kportagetray-0.2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5c7c552a556bcda47388c9721caad18a
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.10 b/metadata/md5-cache/app-portage/portage-utils-0.10
index 98b2c47789d1..ec0f11799985 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.10
+++ b/metadata/md5-cache/app-portage/portage-utils-0.10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.10.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5df463f8c5e5df80aaa9c6819ecfadd
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.3.1 b/metadata/md5-cache/app-portage/portage-utils-0.3.1
index 52d9faf9a6ce..efa34da2f4a0 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.3.1
+++ b/metadata/md5-cache/app-portage/portage-utils-0.3.1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbs
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=717877d643355fb7508f220bdd207d74
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.4 b/metadata/md5-cache/app-portage/portage-utils-0.4
index 987a8583faa6..9ebfce899816 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.4
+++ b/metadata/md5-cache/app-portage/portage-utils-0.4
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f2c03ffe980b2e01824522191bd97d9
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.5 b/metadata/md5-cache/app-portage/portage-utils-0.5
index 3319ea870c12..4032339b41f1 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.5
+++ b/metadata/md5-cache/app-portage/portage-utils-0.5
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.5.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03dbc5663aa8ffdad1c01c292544031a
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.6 b/metadata/md5-cache/app-portage/portage-utils-0.6
index 4053f5c49b46..54986791d937 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.6
+++ b/metadata/md5-cache/app-portage/portage-utils-0.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.6.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=412a962b4a9f2376e5d5b5dfe73a64db
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.8 b/metadata/md5-cache/app-portage/portage-utils-0.8
index e584f7217501..c7e2f2e71b02 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.8
+++ b/metadata/md5-cache/app-portage/portage-utils-0.8
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.8.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c912bd5a9dce1057db4b416d1834420e
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.9 b/metadata/md5-cache/app-portage/portage-utils-0.9
index 24f5555f5976..548ab260fc32 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.9
+++ b/metadata/md5-cache/app-portage/portage-utils-0.9
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.9.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32c597b4ba1ab82fa89260cc5d143da0
diff --git a/metadata/md5-cache/app-shells/bash-3.1_p17 b/metadata/md5-cache/app-shells/bash-3.1_p17
index f5c9cb574284..5b52f8404e71 100644
--- a/metadata/md5-cache/app-shells/bash-3.1_p17
+++ b/metadata/md5-cache/app-shells/bash-3.1_p17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/readline51-001 mirror://gnu/bash/readline-5.1-patches/readline51-001
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98a52f574a4aff944d1df169a22ec4d1
diff --git a/metadata/md5-cache/app-shells/bash-3.2_p51 b/metadata/md5-cache/app-shells/bash-3.2_p51
index 38f4e1261a09..742bb6aa6d56 100644
--- a/metadata/md5-cache/app-shells/bash-3.2_p51
+++ b/metadata/md5-cache/app-shells/bash-3.2_p51
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.5 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-051
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c064e59a468c3a58545cd8ec3f3a32c
diff --git a/metadata/md5-cache/app-shells/bash-4.0_p38 b/metadata/md5-cache/app-shells/bash-4.0_p38
index eb59d6ba2539..f862125dfb2b 100644
--- a/metadata/md5-cache/app-shells/bash-4.0_p38
+++ b/metadata/md5-cache/app-shells/bash-4.0_p38
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.5 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10d0bcef5ad7be8b63979737a5965730
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p10 b/metadata/md5-cache/app-shells/bash-4.1_p10
index 9f9eb66ea94d..e7db3ed3318f 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p10
+++ b/metadata/md5-cache/app-shells/bash-4.1_p10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9f3c6df6729fc4d71125b471ff0234d
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p11 b/metadata/md5-cache/app-shells/bash-4.1_p11
index aea53d8ae3ab..eed3516e7a6f 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p11
+++ b/metadata/md5-cache/app-shells/bash-4.1_p11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb83fbee852b337db8ddbb611bf7abb7
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p7 b/metadata/md5-cache/app-shells/bash-4.1_p7
index 2c339b2409fd..582d66b51754 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p7
+++ b/metadata/md5-cache/app-shells/bash-4.1_p7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b75709e3b057f59b42e88d3c8de35a2c
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p9 b/metadata/md5-cache/app-shells/bash-4.1_p9
index d7a9974d5576..676441e55d6c 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p9
+++ b/metadata/md5-cache/app-shells/bash-4.1_p9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f53313acfbcd550634623b5acdc04cc
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p10 b/metadata/md5-cache/app-shells/bash-4.2_p10
index 74d925428a22..460c207cd3fd 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p10
+++ b/metadata/md5-cache/app-shells/bash-4.2_p10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6d3d7dcc5fb2d74a943f55fe360d449
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p20 b/metadata/md5-cache/app-shells/bash-4.2_p20
index d5a9d75c0dca..7535d4824a6f 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p20
+++ b/metadata/md5-cache/app-shells/bash-4.2_p20
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 >=sys-libs/readline-6.2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07632fcb596c3a0eaa7844f8dbb2532b
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p24 b/metadata/md5-cache/app-shells/bash-4.2_p24
index b262a5240014..07179d5605b3 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p24
+++ b/metadata/md5-cache/app-shells/bash-4.2_p24
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88e7723cf11a085f977a75903ba5a614
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p24-r1 b/metadata/md5-cache/app-shells/bash-4.2_p24-r1
index 20f236ed530d..e168cb061b4e 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p24-r1
+++ b/metadata/md5-cache/app-shells/bash-4.2_p24-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd5553144a8424521c65e88127433ac0
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p28 b/metadata/md5-cache/app-shells/bash-4.2_p28
index 88cfb2661058..871ec4ea26a7 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p28
+++ b/metadata/md5-cache/app-shells/bash-4.2_p28
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22c109882c4580644db09ba6bab18314
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p29 b/metadata/md5-cache/app-shells/bash-4.2_p29
index 10d5db406043..99ea6829eb89 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p29
+++ b/metadata/md5-cache/app-shells/bash-4.2_p29
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2054b6af62fc9ccf077661d975bbf691
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p8-r1 b/metadata/md5-cache/app-shells/bash-4.2_p8-r1
index ed7c7e1864fd..4ae3be609798 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p8-r1
+++ b/metadata/md5-cache/app-shells/bash-4.2_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=402d9e14fc8d4a16d5e17906cd010220
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.2 b/metadata/md5-cache/app-shells/dash-0.5.5.1.2
index 5ebcc645ca41..a0b42a42c705 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.2
+++ b/metadata/md5-cache/app-shells/dash-0.5.5.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.5.1.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.5.1-2.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee06d7434ec67fd7d21bf0640b8092be
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.7 b/metadata/md5-cache/app-shells/dash-0.5.5.1.7
index a04f89e85028..182b1033610c 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.7
+++ b/metadata/md5-cache/app-shells/dash-0.5.5.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.5.1.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.5.1-7.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f605c759411cbf3dd0e0e29311a03921
diff --git a/metadata/md5-cache/app-shells/dash-0.5.7.1 b/metadata/md5-cache/app-shells/dash-0.5.7.1
index 9a3e503ad330..20b60152faf2 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.7.1
+++ b/metadata/md5-cache/app-shells/dash-0.5.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.7-1.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45746cea566ae7179cdeaf146ff4ea4c
diff --git a/metadata/md5-cache/app-shells/esh-0.8.5-r1 b/metadata/md5-cache/app-shells/esh-0.8.5-r1
index c758f197f38c..977ee04d16e7 100644
--- a/metadata/md5-cache/app-shells/esh-0.8.5-r1
+++ b/metadata/md5-cache/app-shells/esh-0.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
 SLOT=0
 SRC_URI=http://slon.ttk.ru/esh/esh-0.8.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c98c5b0b165ce3308342a7e75b11be8
diff --git a/metadata/md5-cache/app-shells/sash-3.7-r1 b/metadata/md5-cache/app-shells/sash-3.7-r1
index 052410d1f9fc..5c0248c34072 100644
--- a/metadata/md5-cache/app-shells/sash-3.7-r1
+++ b/metadata/md5-cache/app-shells/sash-3.7-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.canb.auug.org.au/~dbell/programs/sash-3.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c8aa9b8640e11f447e878c01a55e0b4
diff --git a/metadata/md5-cache/app-shells/sash-3.7-r3 b/metadata/md5-cache/app-shells/sash-3.7-r3
index a55d24d28bc2..0be874fc8c66 100644
--- a/metadata/md5-cache/app-shells/sash-3.7-r3
+++ b/metadata/md5-cache/app-shells/sash-3.7-r3
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=!static? ( static? ( sys-libs/zlib[static-libs] ) !static? ( >=sys-libs/zlib-1.2.3 ) )
 SLOT=0
 SRC_URI=http://www.canb.auug.org.au/~dbell/programs/sash-3.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41a886443243fbab7c915aff6e524c60
diff --git a/metadata/md5-cache/app-shells/tcsh-6.17-r1 b/metadata/md5-cache/app-shells/tcsh-6.17-r1
index b4c1121ad483..8bfadef2f2a8 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.17-r1
+++ b/metadata/md5-cache/app-shells/tcsh-6.17-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/old/tcsh-6.17.00.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0456b1068e569ed82c4e94532c5e7d4f
diff --git a/metadata/md5-cache/app-shells/tcsh-6.17.06 b/metadata/md5-cache/app-shells/tcsh-6.17.06
index f2584c506bdf..35079dff66af 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.17.06
+++ b/metadata/md5-cache/app-shells/tcsh-6.17.06
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/beta/tcsh-6.17.06.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c00a0abcd05c8b0b190e5f99339c2646
diff --git a/metadata/md5-cache/app-shells/tcsh-6.18.01 b/metadata/md5-cache/app-shells/tcsh-6.18.01
index 40f8d039af2c..884569eb2e2a 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.18.01
+++ b/metadata/md5-cache/app-shells/tcsh-6.18.01
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1 virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.18.01.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf7d9477cd24042e4a0ee92d4cecfca0
diff --git a/metadata/md5-cache/app-shells/zsh-4.3.15 b/metadata/md5-cache/app-shells/zsh-4.3.15
index 8f64ad96759d..5d070ca9056e 100644
--- a/metadata/md5-cache/app-shells/zsh-4.3.15
+++ b/metadata/md5-cache/app-shells/zsh-4.3.15
@@ -10,5 +10,5 @@ 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.15.tar.bz2 ftp://ftp.zsh.org/pub/zsh-4.3.15.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-4.3.15-doc.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbfaeebfaf15e136ec57f1b5cfbf5d97
diff --git a/metadata/md5-cache/app-shells/zsh-4.3.17 b/metadata/md5-cache/app-shells/zsh-4.3.17
index 65473028e5d1..4fe210cd4ffd 100644
--- a/metadata/md5-cache/app-shells/zsh-4.3.17
+++ b/metadata/md5-cache/app-shells/zsh-4.3.17
@@ -10,5 +10,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30c55f1bc334cf14435e0e346a31b9de
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r3 b/metadata/md5-cache/app-text/a2ps-4.14-r3
index 84358db3d182..1d7e6349e501 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r3
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r3
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9f441084f0caf203c7edb0b02654825
diff --git a/metadata/md5-cache/app-text/aiksaurus-1.2.1 b/metadata/md5-cache/app-text/aiksaurus-1.2.1
index 116e01f2f461..62fb6818d2bf 100644
--- a/metadata/md5-cache/app-text/aiksaurus-1.2.1
+++ b/metadata/md5-cache/app-text/aiksaurus-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9948e6d7df53bf714984069d37d59741
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.1 b/metadata/md5-cache/app-text/apvlv-0.1.1
index 52fd79a9e730..c1e45f68b3c6 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.1
+++ b/metadata/md5-cache/app-text/apvlv-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10.4:2 >=app-text/poppler-0.12.3-r3[cairo] <app-text/poppler-0.18 djvu? ( app-text/djvu )
 SLOT=0
 SRC_URI=http://apvlv.googlecode.com/files/apvlv-0.1.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=008d0fc0281c5156f8eaf7bb63b87c91
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.2 b/metadata/md5-cache/app-text/apvlv-0.1.2
index 29fd10c81ea2..18fd4a4daae5 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10.4:2 >=app-text/poppler-0.12.3-r3[cairo] <app-text/poppler-0.18 djvu? ( app-text/djvu )
 SLOT=0
 SRC_URI=mirror://github/naihe2010/apvlv/apvlv-0.1.2-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ad8b89c2ff7a43fdf623277a320e8fa
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.2-r1 b/metadata/md5-cache/app-text/apvlv-0.1.2-r1
index a0536ceb43b8..75ac38b17fb3 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.2-r1
+++ b/metadata/md5-cache/app-text/apvlv-0.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10.4:2 >=app-text/poppler-0.18[cairo] djvu? ( app-text/djvu )
 SLOT=0
 SRC_URI=mirror://github/naihe2010/apvlv/apvlv-0.1.2-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8903ee7d168ee4f11fe827d92f48a7d7
diff --git a/metadata/md5-cache/app-text/aspell-0.50.5-r4 b/metadata/md5-cache/app-text/aspell-0.50.5-r4
index 2775d6e9cc09..c49112d5e99b 100644
--- a/metadata/md5-cache/app-text/aspell-0.50.5-r4
+++ b/metadata/md5-cache/app-text/aspell-0.50.5-r4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 gpm? ( sys-libs/gpm )
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.50.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f9913284d55aeec7ad8fdbf410c55aa
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1 b/metadata/md5-cache/app-text/aspell-0.60.6.1
index d6b06bddd0d2..76e9f1b54a24 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1
@@ -10,5 +10,5 @@ PDEPEND=app-dicts/aspell-en linguas_af? ( app-dicts/aspell-af ) linguas_be? ( ap
 RDEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dcc3365d198d29648af8e99516fc09e
diff --git a/metadata/md5-cache/app-text/bibletime-2.3.3 b/metadata/md5-cache/app-text/bibletime-2.3.3
index 2f5312afcbd4..ad7e60314b8f 100644
--- a/metadata/md5-cache/app-text/bibletime-2.3.3
+++ b/metadata/md5-cache/app-text/bibletime-2.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/sword-1.6.0 >=dev-cpp/clucene-0.9.16a >=x11-libs/qt-core-4.4.0:4 >=x11-libs/qt-dbus-4.4.0:4 >=x11-libs/qt-gui-4.4.0:4 >=x11-libs/qt-svg-4.4.0:4 >=x11-libs/qt-webkit-4.4.0:4
 SLOT=0
 SRC_URI=mirror://sourceforge/bibletime/bibletime-2.3.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60f3dc06eb26265ef5e8e7ef4096c993
diff --git a/metadata/md5-cache/app-text/bibletime-2.6 b/metadata/md5-cache/app-text/bibletime-2.6
index 7ce3925b82fa..92bccf9a3981 100644
--- a/metadata/md5-cache/app-text/bibletime-2.6
+++ b/metadata/md5-cache/app-text/bibletime-2.6
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/sword-1.6.0 >=dev-cpp/clucene-0.9.16a x11-libs/qt-dbus:4 x11-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/bibletime/bibletime-2.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad7a8a4a6427cb5c8ea37e3de28e8866
diff --git a/metadata/md5-cache/app-text/cb2bib-1.4.8 b/metadata/md5-cache/app-text/cb2bib-1.4.8
index 708929032d92..7d10e2d1b008 100644
--- a/metadata/md5-cache/app-text/cb2bib-1.4.8
+++ b/metadata/md5-cache/app-text/cb2bib-1.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 lzo? ( dev-libs/lzo )
 SLOT=0
 SRC_URI=http://www.molspaces.com/dl/progs/cb2bib-1.4.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19c30e123463af765e9067b813250bdd
diff --git a/metadata/md5-cache/app-text/cmigemo-1.3c-r1 b/metadata/md5-cache/app-text/cmigemo-1.3c-r1
index 8ec656bd683a..bb5d96472063 100644
--- a/metadata/md5-cache/app-text/cmigemo-1.3c-r1
+++ b/metadata/md5-cache/app-text/cmigemo-1.3c-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-dicts/migemo-dict-200812[unicode=] emacs? ( >=app-text/migemo-0.40-r1 )
 SLOT=0
 SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c-MIT.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cdd62236d23f79b7076ac9777348b157
diff --git a/metadata/md5-cache/app-text/cmigemo-1.3c-r2 b/metadata/md5-cache/app-text/cmigemo-1.3c-r2
index 2d5722207230..8b8afa3f889d 100644
--- a/metadata/md5-cache/app-text/cmigemo-1.3c-r2
+++ b/metadata/md5-cache/app-text/cmigemo-1.3c-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=emacs? ( >=app-text/migemo-0.40-r1 )
 SLOT=0
 SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c-MIT.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41e7369b0bf54f2e73d25647153bdfdf
diff --git a/metadata/md5-cache/app-text/cuneiform-1.1.0 b/metadata/md5-cache/app-text/cuneiform-1.1.0
index 38aef30f5778..e6662b238233 100644
--- a/metadata/md5-cache/app-text/cuneiform-1.1.0
+++ b/metadata/md5-cache/app-text/cuneiform-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=imagemagick? ( media-gfx/imagemagick )
 SLOT=0
 SRC_URI=http://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75b239be9d05e7f6d84f8c40edea44e8
diff --git a/metadata/md5-cache/app-text/cuneiform-1.1.0-r1 b/metadata/md5-cache/app-text/cuneiform-1.1.0-r1
index 8b138e3b1f92..e11413a7f2ef 100644
--- a/metadata/md5-cache/app-text/cuneiform-1.1.0-r1
+++ b/metadata/md5-cache/app-text/cuneiform-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=imagemagick? ( media-gfx/imagemagick ) graphicsmagick? ( media-gfx/graph
 REQUIRED_USE=^^ ( imagemagick graphicsmagick )
 SLOT=0
 SRC_URI=http://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cdbdb7c591ae0c818b5cc36b1b774eca
diff --git a/metadata/md5-cache/app-text/djview-4.7 b/metadata/md5-cache/app-text/djview-4.7
index 3851b749dbed..8d58b8c58ae3 100644
--- a/metadata/md5-cache/app-text/djview-4.7
+++ b/metadata/md5-cache/app-text/djview-4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b6e2df85f7e874472bea50fdcda07f4
diff --git a/metadata/md5-cache/app-text/djview-4.8 b/metadata/md5-cache/app-text/djview-4.8
index 471aac590d4f..a5d8af157398 100644
--- a/metadata/md5-cache/app-text/djview-4.8
+++ b/metadata/md5-cache/app-text/djview-4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=828b3aeed43fe5f59d65a4ec62a1fdd2
diff --git a/metadata/md5-cache/app-text/djvu-3.5.24-r1 b/metadata/md5-cache/app-text/djvu-3.5.24-r1
index 963f699b647c..c9d08479829a 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.24-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.24-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.24.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8b2bb99ac85a15e657f4d891a11b473
diff --git a/metadata/md5-cache/app-text/ebook-tools-0.1.1-r1 b/metadata/md5-cache/app-text/ebook-tools-0.1.1-r1
index b718c7848a42..bd478885e11e 100644
--- a/metadata/md5-cache/app-text/ebook-tools-0.1.1-r1
+++ b/metadata/md5-cache/app-text/ebook-tools-0.1.1-r1
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2 dev-libs/libzip app-text/convertlit
 SLOT=0
 SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-0.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2a4ef89133aaaf8a943a87d057b30df
diff --git a/metadata/md5-cache/app-text/ebook-tools-0.2.1 b/metadata/md5-cache/app-text/ebook-tools-0.2.1
index 12d1e0374dd0..95b08b45a9ff 100644
--- a/metadata/md5-cache/app-text/ebook-tools-0.2.1
+++ b/metadata/md5-cache/app-text/ebook-tools-0.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2 dev-libs/libzip app-text/convertlit
 SLOT=0
 SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-0.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fe97ca8ffcb626c60201e65669f55cc
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4 b/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
index bd52cce4c369..8f2be8e4ebc3 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.04-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.04.tar.bz2 mirror://gentoo/ghostscript-gpl-9.04-patchset-3.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4766557560353051c5ddb0757be59fde
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
index 7947daaf311a..ad8fb95efa2f 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d174ae06ba9bd5194f9528fa8598f80e
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
index 93383c79e9c6..3c5d61e54e91 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.05-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-2.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=517bfb7e4ea849ff24107acbffc126a6
diff --git a/metadata/md5-cache/app-text/gv-3.7.3-r1 b/metadata/md5-cache/app-text/gv-3.7.3-r1
index 1fd9178326e3..990dff675543 100644
--- a/metadata/md5-cache/app-text/gv-3.7.3-r1
+++ b/metadata/md5-cache/app-text/gv-3.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode?] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://gnu/gv/gv-3.7.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a45d4a75249ea2bce5dbceb69ccf4f19
diff --git a/metadata/md5-cache/app-text/hunspell-1.3.2-r3 b/metadata/md5-cache/app-text/hunspell-1.3.2-r3
index 81c48abdedaf..ce2c21f7a0e4 100644
--- a/metadata/md5-cache/app-text/hunspell-1.3.2-r3
+++ b/metadata/md5-cache/app-text/hunspell-1.3.2-r3
@@ -10,5 +10,5 @@ PDEPEND=app-dicts/myspell-en linguas_af? ( app-dicts/myspell-af ) linguas_bg? (
 RDEPEND=ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hunspell-1.3.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca6ce8f00f1fa59c11da2819bff3a982
diff --git a/metadata/md5-cache/app-text/kbibtex-0.4 b/metadata/md5-cache/app-text/kbibtex-0.4
index 970cfc6d292e..00ece3323bb2 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.4
+++ b/metadata/md5-cache/app-text/kbibtex-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt4] dev-libs/libxml2 dev-libs/libxslt virtual/tex-base dev-tex/bibtex2html >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://download.gna.org/kbibtex/0.4/kbibtex-0.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b2ff83b2e883930d2795dbf394bee018
diff --git a/metadata/md5-cache/app-text/kchmviewer-6.0 b/metadata/md5-cache/app-text/kchmviewer-6.0
index deed148301cb..a2efb5cd0cbe 100644
--- a/metadata/md5-cache/app-text/kchmviewer-6.0
+++ b/metadata/md5-cache/app-text/kchmviewer-6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/chmlib >=x11-libs/qt-dbus-4.5:4 >=x11-libs/qt-webkit-4.5:4 !kde? ( >=x11-libs/qt-gui-4.5:4 ) kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] )
 SLOT=0
 SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-6.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=05746d6fad94a1e2ceec87a9cf9272be
diff --git a/metadata/md5-cache/app-text/kding-0.6 b/metadata/md5-cache/app-text/kding-0.6
index f44feb8b8d66..7eba0954ca5c 100644
--- a/metadata/md5-cache/app-text/kding-0.6
+++ b/metadata/md5-cache/app-text/kding-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.rexi.org/downloads/kding/kding-0.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b735fc298f65053715af2a99bd96f780
diff --git a/metadata/md5-cache/app-text/kiwix-0.9_beta5 b/metadata/md5-cache/app-text/kiwix-0.9_beta5
deleted file mode 100644
index 3e8e5f310e0e..000000000000
--- a/metadata/md5-cache/app-text/kiwix-0.9_beta5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils =dev-cpp/clucene-0.9* dev-lang/perl dev-libs/icu dev-libs/xapian net-libs/libmicrohttpd =net-libs/xulrunner-1.9* >=net-misc/aria2-1.10 !!<app-text/kiwix-0.9_beta virtual/pkgconfig
-DESCRIPTION=A ZIM reader, especially for offline web content retrieved from Wikipedia
-EAPI=3
-HOMEPAGE=http://www.kiwix.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils =dev-cpp/clucene-0.9* dev-lang/perl dev-libs/icu dev-libs/xapian net-libs/libmicrohttpd =net-libs/xulrunner-1.9* >=net-misc/aria2-1.10 !!<app-text/kiwix-0.9_beta
-SLOT=0
-SRC_URI=mirror://sourceforge/kiwix/kiwix-0.9-beta5-src.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1642de2a63e3b50438bed67410e91b49
diff --git a/metadata/md5-cache/app-text/multitail-5.2.9 b/metadata/md5-cache/app-text/multitail-5.2.9
index ddde2452a451..37f8114477d8 100644
--- a/metadata/md5-cache/app-text/multitail-5.2.9
+++ b/metadata/md5-cache/app-text/multitail-5.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.vanheusden.com/multitail/multitail-5.2.9.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04a722e14c34d04708e439193a9f4868
diff --git a/metadata/md5-cache/app-text/mupdf-1.0 b/metadata/md5-cache/app-text/mupdf-1.0
index c3e084b4af2e..d8c967e66919 100644
--- a/metadata/md5-cache/app-text/mupdf-1.0
+++ b/metadata/md5-cache/app-text/mupdf-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 SRC_URI=http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61e95082bf504d54f33fe7599b9f46ec
diff --git a/metadata/md5-cache/app-text/mupdf-9999 b/metadata/md5-cache/app-text/mupdf-9999
index a39028af67af..98ae4ab6fcaa 100644
--- a/metadata/md5-cache/app-text/mupdf-9999
+++ b/metadata/md5-cache/app-text/mupdf-9999
@@ -7,5 +7,5 @@ IUSE=X vanilla
 LICENSE=GPL-3
 RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ddb81bc138655bcdc39c6e3e7d34f77
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r3 b/metadata/md5-cache/app-text/openjade-1.3.2-r3
index 7bda322fb1b8..0b4aa3a9b8b1 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r3
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11e59140942f008b6ee9071336cec8b6
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r4 b/metadata/md5-cache/app-text/openjade-1.3.2-r4
index c2c6f0b81069..499620b9d84b 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r4
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r4
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=045306c081258ba069089fece1723c76
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r2 b/metadata/md5-cache/app-text/opensp-1.5.2-r2
index 8eb302c9705e..b64017f14ded 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r2
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=JamesClark
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=158685963ab495db4372b78eaebcc93b
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index f1cfa66aa0be..89fbae822e1c 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x8
 LICENSE=JamesClark
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3494dcdb7b434ff1395401970eeca7d6
diff --git a/metadata/md5-cache/app-text/pandoc-1.9.4.1 b/metadata/md5-cache/app-text/pandoc-1.9.4.1-r1
similarity index 98%
rename from metadata/md5-cache/app-text/pandoc-1.9.4.1
rename to metadata/md5-cache/app-text/pandoc-1.9.4.1-r1
index aa725dc6a137..a47ba58e0bbc 100644
--- a/metadata/md5-cache/app-text/pandoc-1.9.4.1
+++ b/metadata/md5-cache/app-text/pandoc-1.9.4.1-r1
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND==dev-haskell/base64-bytestring-0.1*[profile?] =dev-haskell/blaze-html-0.5*[profile?] >=dev-haskell/citeproc-hs-0.3.4[profile?] <dev-haskell/citeproc-hs-0.4[profile?] >=dev-haskell/highlighting-kate-0.5.1[profile?] <dev-haskell/highlighting-kate-0.6[profile?] >=dev-haskell/http-4000.0.5[profile?] <dev-haskell/http-4000.3[profile?] >=dev-haskell/json-0.4[profile?] <dev-haskell/json-0.6[profile?] >=dev-haskell/mtl-1.1[profile?] <dev-haskell/mtl-2.2[profile?] >=dev-haskell/network-2[profile?] <dev-haskell/network-2.4[profile?] >=dev-haskell/pandoc-types-1.9.0.2[profile?] <dev-haskell/pandoc-types-1.10[profile?] =dev-haskell/parsec-3.1*[profile?] >=dev-haskell/random-1[profile?] <dev-haskell/random-1.1[profile?] >=dev-haskell/syb-0.1[profile?] <dev-haskell/syb-0.4[profile?] >=dev-haskell/tagsoup-0.12.5[profile?] <dev-haskell/tagsoup-0.13[profile?] =dev-haskell/temporary-1.1*[profile?] >=dev-haskell/texmath-0.6.0.2[profile?] <dev-haskell/texmath-0.7[profile?] >=dev-haskell/time-1.2[profile?] <dev-haskell/time-1.5[profile?] =dev-haskell/utf8-string-0.3*[profile?] >=dev-haskell/xml-1.3.12[profile?] <dev-haskell/xml-1.4[profile?] >=dev-haskell/zip-archive-0.1.1.7[profile?] <dev-haskell/zip-archive-0.2[profile?] =dev-haskell/zlib-0.5*[profile?] >=dev-lang/ghc-6.10.1 dev-lang/ghc
+RESTRICT=test
 SLOT=0
 SRC_URI=http://hackage.haskell.org/packages/archive/pandoc/1.9.4.1/pandoc-1.9.4.1.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	ghc-package	f39fadb76cd4747582996e6b0d44479c	haskell-cabal	6054440acd4fac31e40a9595827325e0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2654038bc5a3ec82f4f7ac1de30dd5d3
+_md5_=e051df223fd6d00d48e909f56ab6c642
diff --git a/metadata/md5-cache/app-text/paps-0.6.8 b/metadata/md5-cache/app-text/paps-0.6.8
index 841cb5476e12..ceb34bed2e29 100644
--- a/metadata/md5-cache/app-text/paps-0.6.8
+++ b/metadata/md5-cache/app-text/paps-0.6.8
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/paps/paps-0.6.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e155c4e7c448d22447be468e3ee5786a
diff --git a/metadata/md5-cache/app-text/pep-2.8 b/metadata/md5-cache/app-text/pep-2.8
index 7a1e0c77e808..37abcac14374 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=121a737c7789c4e9b9a401ce4f76f110
diff --git a/metadata/md5-cache/app-text/pep-2.8-r1 b/metadata/md5-cache/app-text/pep-2.8-r1
index 69630466478d..789277714df8 100644
--- a/metadata/md5-cache/app-text/pep-2.8-r1
+++ b/metadata/md5-cache/app-text/pep-2.8-r1
@@ -7,5 +7,5 @@ KEYWORDS=~mips ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://hannemyr.com/enjoy/pep28.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94728a63e7c53b38455093a51c2d518f
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.10-r3 b/metadata/md5-cache/app-text/pinfo-0.6.10-r3
index cef073ca5c84..d15c60a55c8b 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.10-r3
+++ b/metadata/md5-cache/app-text/pinfo-0.6.10-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2b16a8f385329c006ab71a35c661f8d
diff --git a/metadata/md5-cache/app-text/podofo-0.9.1 b/metadata/md5-cache/app-text/podofo-0.9.1
index 0a04f99cdcf8..c9b464b9c155 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.1
+++ b/metadata/md5-cache/app-text/podofo-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/lua dev-libs/openssl media-libs/fontconfig media-libs/freetype:2 virtual/jpeg >=media-libs/libpng-1.4:0 media-libs/tiff:0 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/podofo/podofo-0.9.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32953e375696fe2ee599933a25c78d99
diff --git a/metadata/md5-cache/app-text/poppler-0.16.7 b/metadata/md5-cache/app-text/poppler-0.16.7
index 0c53d4362ca2..e90f4045a593 100644
--- a/metadata/md5-cache/app-text/poppler-0.16.7
+++ b/metadata/md5-cache/app-text/poppler-0.16.7
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://poppler.freedesktop.org/poppler-0.16.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd8aa22c330754bccdcc109a5f903e0b
diff --git a/metadata/md5-cache/app-text/poppler-0.18.4-r1 b/metadata/md5-cache/app-text/poppler-0.18.4-r1
index e66a412ec65d..4ba6d0258263 100644
--- a/metadata/md5-cache/app-text/poppler-0.18.4-r1
+++ b/metadata/md5-cache/app-text/poppler-0.18.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://poppler.freedesktop.org/poppler-0.18.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74ec0a966b56f61171a1a04af14bfa4f
diff --git a/metadata/md5-cache/app-text/poppler-0.20.1 b/metadata/md5-cache/app-text/poppler-0.20.1
index 52a0c02f4b81..352d1a16e4da 100644
--- a/metadata/md5-cache/app-text/poppler-0.20.1
+++ b/metadata/md5-cache/app-text/poppler-0.20.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://poppler.freedesktop.org/poppler-0.20.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c780afe90ff4be17b01468b18ed20330
diff --git a/metadata/md5-cache/app-text/qgoogletranslator-1.2.1-r1 b/metadata/md5-cache/app-text/qgoogletranslator-1.2.1-r1
index 2a2f09e40b4e..3c106be35d91 100644
--- a/metadata/md5-cache/app-text/qgoogletranslator-1.2.1-r1
+++ b/metadata/md5-cache/app-text/qgoogletranslator-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-gui-4.6
 SLOT=0
 SRC_URI=http://qgt.googlecode.com/files/qgoogletranslator-1.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adbdf7a0c2ef382b337f1ed008412bbb
diff --git a/metadata/md5-cache/app-text/recode-3.6_p17-r2 b/metadata/md5-cache/app-text/recode-3.6_p17-r2
index 01cfdafbdb47..aa8030bd9398 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p17-r2
+++ b/metadata/md5-cache/app-text/recode-3.6_p17-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-17.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63f214f6f5c26c47e300e2b7a1ccf168
diff --git a/metadata/md5-cache/app-text/sigil-0.4.2 b/metadata/md5-cache/app-text/sigil-0.4.2
index 14410d6eea32..28a9e37d294f 100644
--- a/metadata/md5-cache/app-text/sigil-0.4.2
+++ b/metadata/md5-cache/app-text/sigil-0.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2
 SLOT=0
 SRC_URI=http://sigil.googlecode.com/files/Sigil-0.4.2-Code.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad5a8011aca3b22f06cfbbf1d4234d07
diff --git a/metadata/md5-cache/app-text/sigil-0.4.905_beta1 b/metadata/md5-cache/app-text/sigil-0.4.905_beta1
index f1cf2ebface1..857694a8917a 100644
--- a/metadata/md5-cache/app-text/sigil-0.4.905_beta1
+++ b/metadata/md5-cache/app-text/sigil-0.4.905_beta1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2
 SLOT=0
 SRC_URI=http://sigil.googlecode.com/files/Sigil-0.4.905-Code.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e007773d408d6742c9ca322c21b9307
diff --git a/metadata/md5-cache/app-text/sigil-0.5.0 b/metadata/md5-cache/app-text/sigil-0.5.0
index c8d2adbea430..641272aac7a8 100644
--- a/metadata/md5-cache/app-text/sigil-0.5.0
+++ b/metadata/md5-cache/app-text/sigil-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2
 SLOT=0
 SRC_URI=http://sigil.googlecode.com/files/Sigil-0.5.0-Code.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fc9567fce29aee911287b9f258a53dd
diff --git a/metadata/md5-cache/app-text/sigil-0.5.3 b/metadata/md5-cache/app-text/sigil-0.5.3
index 5a5205406991..e04f36cf1ddb 100644
--- a/metadata/md5-cache/app-text/sigil-0.5.3
+++ b/metadata/md5-cache/app-text/sigil-0.5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-xmlpatterns-4.7.2 >=x11-libs/qt-webkit-4.7.2 >=x11-libs/qt-svg-4.7.2 >=x11-libs/qt-gui-4.7.2
 SLOT=0
 SRC_URI=http://sigil.googlecode.com/files/Sigil-0.5.3-Code.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50dd13511fe908649b304f1da0118251
diff --git a/metadata/md5-cache/app-text/sword-1.6.2 b/metadata/md5-cache/app-text/sword-1.6.2
index fe0045534af7..90c23e6f9c96 100644
--- a/metadata/md5-cache/app-text/sword-1.6.2
+++ b/metadata/md5-cache/app-text/sword-1.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu )
 SLOT=0
 SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/sword-1.6.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d4b7fd416c0f0eb6e802aefd167b558
diff --git a/metadata/md5-cache/app-text/texlive-core-2010-r4 b/metadata/md5-cache/app-text/texlive-core-2010-r4
index 83d547557a7c..43f4c5dd89e5 100644
--- a/metadata/md5-cache/app-text/texlive-core-2010-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2010-r4
@@ -10,5 +10,5 @@ PDEPEND=>=dev-tex/luatex-0.63
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2009 !app-text/dvibook sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=app-text/poppler-0.12.3-r3 xetex? ( app-text/teckit media-libs/fontconfig media-libs/freetype:2 media-libs/silgraphite ) >=dev-libs/kpathsea-6.0.1_p20110627 cjk? ( dev-libs/ptexenc ) app-text/ps2pkm app-text/dvipsk dev-tex/bibtexu xetex? ( >=app-text/xdvipdfmx-0.7.8 ) tk? ( dev-perl/perl-tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20100722-source.tar.xz mirror://gentoo/texlive-core-patches-29.tar.xz mirror://gentoo/texlive-module-tetex-2010.tar.xz mirror://gentoo/texlive-module-hyphen-base-2010.tar.xz mirror://gentoo/texlive-module-texconfig-2010.tar.xz mirror://gentoo/texlive-module-gsftopk-2010.tar.xz mirror://gentoo/texlive-module-a2ping-2010.tar.xz mirror://gentoo/texlive-module-asymptote-2010.tar.xz mirror://gentoo/texlive-module-bibtex8-2010.tar.xz mirror://gentoo/texlive-module-bundledoc-2010.tar.xz mirror://gentoo/texlive-module-ctie-2010.tar.xz mirror://gentoo/texlive-module-cweb-2010.tar.xz mirror://gentoo/texlive-module-de-macro-2010.tar.xz mirror://gentoo/texlive-module-dtl-2010.tar.xz mirror://gentoo/texlive-module-dvi2tty-2010.tar.xz mirror://gentoo/texlive-module-dviasm-2010.tar.xz mirror://gentoo/texlive-module-dvicopy-2010.tar.xz mirror://gentoo/texlive-module-dvidvi-2010.tar.xz mirror://gentoo/texlive-module-dviljk-2010.tar.xz mirror://gentoo/texlive-module-dvipng-2010.tar.xz mirror://gentoo/texlive-module-dvipos-2010.tar.xz mirror://gentoo/texlive-module-findhyph-2010.tar.xz mirror://gentoo/texlive-module-fragmaster-2010.tar.xz mirror://gentoo/texlive-module-hyphenex-2010.tar.xz mirror://gentoo/texlive-module-installfont-2010.tar.xz mirror://gentoo/texlive-module-lacheck-2010.tar.xz mirror://gentoo/texlive-module-latex2man-2010.tar.xz mirror://gentoo/texlive-module-listings-ext-2010.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2010.tar.xz mirror://gentoo/texlive-module-patgen-2010.tar.xz mirror://gentoo/texlive-module-pdfcrop-2010.tar.xz mirror://gentoo/texlive-module-pdftools-2010.tar.xz mirror://gentoo/texlive-module-pkfix-2010.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2010.tar.xz mirror://gentoo/texlive-module-purifyeps-2010.tar.xz mirror://gentoo/texlive-module-seetexk-2010.tar.xz mirror://gentoo/texlive-module-synctex-2010.tar.xz mirror://gentoo/texlive-module-texcount-2010.tar.xz mirror://gentoo/texlive-module-texdiff-2010.tar.xz mirror://gentoo/texlive-module-texdirflatten-2010.tar.xz mirror://gentoo/texlive-module-texdoc-2010.tar.xz mirror://gentoo/texlive-module-texloganalyser-2010.tar.xz mirror://gentoo/texlive-module-texware-2010.tar.xz mirror://gentoo/texlive-module-tie-2010.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2010.tar.xz mirror://gentoo/texlive-module-web-2010.tar.xz mirror://gentoo/texlive-module-collection-binextra-2010.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2010.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2010.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2010.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2010.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2010.tar.xz mirror://gentoo/texlive-module-bibtex8.doc-2010.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2010.tar.xz mirror://gentoo/texlive-module-ctie.doc-2010.tar.xz mirror://gentoo/texlive-module-cweb.doc-2010.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2010.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2010.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2010.tar.xz mirror://gentoo/texlive-module-dvipng.doc-2010.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2010.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2010.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2010.tar.xz mirror://gentoo/texlive-module-installfont.doc-2010.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2010.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2010.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2010.tar.xz mirror://gentoo/texlive-module-patgen.doc-2010.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2010.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2010.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2010.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2010.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2010.tar.xz mirror://gentoo/texlive-module-synctex.doc-2010.tar.xz mirror://gentoo/texlive-module-texcount.doc-2010.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2010.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2010.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2010.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2010.tar.xz mirror://gentoo/texlive-module-texware.doc-2010.tar.xz mirror://gentoo/texlive-module-tie.doc-2010.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2010.tar.xz mirror://gentoo/texlive-module-web.doc-2010.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphenex.source-2010.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2010.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2010.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e10e04071faa1ac124a77fc4eab61e5
diff --git a/metadata/md5-cache/app-text/texlive-core-2011-r5 b/metadata/md5-cache/app-text/texlive-core-2011-r5
index bb343ab71b2e..342cffa0c76f 100644
--- a/metadata/md5-cache/app-text/texlive-core-2011-r5
+++ b/metadata/md5-cache/app-text/texlive-core-2011-r5
@@ -10,5 +10,5 @@ PDEPEND=>=dev-tex/luatex-0.70
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2009 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=app-text/poppler-0.12.3-r3 xetex? ( app-text/teckit media-libs/fontconfig media-libs/freetype:2 media-libs/silgraphite ) >=dev-libs/kpathsea-6.0.1_p20110705 cjk? ( >=dev-libs/ptexenc-1.2.0_p20110705 ) >=app-text/ps2pkm-1.5_p20110705 >=app-text/dvipsk-5.991_p20110705 >=dev-tex/bibtexu-3.71_p20110705 virtual/perl-Getopt-Long xetex? ( >=app-text/xdvipdfmx-0.7.8 ) tk? ( dev-perl/perl-tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patches-31.tar.xz mirror://gentoo/texlive-core-upstream-patches-1.tar.xz mirror://gentoo/texlive-module-tetex-2011.tar.xz mirror://gentoo/texlive-module-hyphen-base-2011.tar.xz mirror://gentoo/texlive-module-texconfig-2011.tar.xz mirror://gentoo/texlive-module-gsftopk-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra-2011.tar.xz mirror://gentoo/texlive-module-a2ping-2011.tar.xz mirror://gentoo/texlive-module-asymptote-2011.tar.xz mirror://gentoo/texlive-module-bibtex8-2011.tar.xz mirror://gentoo/texlive-module-bundledoc-2011.tar.xz mirror://gentoo/texlive-module-ctie-2011.tar.xz mirror://gentoo/texlive-module-cweb-2011.tar.xz mirror://gentoo/texlive-module-de-macro-2011.tar.xz mirror://gentoo/texlive-module-dtl-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty-2011.tar.xz mirror://gentoo/texlive-module-dviasm-2011.tar.xz mirror://gentoo/texlive-module-dvicopy-2011.tar.xz mirror://gentoo/texlive-module-dvidvi-2011.tar.xz mirror://gentoo/texlive-module-dviljk-2011.tar.xz mirror://gentoo/texlive-module-dvipng-2011.tar.xz mirror://gentoo/texlive-module-dvipos-2011.tar.xz mirror://gentoo/texlive-module-findhyph-2011.tar.xz mirror://gentoo/texlive-module-fragmaster-2011.tar.xz mirror://gentoo/texlive-module-hyphenex-2011.tar.xz mirror://gentoo/texlive-module-installfont-2011.tar.xz mirror://gentoo/texlive-module-lacheck-2011.tar.xz mirror://gentoo/texlive-module-latex2man-2011.tar.xz mirror://gentoo/texlive-module-listings-ext-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2011.tar.xz mirror://gentoo/texlive-module-patgen-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop-2011.tar.xz mirror://gentoo/texlive-module-pdftools-2011.tar.xz mirror://gentoo/texlive-module-pkfix-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2011.tar.xz mirror://gentoo/texlive-module-purifyeps-2011.tar.xz mirror://gentoo/texlive-module-seetexk-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx-2011.tar.xz mirror://gentoo/texlive-module-synctex-2011.tar.xz mirror://gentoo/texlive-module-texcount-2011.tar.xz mirror://gentoo/texlive-module-texdef-2011.tar.xz mirror://gentoo/texlive-module-texdiff-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten-2011.tar.xz mirror://gentoo/texlive-module-texdoc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser-2011.tar.xz mirror://gentoo/texlive-module-texware-2011.tar.xz mirror://gentoo/texlive-module-tie-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2011.tar.xz mirror://gentoo/texlive-module-web-2011.tar.xz mirror://gentoo/texlive-module-collection-binextra-2011.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2011.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2011.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2011.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2011.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2011.tar.xz mirror://gentoo/texlive-module-bibtex8.doc-2011.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2011.tar.xz mirror://gentoo/texlive-module-ctie.doc-2011.tar.xz mirror://gentoo/texlive-module-cweb.doc-2011.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2011.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2011.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipng.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2011.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2011.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2011.tar.xz mirror://gentoo/texlive-module-installfont.doc-2011.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2011.tar.xz mirror://gentoo/texlive-module-patgen.doc-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2011.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2011.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2011.tar.xz mirror://gentoo/texlive-module-synctex.doc-2011.tar.xz mirror://gentoo/texlive-module-texcount.doc-2011.tar.xz mirror://gentoo/texlive-module-texdef.doc-2011.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2011.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2011.tar.xz mirror://gentoo/texlive-module-texware.doc-2011.tar.xz mirror://gentoo/texlive-module-tie.doc-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2011.tar.xz mirror://gentoo/texlive-module-web.doc-2011.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphenex.source-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2011.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86796627fe288bcde7edaf73b062a55f
diff --git a/metadata/md5-cache/app-text/texlive-core-2011-r6 b/metadata/md5-cache/app-text/texlive-core-2011-r6
index f97a72d7b6d2..0744a7fa3a16 100644
--- a/metadata/md5-cache/app-text/texlive-core-2011-r6
+++ b/metadata/md5-cache/app-text/texlive-core-2011-r6
@@ -10,5 +10,5 @@ PDEPEND=>=dev-tex/luatex-0.70
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2009 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=app-text/poppler-0.12.3-r3 xetex? ( app-text/teckit media-libs/fontconfig media-libs/freetype:2 media-libs/silgraphite ) >=dev-libs/kpathsea-6.0.1_p20110705 cjk? ( >=dev-libs/ptexenc-1.2.0_p20110705 ) >=app-text/ps2pkm-1.5_p20110705 >=app-text/dvipsk-5.991_p20110705 >=dev-tex/bibtexu-3.71_p20110705 virtual/perl-Getopt-Long xetex? ( >=app-text/xdvipdfmx-0.7.8 ) tk? ( dev-perl/perl-tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patches-33.tar.xz mirror://gentoo/texlive-core-upstream-patches-1.tar.xz mirror://gentoo/texlive-module-tetex-2011.tar.xz mirror://gentoo/texlive-module-hyphen-base-2011.tar.xz mirror://gentoo/texlive-module-texconfig-2011.tar.xz mirror://gentoo/texlive-module-gsftopk-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra-2011.tar.xz mirror://gentoo/texlive-module-a2ping-2011.tar.xz mirror://gentoo/texlive-module-asymptote-2011.tar.xz mirror://gentoo/texlive-module-bibtex8-2011.tar.xz mirror://gentoo/texlive-module-bundledoc-2011.tar.xz mirror://gentoo/texlive-module-ctie-2011.tar.xz mirror://gentoo/texlive-module-cweb-2011.tar.xz mirror://gentoo/texlive-module-de-macro-2011.tar.xz mirror://gentoo/texlive-module-dtl-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty-2011.tar.xz mirror://gentoo/texlive-module-dviasm-2011.tar.xz mirror://gentoo/texlive-module-dvicopy-2011.tar.xz mirror://gentoo/texlive-module-dvidvi-2011.tar.xz mirror://gentoo/texlive-module-dviljk-2011.tar.xz mirror://gentoo/texlive-module-dvipng-2011.tar.xz mirror://gentoo/texlive-module-dvipos-2011.tar.xz mirror://gentoo/texlive-module-findhyph-2011.tar.xz mirror://gentoo/texlive-module-fragmaster-2011.tar.xz mirror://gentoo/texlive-module-hyphenex-2011.tar.xz mirror://gentoo/texlive-module-installfont-2011.tar.xz mirror://gentoo/texlive-module-lacheck-2011.tar.xz mirror://gentoo/texlive-module-latex2man-2011.tar.xz mirror://gentoo/texlive-module-listings-ext-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2011.tar.xz mirror://gentoo/texlive-module-patgen-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop-2011.tar.xz mirror://gentoo/texlive-module-pdftools-2011.tar.xz mirror://gentoo/texlive-module-pkfix-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2011.tar.xz mirror://gentoo/texlive-module-purifyeps-2011.tar.xz mirror://gentoo/texlive-module-seetexk-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx-2011.tar.xz mirror://gentoo/texlive-module-synctex-2011.tar.xz mirror://gentoo/texlive-module-texcount-2011.tar.xz mirror://gentoo/texlive-module-texdef-2011.tar.xz mirror://gentoo/texlive-module-texdiff-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten-2011.tar.xz mirror://gentoo/texlive-module-texdoc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser-2011.tar.xz mirror://gentoo/texlive-module-texware-2011.tar.xz mirror://gentoo/texlive-module-tie-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2011.tar.xz mirror://gentoo/texlive-module-web-2011.tar.xz mirror://gentoo/texlive-module-collection-binextra-2011.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2011.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2011.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2011.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2011.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2011.tar.xz mirror://gentoo/texlive-module-bibtex8.doc-2011.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2011.tar.xz mirror://gentoo/texlive-module-ctie.doc-2011.tar.xz mirror://gentoo/texlive-module-cweb.doc-2011.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2011.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2011.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipng.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2011.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2011.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2011.tar.xz mirror://gentoo/texlive-module-installfont.doc-2011.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2011.tar.xz mirror://gentoo/texlive-module-patgen.doc-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2011.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2011.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2011.tar.xz mirror://gentoo/texlive-module-synctex.doc-2011.tar.xz mirror://gentoo/texlive-module-texcount.doc-2011.tar.xz mirror://gentoo/texlive-module-texdef.doc-2011.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2011.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2011.tar.xz mirror://gentoo/texlive-module-texware.doc-2011.tar.xz mirror://gentoo/texlive-module-tie.doc-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2011.tar.xz mirror://gentoo/texlive-module-web.doc-2011.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphenex.source-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2011.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d12c4aea9b6d3d9233bf142bbb21fcfc
diff --git a/metadata/md5-cache/app-text/texlive-core-2011-r7 b/metadata/md5-cache/app-text/texlive-core-2011-r7
index 523063fefd9b..3960fa0988b7 100644
--- a/metadata/md5-cache/app-text/texlive-core-2011-r7
+++ b/metadata/md5-cache/app-text/texlive-core-2011-r7
@@ -10,5 +10,5 @@ PDEPEND=>=dev-tex/luatex-0.70
 RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2009 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=app-text/poppler-0.12.3-r3 xetex? ( app-text/teckit media-libs/fontconfig media-libs/freetype:2 media-libs/silgraphite ) >=dev-libs/kpathsea-6.0.1_p20110705 cjk? ( >=dev-libs/ptexenc-1.2.0_p20110705 ) >=app-text/ps2pkm-1.5_p20110705 >=app-text/dvipsk-5.991_p20110705 >=dev-tex/bibtexu-3.71_p20110705 virtual/perl-Getopt-Long xetex? ( >=app-text/xdvipdfmx-0.7.8 ) tk? ( dev-perl/perl-tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patches-34.tar.xz mirror://gentoo/texlive-core-upstream-patches-1.tar.xz mirror://gentoo/texlive-module-tetex-2011.tar.xz mirror://gentoo/texlive-module-hyphen-base-2011.tar.xz mirror://gentoo/texlive-module-texconfig-2011.tar.xz mirror://gentoo/texlive-module-gsftopk-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra-2011.tar.xz mirror://gentoo/texlive-module-a2ping-2011.tar.xz mirror://gentoo/texlive-module-asymptote-2011.tar.xz mirror://gentoo/texlive-module-bibtex8-2011.tar.xz mirror://gentoo/texlive-module-bundledoc-2011.tar.xz mirror://gentoo/texlive-module-ctie-2011.tar.xz mirror://gentoo/texlive-module-cweb-2011.tar.xz mirror://gentoo/texlive-module-de-macro-2011.tar.xz mirror://gentoo/texlive-module-dtl-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty-2011.tar.xz mirror://gentoo/texlive-module-dviasm-2011.tar.xz mirror://gentoo/texlive-module-dvicopy-2011.tar.xz mirror://gentoo/texlive-module-dvidvi-2011.tar.xz mirror://gentoo/texlive-module-dviljk-2011.tar.xz mirror://gentoo/texlive-module-dvipng-2011.tar.xz mirror://gentoo/texlive-module-dvipos-2011.tar.xz mirror://gentoo/texlive-module-findhyph-2011.tar.xz mirror://gentoo/texlive-module-fragmaster-2011.tar.xz mirror://gentoo/texlive-module-hyphenex-2011.tar.xz mirror://gentoo/texlive-module-installfont-2011.tar.xz mirror://gentoo/texlive-module-lacheck-2011.tar.xz mirror://gentoo/texlive-module-latex2man-2011.tar.xz mirror://gentoo/texlive-module-listings-ext-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2011.tar.xz mirror://gentoo/texlive-module-patgen-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop-2011.tar.xz mirror://gentoo/texlive-module-pdftools-2011.tar.xz mirror://gentoo/texlive-module-pkfix-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2011.tar.xz mirror://gentoo/texlive-module-purifyeps-2011.tar.xz mirror://gentoo/texlive-module-seetexk-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx-2011.tar.xz mirror://gentoo/texlive-module-synctex-2011.tar.xz mirror://gentoo/texlive-module-texcount-2011.tar.xz mirror://gentoo/texlive-module-texdef-2011.tar.xz mirror://gentoo/texlive-module-texdiff-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten-2011.tar.xz mirror://gentoo/texlive-module-texdoc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser-2011.tar.xz mirror://gentoo/texlive-module-texware-2011.tar.xz mirror://gentoo/texlive-module-tie-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2011.tar.xz mirror://gentoo/texlive-module-web-2011.tar.xz mirror://gentoo/texlive-module-collection-binextra-2011.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2011.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2011.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2011.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2011.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2011.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2011.tar.xz mirror://gentoo/texlive-module-bibtex8.doc-2011.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2011.tar.xz mirror://gentoo/texlive-module-ctie.doc-2011.tar.xz mirror://gentoo/texlive-module-cweb.doc-2011.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2011.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2011.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2011.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipng.doc-2011.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2011.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2011.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2011.tar.xz mirror://gentoo/texlive-module-installfont.doc-2011.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2011.tar.xz mirror://gentoo/texlive-module-patgen.doc-2011.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2011.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2011.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2011.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2011.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2011.tar.xz mirror://gentoo/texlive-module-synctex.doc-2011.tar.xz mirror://gentoo/texlive-module-texcount.doc-2011.tar.xz mirror://gentoo/texlive-module-texdef.doc-2011.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2011.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2011.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2011.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2011.tar.xz mirror://gentoo/texlive-module-texware.doc-2011.tar.xz mirror://gentoo/texlive-module-tie.doc-2011.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2011.tar.xz mirror://gentoo/texlive-module-web.doc-2011.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphenex.source-2011.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2011.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2011.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71a3eedf8dbac8f4356a372c5930d723
diff --git a/metadata/md5-cache/app-text/tree-1.6.0 b/metadata/md5-cache/app-text/tree-1.6.0
index 08590b0c2eb3..d4044b2f25ab 100644
--- a/metadata/md5-cache/app-text/tree-1.6.0
+++ b/metadata/md5-cache/app-text/tree-1.6.0
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.6.0.tgz
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56f1bb3602d6ca7785e875267c5f6468
diff --git a/metadata/md5-cache/app-text/tree-1.6.0-r1 b/metadata/md5-cache/app-text/tree-1.6.0-r1
index caa806746b19..656897c67ce5 100644
--- a/metadata/md5-cache/app-text/tree-1.6.0-r1
+++ b/metadata/md5-cache/app-text/tree-1.6.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.6.0.tgz
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd1cbfb3596ce30273a1b0736065c50d
diff --git a/metadata/md5-cache/app-text/wv2-0.4.2 b/metadata/md5-cache/app-text/wv2-0.4.2
index b65d213481c0..077d13e03eae 100644
--- a/metadata/md5-cache/app-text/wv2-0.4.2
+++ b/metadata/md5-cache/app-text/wv2-0.4.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-extra/libgsf-1.8 virtual/libiconv zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/wv2-0.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=207e4d30678a195fb2a514c9425638a2
diff --git a/metadata/md5-cache/app-text/xchm-1.18 b/metadata/md5-cache/app-text/xchm-1.18
index 755554d3ced4..6b3d538a7e65 100644
--- a/metadata/md5-cache/app-text/xchm-1.18
+++ b/metadata/md5-cache/app-text/xchm-1.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xchm/xchm-1.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=334afebb96bc6dc0ab49f9fc39beba26
diff --git a/metadata/md5-cache/app-text/xchm-1.20 b/metadata/md5-cache/app-text/xchm-1.20
index 485ee9f523cc..ed2fc99208f5 100644
--- a/metadata/md5-cache/app-text/xchm-1.20
+++ b/metadata/md5-cache/app-text/xchm-1.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xchm/xchm-1.20.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=89f2c208ead6db4ee16b823decc9a091
diff --git a/metadata/md5-cache/app-text/xdvik-22.84.16 b/metadata/md5-cache/app-text/xdvik-22.84.16
index a40a09324829..d9f3d452db56 100644
--- a/metadata/md5-cache/app-text/xdvik-22.84.16
+++ b/metadata/md5-cache/app-text/xdvik-22.84.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) ) ) virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.84.16.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fed2fa20bca3e7f98fefb622f06c9a0
diff --git a/metadata/md5-cache/app-text/xdvik-22.85-r1 b/metadata/md5-cache/app-text/xdvik-22.85-r1
index a2ad4701c6a8..0ce905fb3bbb 100644
--- a/metadata/md5-cache/app-text/xdvik-22.85-r1
+++ b/metadata/md5-cache/app-text/xdvik-22.85-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.85.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b83b7c89f433b61095dc21e15e9565d
diff --git a/metadata/md5-cache/app-text/xiphos-3.1.5 b/metadata/md5-cache/app-text/xiphos-3.1.5
index febc4185bf88..547aaee3bc2c 100644
--- a/metadata/md5-cache/app-text/xiphos-3.1.5
+++ b/metadata/md5-cache/app-text/xiphos-3.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
 RDEPEND=>=app-text/sword-1.6.1 >=dev-libs/glib-2 dev-libs/libxml2 gnome-base/gconf gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) webkit? ( net-libs/webkit-gtk:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnomesword/xiphos-3.1.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80ce8b02f23cbbafe4ead4a73b93fb60
diff --git a/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r2 b/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r2
index 2613423e7af0..91cb2655e712 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r2
+++ b/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r2
@@ -10,4 +10,4 @@ RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomeca
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-r2-patchset.tar.xz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1fd970797d2868ac0773d432a48edd78
+_md5_=b348da1df807debbbd51fa0ea3863f8a
diff --git a/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r1 b/metadata/md5-cache/app-text/xournal-0.4.6-r1
similarity index 53%
rename from metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r1
rename to metadata/md5-cache/app-text/xournal-0.4.6-r1
index e2aa39fe3b63..0df706893a57 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.5_p20111022-r1
+++ b/metadata/md5-cache/app-text/xournal-0.4.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Xournal is an application for notetaking, sketching, and keeping a j
 EAPI=4
 HOMEPAGE=http://xournal.sourceforge.net/
 IUSE=+pdf
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=38e15d7b8aaada1c69589993afadc6d6
+SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.6.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.6-r1-gentoo.patch.xz
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1a26302d36eec45e21112b8802236727
diff --git a/metadata/md5-cache/app-text/yagf-0.8.7 b/metadata/md5-cache/app-text/yagf-0.8.7
index e6bdfde4008c..50f1018debe6 100644
--- a/metadata/md5-cache/app-text/yagf-0.8.7
+++ b/metadata/md5-cache/app-text/yagf-0.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-gui-4.7 app-text/aspell cuneiform? ( app-text/cuneiform )
 REQUIRED_USE=|| ( cuneiform tesseract )
 SLOT=0
 SRC_URI=http://symmetrica.net/cuneiform-linux/yagf-0.8.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22870645b5dac7d534f50b3f5500fc61
diff --git a/metadata/md5-cache/app-text/yagf-0.9 b/metadata/md5-cache/app-text/yagf-0.9
index aa761bf156f6..65bddf8ac887 100644
--- a/metadata/md5-cache/app-text/yagf-0.9
+++ b/metadata/md5-cache/app-text/yagf-0.9
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-gui-4.7 app-text/aspell cuneiform? ( app-text/cuneiform )
 REQUIRED_USE=|| ( cuneiform tesseract )
 SLOT=0
 SRC_URI=http://symmetrica.net/cuneiform-linux/yagf-0.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=405e9e3816515c4aed12735f4f1a5044
diff --git a/metadata/md5-cache/app-text/zpspell-0.4.1 b/metadata/md5-cache/app-text/zpspell-0.4.1
index 031615c93e41..d3b8dc00e6bd 100644
--- a/metadata/md5-cache/app-text/zpspell-0.4.1
+++ b/metadata/md5-cache/app-text/zpspell-0.4.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/zemberek-server
 SLOT=0
 SRC_URI=http://cekirdek.uludag.org.tr/~baris/zpspell/zpspell-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb2394e1ffff68c44d509a06ae23efa2
diff --git a/metadata/md5-cache/app-text/zpspell-0.4.3 b/metadata/md5-cache/app-text/zpspell-0.4.3
index a8ce76379756..61e5c750c20e 100644
--- a/metadata/md5-cache/app-text/zpspell-0.4.3
+++ b/metadata/md5-cache/app-text/zpspell-0.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib app-text/zemberek-server
 SLOT=0
 SRC_URI=http://cekirdek.uludag.org.tr/~baris/zpspell/zpspell-0.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27f6a326cd5462430d1c726b351f887c
diff --git a/metadata/md5-cache/dev-ada/adadoc-2.1 b/metadata/md5-cache/dev-ada/adadoc-2.1
index a0ed31827e76..963698d1dbcf 100644
--- a/metadata/md5-cache/dev-ada/adadoc-2.1
+++ b/metadata/md5-cache/dev-ada/adadoc-2.1
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/adadoc/adadoc-v2.1.src.tar.bz2 mirror://sourceforge/adadoc/UserGuide.pdf mirror://sourceforge/adadoc/HowToWriteModule.pdf
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d6230214cf639dfb23e59a2535fc414
diff --git a/metadata/md5-cache/dev-ada/adasockets-1.8.4.7 b/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
index f576ac367daa..8f63a06a86cf 100644
--- a/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
+++ b/metadata/md5-cache/dev-ada/adasockets-1.8.4.7
@@ -7,5 +7,5 @@ LICENSE=GMGPL
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=http://www.rfc1149.net/download/adasockets/adasockets-1.8.4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55f22224346fce8d52eaf602817bbcc6
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6 b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
index 0e2436ceba57..1f9e9aa9ce0b 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
+++ b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-3.4.6* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-3.4.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7757963a5476a94f2308af0d03687564
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
index caf923921727..e6d22628eda0 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=652f4647b7b17c11414d1c00084c08ba
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
index 4b287d18001f..1ed025f61d1d 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab7ccddf3e19ac4321d3b8564be435d6
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
index 91b70458ac78..f28f21f516ba 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.2* app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38a0146e93d72053d86a69757406240b
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
index 6fd70860950b..bb8bfe655ab2 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.3.0_pre132166.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68840231d513338f53b79c966d540c62
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
index 8b3257a9d13a..4d0df77f42cb 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2ca0059f8b393b745173d436bb62235
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
index 9ba4177dcb8e..dc34bd3ec20a 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05de62c1a3652ae0e15a94edacc01de8
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.4 b/metadata/md5-cache/dev-ada/asis-gcc-4.4
index 5ca04ff3358a..b1ba2fe364ed 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.4
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.4* app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2010-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5d66ed2bd60327e867699e0d75b3bbd
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006 b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
index 3eb039b3467f..45153d75b4c3 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
+++ b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-3.4.6.2006* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=mirror://gentoo/asis-gpl-2006.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fac33cb5a302c38f7ec86e84f537d81
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
index 14c85e7ebd0b..aa4f26d31d2e 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd7df46d08b59cba75d34e13d56b743d
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
index 18f0de1b495b..82beb08a04c9 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5c34e3a423656e567c79b58bc8ac6b8
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
index 071becce9aa3..9bf0ef88fad8 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9adde28aa9de3413e8c8186c5b6a5b54
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
index 41f27e8103e4..ff66f38e5d4a 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1-2008
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18773019f90bb6d18d89b69e2f4c1e36
diff --git a/metadata/md5-cache/dev-ada/aunit-1.05 b/metadata/md5-cache/dev-ada/aunit-1.05
index 6ebc0bc8d689..58752f12f330 100644
--- a/metadata/md5-cache/dev-ada/aunit-1.05
+++ b/metadata/md5-cache/dev-ada/aunit-1.05
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=mirror://gentoo/aunit-1.05.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3015a82f220c852c3ed8634b1faaae2b
diff --git a/metadata/md5-cache/dev-ada/aunit-2.01 b/metadata/md5-cache/dev-ada/aunit-2.01
index b06cee794775..19aa56b6e268 100644
--- a/metadata/md5-cache/dev-ada/aunit-2.01
+++ b/metadata/md5-cache/dev-ada/aunit-2.01
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=mirror://gentoo/aunit-2.01.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be0af1edda6d8ab40f86a4d4e608637d
diff --git a/metadata/md5-cache/dev-ada/aunit-2.03 b/metadata/md5-cache/dev-ada/aunit-2.03
index 742f483f02aa..20601f03d26f 100644
--- a/metadata/md5-cache/dev-ada/aunit-2.03
+++ b/metadata/md5-cache/dev-ada/aunit-2.03
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~george/src/aunit-2.03.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fd483c46ba8c2282d8caa196ec441a9
diff --git a/metadata/md5-cache/dev-ada/booch_components-20051222-r1 b/metadata/md5-cache/dev-ada/booch_components-20051222-r1
index 6ddc79905aff..ab866632d001 100644
--- a/metadata/md5-cache/dev-ada/booch_components-20051222-r1
+++ b/metadata/md5-cache/dev-ada/booch_components-20051222-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada >=app-admin/eselect-gnat-0.7
 SLOT=0
 SRC_URI=mirror://sourceforge/booch95/bc-20051222.tgz mirror://sourceforge/booch95/bc-html-20051222.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c395bbf11ae0ec2b6e44fe9ea5ed7a8
diff --git a/metadata/md5-cache/dev-ada/booch_components-20070420 b/metadata/md5-cache/dev-ada/booch_components-20070420
index c1a6ae8e5e88..dddb13527408 100644
--- a/metadata/md5-cache/dev-ada/booch_components-20070420
+++ b/metadata/md5-cache/dev-ada/booch_components-20070420
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=mirror://sourceforge/booch95/bc-20070420.tgz mirror://sourceforge/booch95/bc-html-20070420.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6005d3479ee10a6cfcac6d72b68742fc
diff --git a/metadata/md5-cache/dev-ada/charles-20050913 b/metadata/md5-cache/dev-ada/charles-20050913
index cf56bffaf320..b2670df0db01 100644
--- a/metadata/md5-cache/dev-ada/charles-20050913
+++ b/metadata/md5-cache/dev-ada/charles-20050913
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=mirror://gentoo/charles-20050913.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4ee54cce90a3289a885e2c45e3ddb7d
diff --git a/metadata/md5-cache/dev-ada/florist-2006.0 b/metadata/md5-cache/dev-ada/florist-2006.0
index 44ca71db8ca5..dd20f7f4349c 100644
--- a/metadata/md5-cache/dev-ada/florist-2006.0
+++ b/metadata/md5-cache/dev-ada/florist-2006.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ada
 SLOT=0
 SRC_URI=mirror://gentoo/florist-2006.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e752f8e7d074763d215ec1df69c97cd
diff --git a/metadata/md5-cache/dev-ada/florist-2007.0 b/metadata/md5-cache/dev-ada/florist-2007.0
index 9fd859f1251a..d761d59ce126 100644
--- a/metadata/md5-cache/dev-ada/florist-2007.0
+++ b/metadata/md5-cache/dev-ada/florist-2007.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/ada-2005
 SLOT=0
 SRC_URI=mirror://gentoo/florist-2007.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=509313a924cbc69ceefac9cd6e8db6a8
diff --git a/metadata/md5-cache/dev-ada/glade-2006.0 b/metadata/md5-cache/dev-ada/glade-2006.0
index 335f44d36970..5289771c718f 100644
--- a/metadata/md5-cache/dev-ada/glade-2006.0
+++ b/metadata/md5-cache/dev-ada/glade-2006.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==virtual/ada-1995*
 SLOT=0
 SRC_URI=mirror://gentoo/glade-2006.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0eb2b87c20fc30771bb1b6cbb2ac87d
diff --git a/metadata/md5-cache/dev-ada/gtkada-2.10.0 b/metadata/md5-cache/dev-ada/gtkada-2.10.0
index a90b37f8bb9f..ba29bbefd266 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2.10.0
+++ b/metadata/md5-cache/dev-ada/gtkada-2.10.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~ppc
 LICENSE=GPL-2
 SLOT=2
 SRC_URI=mirror://gentoo/GtkAda-gpl-2.10.0.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=740bb8735843cbf04f6fa52f1fed32a6
diff --git a/metadata/md5-cache/dev-ada/gtkada-2.4.0-r2 b/metadata/md5-cache/dev-ada/gtkada-2.4.0-r2
index ad34340cedb2..254276ae632a 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2.4.0-r2
+++ b/metadata/md5-cache/dev-ada/gtkada-2.4.0-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=2
 SRC_URI=mirror://gentoo/GtkAda-2.4.0.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=073f837707f8f3ea70a22d132b56eaee
diff --git a/metadata/md5-cache/dev-ada/gtkada-2.8.0 b/metadata/md5-cache/dev-ada/gtkada-2.8.0
index 85d5ee7c0c75..a3dd40fd66cc 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2.8.0
+++ b/metadata/md5-cache/dev-ada/gtkada-2.8.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~ppc
 LICENSE=GPL-2
 SLOT=2
 SRC_URI=mirror://gentoo/GtkAda-gpl-2.8.0.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=084c0c542360e72f1f0a70d993c6ca2b
diff --git a/metadata/md5-cache/dev-ada/polyorb-2.1.0 b/metadata/md5-cache/dev-ada/polyorb-2.1.0
index 9261d40abb98..c1c938de12d2 100644
--- a/metadata/md5-cache/dev-ada/polyorb-2.1.0
+++ b/metadata/md5-cache/dev-ada/polyorb-2.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://gentoo/polyorb-2.1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87f031e2247a3815877ac8a4e48e778c
diff --git a/metadata/md5-cache/dev-ada/xmlada-1.0-r4 b/metadata/md5-cache/dev-ada/xmlada-1.0-r4
index 7198e99a2c58..c5985755c211 100644
--- a/metadata/md5-cache/dev-ada/xmlada-1.0-r4
+++ b/metadata/md5-cache/dev-ada/xmlada-1.0-r4
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://libre2.adacore.com/xmlada/XmlAda-1.0.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c75ad110f3e0c4ce6ed0d3df39f0c092
diff --git a/metadata/md5-cache/dev-ada/xmlada-2.2.0 b/metadata/md5-cache/dev-ada/xmlada-2.2.0
index 5b9cbfea1203..a8508c3f816e 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2.2.0
+++ b/metadata/md5-cache/dev-ada/xmlada-2.2.0
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/xmlada-2.2.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7b691ecbfa9706efc233a2abcc4de1b
diff --git a/metadata/md5-cache/dev-ada/xmlada-2.2.0-r1 b/metadata/md5-cache/dev-ada/xmlada-2.2.0-r1
index 7ede3ac15518..6b5e49ac9649 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2.2.0-r1
+++ b/metadata/md5-cache/dev-ada/xmlada-2.2.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/xmlada-2.2.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnat	2395d33f9259e627b1fb6f2719f4d235	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=39756c89544ab158f9fa3c68e07f52bb
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r3 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r3
index c6ec7ca12f5f..b5c41462ea0b 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r3
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=!<app-misc/strigi-0.7.5-r3
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=766e5653d98465572de95e682d2110b0
diff --git a/metadata/md5-cache/dev-cpp/eigen-2.0.16 b/metadata/md5-cache/dev-cpp/eigen-2.0.16
index d6fc55cac3cb..7f9cc5aba3d5 100644
--- a/metadata/md5-cache/dev-cpp/eigen-2.0.16
+++ b/metadata/md5-cache/dev-cpp/eigen-2.0.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=examples? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) !dev-cpp/eigen:0
 SLOT=2
 SRC_URI=https://bitbucket.org/eigen/eigen/get/2.0.16.tar.bz2 -> eigen-2.0.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=267ead04a2e2deb31debf20d3b9914b3
diff --git a/metadata/md5-cache/dev-cpp/eigen-2.0.17 b/metadata/md5-cache/dev-cpp/eigen-2.0.17
index e6b07b8bc35d..ef26da84682c 100644
--- a/metadata/md5-cache/dev-cpp/eigen-2.0.17
+++ b/metadata/md5-cache/dev-cpp/eigen-2.0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=examples? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) !dev-cpp/eigen:0
 SLOT=2
 SRC_URI=https://bitbucket.org/eigen/eigen/get/2.0.17.tar.bz2 -> eigen-2.0.17.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ae702e1a62a9a0d5d405fda8ac0c609
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.0.2 b/metadata/md5-cache/dev-cpp/eigen-3.0.2
index d89ef71aab66..8d5304231c37 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.0.2
+++ b/metadata/md5-cache/dev-cpp/eigen-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-3
 RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=http://bitbucket.org/eigen/eigen/get/3.0.2.tar.bz2 -> eigen-3.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48826d6a5053e1d79326762c3ea4819e
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.0.5 b/metadata/md5-cache/dev-cpp/eigen-3.0.5
index 8822a460e41a..633d4860d7b6 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.0.5
+++ b/metadata/md5-cache/dev-cpp/eigen-3.0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-3
 RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=http://bitbucket.org/eigen/eigen/get/3.0.5.tar.bz2 -> eigen-3.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=303bedb6e53aa36bb95a1722c34722a1
diff --git a/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20090516-r1 b/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20090516-r1
index 23eb292838dc..2bc9765dfed1 100644
--- a/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20090516-r1
+++ b/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20090516-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-li
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/gccxml-0.9.0_pre20090516.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bf2803c180f0f3e931d021e648cf49b
diff --git a/metadata/md5-cache/dev-cpp/libxsd-frontend-1.17.0 b/metadata/md5-cache/dev-cpp/libxsd-frontend-1.17.0
index 3f18ad11f1a4..db5222991c98 100644
--- a/metadata/md5-cache/dev-cpp/libxsd-frontend-1.17.0
+++ b/metadata/md5-cache/dev-cpp/libxsd-frontend-1.17.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/xerces-c-3 dev-libs/boost >=dev-cpp/libcult-1.4.6 >=dev-cpp/libfrontend-elements-1.1.4
 SLOT=0
 SRC_URI=http://www.codesynthesis.com/download/libxsd-frontend/1.17/libxsd-frontend-1.17.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb9cad50770b178626b6f50540b03a10
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.3.0 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.3.0
index ce6b19960441..10e018e3355c 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.3.0
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.3.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ceb59e4d8c4d290d93bb1979ef56c66
diff --git a/metadata/md5-cache/dev-db/drizzle-7.1.33 b/metadata/md5-cache/dev-db/drizzle-7.1.33
index fc0b10df1239..0313ebc7441e 100644
--- a/metadata/md5-cache/dev-db/drizzle-7.1.33
+++ b/metadata/md5-cache/dev-db/drizzle-7.1.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle
 SLOT=0
 SRC_URI=http://launchpad.net/drizzle/7.1/7.1.33/+download/drizzle-7.1.33-stable.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f52b863b6262ee1bdfe3f0a2557176aa
diff --git a/metadata/md5-cache/dev-db/edb-1.0.5 b/metadata/md5-cache/dev-db/edb-1.0.5
index 2b34ec776d5b..95e2a747c9a1 100644
--- a/metadata/md5-cache/dev-db/edb-1.0.5
+++ b/metadata/md5-cache/dev-db/edb-1.0.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/edb-1.0.5.tar.gz
-_eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a94ff1e5e02bcf12e996dc8a1fd8bef8
diff --git a/metadata/md5-cache/dev-db/edb-1.0.5.042 b/metadata/md5-cache/dev-db/edb-1.0.5.042
index 93102b7c54a3..987d9c385b26 100644
--- a/metadata/md5-cache/dev-db/edb-1.0.5.042
+++ b/metadata/md5-cache/dev-db/edb-1.0.5.042
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/snapshots/2008-01-25/edb-1.0.5.042.tar.bz2
-_eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e72bb411d6a3d0d09777cb2810d2485
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 4ced776a462a..3d794ef4a2fb 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
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 fe1e8aabbf6d..cafd5e6aac86 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
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 24448479d73b..313fc4120888 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
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/gan
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7bc8c8cf2104a03beaa7f8691fcce1e0
diff --git a/metadata/md5-cache/dev-db/freetds-0.82-r3 b/metadata/md5-cache/dev-db/freetds-0.82-r3
index e9d29b60f982..d9b4da44a423 100644
--- a/metadata/md5-cache/dev-db/freetds-0.82-r3
+++ b/metadata/md5-cache/dev-db/freetds-0.82-r3
@@ -10,5 +10,5 @@ RDEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.82.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fd06f20c9130da73128f3df7889aa5a
diff --git a/metadata/md5-cache/dev-db/haildb-2.2.0 b/metadata/md5-cache/dev-db/haildb-2.2.0
index de3fb73a0373..e5b02478b485 100644
--- a/metadata/md5-cache/dev-db/haildb-2.2.0
+++ b/metadata/md5-cache/dev-db/haildb-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://launchpad.net/haildb/2.x/2.2/+download/haildb-2.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c6b290db4835a99b9f2199c87d41e8c
diff --git a/metadata/md5-cache/dev-db/haildb-2.3.1 b/metadata/md5-cache/dev-db/haildb-2.3.1
index d328ebba655f..bef68ca8b0e9 100644
--- a/metadata/md5-cache/dev-db/haildb-2.3.1
+++ b/metadata/md5-cache/dev-db/haildb-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://launchpad.net/haildb/2.3/athens/+download/haildb-2.3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dabfcd0cb91008ead86cfe9eb8ddda05
diff --git a/metadata/md5-cache/dev-db/haildb-2.3.2 b/metadata/md5-cache/dev-db/haildb-2.3.2
index 32e8c31fe1d5..5fa7f7d65b36 100644
--- a/metadata/md5-cache/dev-db/haildb-2.3.2
+++ b/metadata/md5-cache/dev-db/haildb-2.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://launchpad.net/haildb/2.3/cairo/+download/haildb-2.3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35f30d24a9a8809266346ce2026b59fd
diff --git a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1 b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
index db61fccf6a9e..7316761e9317 100644
--- a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
+++ b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/unixODBC sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/libodbcxx/libodbc++-0.2.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8784feb7f19d18c8dd0d96df3a98f947
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.42 b/metadata/md5-cache/dev-db/mariadb-5.1.42
index db5569bc5691..de2a2884dc51 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.42
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.42
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=!media-sound/amarok[embedded] ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://maria.llarian.net/download/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.42.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz mirror://gentoo/mysql-extras-20100324-0235Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100324-0235Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100324-0235Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57b94e8b501ada628f03a99de7129077
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.42-r1 b/metadata/md5-cache/dev-db/mariadb-5.1.42-r1
index b82c19ca22e9..26b61bf1ca64 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.42-r1
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.42-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=!media-sound/amarok[embedded] ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://maria.llarian.net/download/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.42.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz mirror://gentoo/mysql-extras-20100324-0235Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100324-0235Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100324-0235Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2dd42aa7caaac9754cd43b5d49d93c9
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.50 b/metadata/md5-cache/dev-db/mariadb-5.1.50
index 9356c79dcdda..9a6700268d12 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.50
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.50
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://maria.llarian.net/download/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.50.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz mirror://gentoo/mysql-extras-20101006-0004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101006-0004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101006-0004Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6cf79a2081c17424ea358bc4e95bedd6
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.55 b/metadata/md5-cache/dev-db/mariadb-5.1.55
index c74cfe7f5c06..45f4e7b7fd82 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.55
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.55
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://maria.llarian.net/download/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.55.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz mirror://gentoo/mysql-extras-20110426-1046Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110426-1046Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08a5b67a012d835a6b12cd3396a22056
diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.62 b/metadata/md5-cache/dev-db/mariadb-5.1.62
index fccc6649bf4d..c687a61f0fa0 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.1.62
+++ b/metadata/md5-cache/dev-db/mariadb-5.1.62
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.62/kvm-tarbake-jaunty-x86/mariadb-5.1.62.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.62/kvm-tarbake-jaunty-x86/mariadb-5.1.62.tar.gz http://maria.llarian.net/download/mariadb-5.1.62/kvm-tarbake-jaunty-x86/mariadb-5.1.62.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.62.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.62/kvm-tarbake-jaunty-x86/mariadb-5.1.62.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.62/kvm-tarbake-jaunty-x86/mariadb-5.1.62.tar.gz mirror://gentoo/mysql-extras-20120416-2021Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120416-2021Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2544bc2c28d032e28fb76517910d059b
diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.12 b/metadata/md5-cache/dev-db/mariadb-5.2.12
index 670fe386ded2..bbfe8a0f85e4 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.2.12
+++ b/metadata/md5-cache/dev-db/mariadb-5.2.12
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.12/kvm-tarbake-jaunty-x86/mariadb-5.2.12.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.12/kvm-tarbake-jaunty-x86/mariadb-5.2.12.tar.gz http://maria.llarian.net/download/mariadb-5.2.12/kvm-tarbake-jaunty-x86/mariadb-5.2.12.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.12.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.12/kvm-tarbake-jaunty-x86/mariadb-5.2.12.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.12/kvm-tarbake-jaunty-x86/mariadb-5.2.12.tar.gz mirror://gentoo/mysql-extras-20120416-2021Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120416-2021Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e55da59533739d9be2a929743e6701f
diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.9 b/metadata/md5-cache/dev-db/mariadb-5.2.9
index 5d50ca498efe..fa80e54d86ad 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.2.9
+++ b/metadata/md5-cache/dev-db/mariadb-5.2.9
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://maria.llarian.net/download/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.9.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz mirror://gentoo/mysql-extras-20110819-0415Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110819-0415Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110819-0415Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110819-0415Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e73b8c9597edada6a4a1a8d37685b6a8
diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.6 b/metadata/md5-cache/dev-db/mariadb-5.3.6
index 1ee546ce3423..1a3c1cd0c4c4 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.3.6
+++ b/metadata/md5-cache/dev-db/mariadb-5.3.6
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.3
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz http://maria.llarian.net/download/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz http://launchpad.net/maria/5.3/ongoing/+download/mariadb-5.3.6.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz mirror://gentoo/mysql-extras-20120416-2021Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120416-2021Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43787170fbc9df8f7e49de6d00a6039a
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.23 b/metadata/md5-cache/dev-db/mariadb-5.5.23
index 3d0bd8c3f003..d46ef81c5b30 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.23
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.23
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.23/kvm-tarbake-jaunty-x86/mariadb-5.5.23.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.5.23/kvm-tarbake-jaunty-x86/mariadb-5.5.23.tar.gz http://maria.llarian.net/download/mariadb-5.5.23/kvm-tarbake-jaunty-x86/mariadb-5.5.23.tar.gz http://launchpad.net/maria/5.5/ongoing/+download/mariadb-5.5.23.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.23/kvm-tarbake-jaunty-x86/mariadb-5.5.23.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.5.23/kvm-tarbake-jaunty-x86/mariadb-5.5.23.tar.gz mirror://gentoo/mysql-extras-20120416-2021Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120416-2021Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120416-2021Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1d0395ad9e5a7d2c8dd4fc36228d5fe
diff --git a/metadata/md5-cache/dev-db/metakit-2.4.9.7-r1 b/metadata/md5-cache/dev-db/metakit-2.4.9.7-r1
index fb24945066e7..129d6f26e9a4 100644
--- a/metadata/md5-cache/dev-db/metakit-2.4.9.7-r1
+++ b/metadata/md5-cache/dev-db/metakit-2.4.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.equi4.com/pub/mk/metakit-2.4.9.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3accdfbea1a633fe5c5e381ad4bf0886
diff --git a/metadata/md5-cache/dev-db/mydumper-0.5.1 b/metadata/md5-cache/dev-db/mydumper-0.5.1
index f65317d915d3..b76082ab5267 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.5.1
+++ b/metadata/md5-cache/dev-db/mydumper-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libpcre virtual/mysql dev-libs/glib:2
 SLOT=0
 SRC_URI=http://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4b95f9c64e8a128a672553e61ce8c15
diff --git a/metadata/md5-cache/dev-db/mysql-4.0.27-r1 b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
index a2b5eb4de9d5..5d6c7b714065 100644
--- a/metadata/md5-cache/dev-db/mysql-4.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.0.27-r1
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQL-4.0/mysql-4.0.27.tar.gz mirror://gentoo/mysql-extras-20070105.tar.bz2 http://g3nt8.org/patches/mysql-extras-20070105.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20070105.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33d4ff394bcdd03f4f5f14a46173a4fa
diff --git a/metadata/md5-cache/dev-db/mysql-4.1.22-r1 b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
index 436f3998e7db..478cd56c8f69 100644
--- a/metadata/md5-cache/dev-db/mysql-4.1.22-r1
+++ b/metadata/md5-cache/dev-db/mysql-4.1.22-r1
@@ -9,5 +9,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-4.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQL-4.1/mysql-4.1.22.tar.gz mirror://gentoo/mysql-extras-20090228-2228Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20090228-2228Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20090228-2228Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62889e866961d648ba9a08e270ef13f5
diff --git a/metadata/md5-cache/dev-db/mysql-5.0.91 b/metadata/md5-cache/dev-db/mysql-5.0.91
index 1ae533487ddd..15a27a087359 100644
--- a/metadata/md5-cache/dev-db/mysql-5.0.91
+++ b/metadata/md5-cache/dev-db/mysql-5.0.91
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.91.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.91.tar.gz mirror://gentoo/mysql-extras-20100809-0452Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100809-0452Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100809-0452Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a9632880ae3a5aece20904a22263d2a
diff --git a/metadata/md5-cache/dev-db/mysql-5.0.92 b/metadata/md5-cache/dev-db/mysql-5.0.92
index 1232282a50c4..b9286bdeaab1 100644
--- a/metadata/md5-cache/dev-db/mysql-5.0.92
+++ b/metadata/md5-cache/dev-db/mysql-5.0.92
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.92.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.92.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=14358c5e085c9db5665ab5511a798f4f
diff --git a/metadata/md5-cache/dev-db/mysql-5.0.96 b/metadata/md5-cache/dev-db/mysql-5.0.96
index 65f9a34567a2..4aa3267f841f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.0.96
+++ b/metadata/md5-cache/dev-db/mysql-5.0.96
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.0
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.96.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.96.tar.gz mirror://gentoo/mysql-extras-20120401-2131Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120401-2131Z.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92f6cde57b86fb2b0c023957d54bba9c
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.51 b/metadata/md5-cache/dev-db/mysql-5.1.51
index fdac1f64643f..6632f5aa561e 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.51
+++ b/metadata/md5-cache/dev-db/mysql-5.1.51
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.51.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.51.tar.gz mirror://gentoo/mysql-extras-20101006-0004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101006-0004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101006-0004Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1798d5eec56fe60eb96f9d5187f90101
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.52 b/metadata/md5-cache/dev-db/mysql-5.1.52
index 333a794cf01a..9f66945e4485 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.52
+++ b/metadata/md5-cache/dev-db/mysql-5.1.52
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.52.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.52.tar.gz mirror://gentoo/mysql-extras-20101104-1842Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101104-1842Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101104-1842Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=612d470cbf4caaca80ddcdae3ca86a2a
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.52-r1 b/metadata/md5-cache/dev-db/mysql-5.1.52-r1
index 8e52a47a0f6f..305afdc6a911 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.52-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.52-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.52.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.52.tar.gz mirror://gentoo/mysql-extras-20101128-2122Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101128-2122Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101128-2122Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b541577bb0045454d653e20fff7dce5
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.53 b/metadata/md5-cache/dev-db/mysql-5.1.53
index fadbbba10d2f..e6f6b4c10530 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.53
+++ b/metadata/md5-cache/dev-db/mysql-5.1.53
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.53.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.53.tar.gz mirror://gentoo/mysql-extras-20101128-2122Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101128-2122Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101128-2122Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21c66e5b7d0ba791a20969a867beb724
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.56 b/metadata/md5-cache/dev-db/mysql-5.1.56
index ae676541e294..ffd3c6f8b8bd 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.56
+++ b/metadata/md5-cache/dev-db/mysql-5.1.56
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.56.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.56.tar.gz mirror://gentoo/mysql-extras-20110426-1046Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110426-1046Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql	da6299a12ec3617db0b148ef1f31afd8	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c2bbbebdd4c3d3b67df721599f2da85
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.56-r1 b/metadata/md5-cache/dev-db/mysql-5.1.56-r1
index 0368c07f0373..02dcd518b8b4 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.56-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.56-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.56.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.56.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110713-0702Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92a6f3e6ea30c043b46d3207034d35ae
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.57 b/metadata/md5-cache/dev-db/mysql-5.1.57
index 2121cf599ce4..2370a23bf08a 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.57
+++ b/metadata/md5-cache/dev-db/mysql-5.1.57
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.57.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.57.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110713-0702Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e3fb4fe0a32d13c3f72337fa38888e7
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.58-r1 b/metadata/md5-cache/dev-db/mysql-5.1.58-r1
index 03715ea370fc..8595d570b259 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.58-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.58-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.58.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.58.tar.gz mirror://gentoo/mysql-extras-20110721-0450Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110721-0450Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5eb0a76858f8b3fc3157a2f9d88e62f7
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.59 b/metadata/md5-cache/dev-db/mysql-5.1.59
index e395991d1620..7d5d9698406c 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.59
+++ b/metadata/md5-cache/dev-db/mysql-5.1.59
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.59.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.59.tar.gz mirror://gentoo/mysql-extras-20110721-0450Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110721-0450Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=914ffb4ac4e2f0c8faf1c18b6fe5325c
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.61 b/metadata/md5-cache/dev-db/mysql-5.1.61
index bbffb18974a9..fe278de81102 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.61
+++ b/metadata/md5-cache/dev-db/mysql-5.1.61
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.61.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.61.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d223adb91148dbfddda0a679bbb3f0a8
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.62 b/metadata/md5-cache/dev-db/mysql-5.1.62
index a7d7f6c842a9..fab162d0a804 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.62
+++ b/metadata/md5-cache/dev-db/mysql-5.1.62
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.62.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.62.tar.gz mirror://gentoo/mysql-extras-20120401-2131Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120401-2131Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=761dac83b4fd4d3ae2a57d4088a17941
diff --git a/metadata/md5-cache/dev-db/mysql-5.1.62-r1 b/metadata/md5-cache/dev-db/mysql-5.1.62-r1
index 543ad1942d04..ce7294737dca 100644
--- a/metadata/md5-cache/dev-db/mysql-5.1.62-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.1.62-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.62.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.62.tar.gz mirror://gentoo/mysql-extras-20120421-2004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120421-2004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120421-2004Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120421-2004Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	mysql-autotools	359d25dac56af1ce86f27b1ff08218ed	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb312800b1081b239cd643283b41a7bb
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.19 b/metadata/md5-cache/dev-db/mysql-5.5.19
index e0ebfd682542..ade8d16cf0d7 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.19
+++ b/metadata/md5-cache/dev-db/mysql-5.5.19
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.19.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.19.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110713-0702Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c5813fb9619dccd8aa7d8bbf43a57dc1
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.20 b/metadata/md5-cache/dev-db/mysql-5.5.20
index 611efc16cb50..df803bc52471 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.20
+++ b/metadata/md5-cache/dev-db/mysql-5.5.20
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.20.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f2656394c266450dbff4a7b43ffaa450
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.21 b/metadata/md5-cache/dev-db/mysql-5.5.21
index 73e9c6aeabfa..741c5a7c1465 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.21
+++ b/metadata/md5-cache/dev-db/mysql-5.5.21
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.21.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.21.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9e29f1eed089f1e590780c2720678cf
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.22 b/metadata/md5-cache/dev-db/mysql-5.5.22
index ebae0892c7de..00bf5873eeb6 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.22
+++ b/metadata/md5-cache/dev-db/mysql-5.5.22
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.22.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.22.tar.gz mirror://gentoo/mysql-extras-20120401-2131Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120401-2131Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120401-2131Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e4e7b88b13fff745d1594307cfaf721
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.22-r1 b/metadata/md5-cache/dev-db/mysql-5.5.22-r1
index 84a650f75b8b..a51c1ddde499 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.22-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.5.22-r1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.22.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.22.tar.gz mirror://gentoo/mysql-extras-20120421-2004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20120421-2004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20120421-2004Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20120421-2004Z.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	mysql-cmake	67a7ffae4d517dc0b59b0786f96fde87	mysql-v2	db6c57a13a07e38deb86a7fbd6862565	mysql_fx	f783e104c8bbd017eefc5359f327975b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d97966f9d11e4cfcf68bacf0485a693e
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.0-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.0-r1
index 839362751331..79f0223a8364 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.0-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/mysql-5.1 dev-libs/boost dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-C++/mysql-connector-c++-1.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf2c4ab6b19839e8c40f3f3de2b88217
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.35 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.35
index ef5a27caf295..74018c317b0d 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.35
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.35
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect dev-python/paramiko doc? ( dev-python/pysqlite:2 ) nls? ( sys-devel/gettext ) readline? ( sys-libs/readline ) app-admin/sudo sys-apps/net-tools =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.35-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c80d4f2c55b11ebb480b568eae798c82
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.39 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.39
index ca85bef95786..5feaf726dac3 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.39
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.39
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect dev-python/paramiko doc? ( dev-python/pysqlite:2 ) nls? ( sys-devel/gettext ) app-admin/sudo sys-apps/net-tools =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.39-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1c4508711473770d31f0434acaf3776b
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-5.2.40 b/metadata/md5-cache/dev-db/mysql-workbench-5.2.40
index 6105fde505dc..da9e2870a2af 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-5.2.40
+++ b/metadata/md5-cache/dev-db/mysql-workbench-5.2.40
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect >=dev-python/paramiko-1.7.4 doc? ( dev-python/pysqlite:2 ) gnome-keyring? ( gnome-base/libgnome-keyring ) nls? ( sys-devel/gettext ) app-admin/sudo sys-apps/net-tools =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.40-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3cb304f6bff72913941f0f45480f63d9
diff --git a/metadata/md5-cache/dev-db/opendbx-1.2.4 b/metadata/md5-cache/dev-db/opendbx-1.2.4
index 32655ad9310b..62df5d4f9f76 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.2.4
+++ b/metadata/md5-cache/dev-db/opendbx-1.2.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( =dev-db/sqlite-3* ) oracle? ( dev-db/oracle-instantclient-basic ) !bindist? ( firebird? ( dev-db/firebird ) )
 SLOT=0
 SRC_URI=http://www.linuxnetworks.de/opendbx/download/opendbx-1.2.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30aad3c40ef08738974c37441890ab2d
diff --git a/metadata/md5-cache/dev-db/opendbx-1.2.6 b/metadata/md5-cache/dev-db/opendbx-1.2.6
index 70dce59ca2f7..87ab231dfdac 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.2.6
+++ b/metadata/md5-cache/dev-db/opendbx-1.2.6
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( =dev-db/sqlite-3* ) oracle? ( dev-db/oracle-instantclient-basic ) !bindist? ( firebird? ( dev-db/firebird ) )
 SLOT=0
 SRC_URI=http://www.linuxnetworks.de/opendbx/download/opendbx-1.2.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85ea506c7eaf76ba1c0be31d95e9bba0
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.0 b/metadata/md5-cache/dev-db/opendbx-1.4.0
index d1a70448def3..4cd5c7641c73 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.0
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( =dev-db/sqlite-3* ) oracle? ( dev-db/oracle-instantclient-basic ) !bindist? ( firebird? ( dev-db/firebird ) )
 SLOT=0
 SRC_URI=http://www.linuxnetworks.de/opendbx/download/opendbx-1.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cd077397f2db26cb3353c3bbb9b8838
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.4 b/metadata/md5-cache/dev-db/opendbx-1.4.4
index 15de02f8d784..577288afea5f 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.4
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( =dev-db/sqlite-3* ) oracle? ( dev-db/oracle-instantclient-basic ) !bindist? ( firebird? ( dev-db/firebird ) )
 SLOT=0
 SRC_URI=http://www.linuxnetworks.de/opendbx/download/opendbx-1.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f5f27db52d5900fc912ec0405a775c8
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.5 b/metadata/md5-cache/dev-db/opendbx-1.4.5
index 70310bfbf03b..8f3b03bc332e 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.5
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( =dev-db/sqlite-3* ) oracle? ( dev-db/oracle-instantclient-basic ) !bindist? ( firebird? ( dev-db/firebird ) )
 SLOT=0
 SRC_URI=http://www.linuxnetworks.de/opendbx/download/opendbx-1.4.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65378df34d51d102524287726a02d325
diff --git a/metadata/md5-cache/dev-db/pgagent-3.2.1 b/metadata/md5-cache/dev-db/pgagent-3.2.1
index 4e5b636cd0d9..7c79bdecc9de 100644
--- a/metadata/md5-cache/dev-db/pgagent-3.2.1
+++ b/metadata/md5-cache/dev-db/pgagent-3.2.1
@@ -8,5 +8,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=dev-db/postgresql-base-8.3.0 x11-libs/wxGTK:2.8
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/pgagent/pgAgent-3.2.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=edea20349b461ba8523e168f020d3442
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.0.7 b/metadata/md5-cache/dev-db/postgresql-base-9.0.7
index 959d3146bd2b..d9fb0829cff5 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.0.7
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.0.7
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!de
 RESTRICT=test
 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
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5eb82d413dbb4ee90f9ed45c6da60c9c
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.0.8 b/metadata/md5-cache/dev-db/postgresql-base-9.0.8
index 6df79685654a..4a7e26e8d65b 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.0.8
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.0.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!de
 RESTRICT=test
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.8/postgresql-9.0.8.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e8f5e1435cbe1d83a5db4035bfb4bad3
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.1.3 b/metadata/md5-cache/dev-db/postgresql-base-9.1.3
index a8d154a15cbd..4c102ebbf24a 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.1.3
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.1.3
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 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
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6dda0664724cdc0996f83f63579349b5
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.1.4 b/metadata/md5-cache/dev-db/postgresql-base-9.1.4
index a000526ee767..b4318ebb2b7e 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.1.4
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.1.4
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.4/postgresql-9.1.4.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08cb935ded44de4179f620ccae69beb2
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta1 b/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta1
index db4824857427..5ae341b8aae8 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta1
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta1
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 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
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3defdd45586b255e0559d6c1805a3b64
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta2 b/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta2
index 4062d26211dc..d492a947e5eb 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta2
+++ b/metadata/md5-cache/dev-db/postgresql-base-9.2.0_beta2
@@ -11,5 +11,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.0beta2/postgresql-9.2beta2.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta2.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74431cb1679a2d929b3bd34494d074d2
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 58ecb6d6fae7..c5dba039dc4e 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.3.18
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.3.18
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.3.18 )
 RDEPEND=~dev-db/postgresql-base-8.3.18:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0fa1564d70445e500b289506a3a1a2fd
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.3.19 b/metadata/md5-cache/dev-db/postgresql-server-8.3.19
index 0768c81c5f3e..b3c924929396 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.3.19
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.3.19
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.3.19 )
 RDEPEND=~dev-db/postgresql-base-8.3.19:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=8.3
 SRC_URI=mirror://postgresql/source/v8.3.19/postgresql-8.3.19.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=709f610c7ca9818c6a35498db306795a
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.3.19-r1 b/metadata/md5-cache/dev-db/postgresql-server-8.3.19-r1
index 4433ca1bd10a..b33e2f9b7b76 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.3.19-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.3.19-r1
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.3.19 )
 RDEPEND=~dev-db/postgresql-base-8.3.19:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=8.3
 SRC_URI=mirror://postgresql/source/v8.3.19/postgresql-8.3.19.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6fc8531e03a2b03352f50fd728fdce7
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 cedd124a5789..dba34a79a957 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.11
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.11
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.4.11 )
 RDEPEND=~dev-db/postgresql-base-8.4.11:8.4[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a22f6592d526938488a789119f9a2591
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.4.12 b/metadata/md5-cache/dev-db/postgresql-server-8.4.12
index 9a15c3322852..f8a3591e14bf 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.12
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.12
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.4.12 )
 RDEPEND=~dev-db/postgresql-base-8.4.12:8.4[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.12/postgresql-8.4.12.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b56bcbea4c2c8393eb8d7ad0d254d730
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.4.12-r1 b/metadata/md5-cache/dev-db/postgresql-server-8.4.12-r1
index 7ecb65fd18ca..f2291e1f51f3 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.12-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.12-r1
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-8.4.12 )
 RDEPEND=~dev-db/postgresql-base-8.4.12:8.4[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.12/postgresql-8.4.12.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f92026e1ac755653891b6c0e5d65744
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 1a84ef227f3d..4d3e6f6427d1 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.7
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.7
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.0.7 )
 RDEPEND=~dev-db/postgresql-base-9.0.7:9.0[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26c27a2384d45be0ff5a7b60328ee5de
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.0.8 b/metadata/md5-cache/dev-db/postgresql-server-9.0.8
index 4113fce8d92c..4d7e44f76eae 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.8
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.8
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.0.8 )
 RDEPEND=~dev-db/postgresql-base-9.0.8:9.0[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.8/postgresql-9.0.8.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37444f286c5e1d088c1f31afc8208f67
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.0.8-r1 b/metadata/md5-cache/dev-db/postgresql-server-9.0.8-r1
index bcc5ab21a17a..ef09941799f1 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.8-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.8-r1
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.0.8 )
 RDEPEND=~dev-db/postgresql-base-9.0.8:9.0[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.8/postgresql-9.0.8.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d672168d1eb1ee306ee187245770aaa
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 b822724988f8..157de6e82f96 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.3
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.3
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.1.3 )
 RDEPEND=~dev-db/postgresql-base-9.1.3:9.1[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d0db13f8350062c05eb9b9c2d90bf9e
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.1.4 b/metadata/md5-cache/dev-db/postgresql-server-9.1.4
index f31b4a47f74b..43d3822bc188 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.4
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.4
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.1.4 )
 RDEPEND=~dev-db/postgresql-base-9.1.4:9.1[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.4/postgresql-9.1.4.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=934512f79f94888ff77a6c6f602eb648
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.1.4-r1 b/metadata/md5-cache/dev-db/postgresql-server-9.1.4-r1
index 5a8a4675df3a..a8340f617f6b 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.4-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.4-r1
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.1.4 )
 RDEPEND=~dev-db/postgresql-base-9.1.4:9.1[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.4/postgresql-9.1.4.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=014daad5d291f15b7283bbc3a9357078
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 bd7cff0e4931..c25c2d6bd9ac 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
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.2.0_beta1 )
 RDEPEND=~dev-db/postgresql-base-9.2.0_beta1:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0aef326c97366cf33b7d14f4424890c
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2 b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2
index 050d073141d3..e38372456270 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.2.0_beta2 )
 RDEPEND=~dev-db/postgresql-base-9.2.0_beta2:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.0beta2/postgresql-9.2beta2.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f88482b1456cf6e5fff121b34049ad67
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2-r1 b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2-r1
index 617e0c214b7a..2b8cd5fca0d6 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta2-r1
@@ -10,5 +10,5 @@ PDEPEND=doc? ( ~dev-db/postgresql-docs-9.2.0_beta2 )
 RDEPEND=~dev-db/postgresql-base-9.2.0_beta2:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.0beta2/postgresql-9.2beta2.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2be342bdb888ccd3dc22acea7bf2c9db
diff --git a/metadata/md5-cache/dev-db/redis-2.4.10 b/metadata/md5-cache/dev-db/redis-2.4.10
index 91e129ffead2..b86c7b8d6bc6 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.10
+++ b/metadata/md5-cache/dev-db/redis-2.4.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.10.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _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 b7aae55874c8..6f593b791ec9 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.13
+++ b/metadata/md5-cache/dev-db/redis-2.4.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _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 74d10d8ccd85..9cd9e711f000 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.14
+++ b/metadata/md5-cache/dev-db/redis-2.4.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.14.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _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 dbacc0d064ef..5734393a2615 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.4-r1
+++ b/metadata/md5-cache/dev-db/redis-2.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee048b5ac365d6043a01b274bff29ec5
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.10 b/metadata/md5-cache/dev-db/sqlite-3.7.10
index f312f7578bb0..b18ca0c8117e 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.10
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.10
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071000.zip ) tcl? ( http://sqlite.org/sqlite-src-3071000.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071000.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071000.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77f382aabf97e27b782cdd6aaccdb80b
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.11 b/metadata/md5-cache/dev-db/sqlite-3.7.11
index edc5827e17c5..6931a6f4b2ce 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.11
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.11
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071100.zip ) tcl? ( http://sqlite.org/sqlite-src-3071100.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071100.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071100.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=affbc576ddd26a4e4bc1f40c50b50c6d
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.12 b/metadata/md5-cache/dev-db/sqlite-3.7.12
index eec508d58a0e..b8289e6e6bb0 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.12
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.12
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071200.zip ) tcl? ( http://sqlite.org/sqlite-src-3071200.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071200.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071200.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a11218f679d9293342b59700bcb19e0e
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.12.1 b/metadata/md5-cache/dev-db/sqlite-3.7.12.1
index e63d9fc108c3..e29177714805 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.12.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.12.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071201.zip ) tcl? ( http://sqlite.org/sqlite-src-3071201.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071201.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071201.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fdfe630ba22d16e9cd81efc24c3fab04
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.13 b/metadata/md5-cache/dev-db/sqlite-3.7.13
index 42d24952fad1..4d0d527353ab 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.13
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.13
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071300.zip ) tcl? ( http://sqlite.org/sqlite-src-3071300.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071300.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071300.tar.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6fb3660228bf1c5007eb710480fa265b
diff --git a/metadata/md5-cache/dev-db/sqliteman-1.2.2 b/metadata/md5-cache/dev-db/sqliteman-1.2.2
index 9c13f110c4ff..5993ad142da3 100644
--- a/metadata/md5-cache/dev-db/sqliteman-1.2.2
+++ b/metadata/md5-cache/dev-db/sqliteman-1.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite] x11-libs/qscintilla
 SLOT=0
 SRC_URI=mirror://sourceforge/sqliteman/sqliteman-1.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f97c551474f443baeeac7a8d51dd0bf
diff --git a/metadata/md5-cache/dev-db/tora-2.1.1 b/metadata/md5-cache/dev-db/tora-2.1.1
index 309bc9fa02e9..a93af948976d 100644
--- a/metadata/md5-cache/dev-db/tora-2.1.1
+++ b/metadata/md5-cache/dev-db/tora-2.1.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tora/tora-2.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c61e1e9dd0532d6a987301c9db9fdfe5
diff --git a/metadata/md5-cache/dev-db/tora-2.1.3-r1 b/metadata/md5-cache/dev-db/tora-2.1.3-r1
index f34390fd17a0..4b61bdd2a56c 100644
--- a/metadata/md5-cache/dev-db/tora-2.1.3-r1
+++ b/metadata/md5-cache/dev-db/tora-2.1.3-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tora/tora-2.1.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e0358d62d0f5602d151ead39407c1ee
diff --git a/metadata/md5-cache/dev-dotnet/libgdiplus-2.10 b/metadata/md5-cache/dev-dotnet/libgdiplus-2.10
index d104b09f16bd..4a69130fc007 100644
--- a/metadata/md5-cache/dev-dotnet/libgdiplus-2.10
+++ b/metadata/md5-cache/dev-dotnet/libgdiplus-2.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16:2 >=media-libs/freetype-2.3.7 >=media-libs/fontconf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b513b877350b7993a49f238fd3cd2e6
diff --git a/metadata/md5-cache/dev-dotnet/libgdiplus-2.10.9 b/metadata/md5-cache/dev-dotnet/libgdiplus-2.10.9
index d7a268307c7a..f5d6b41b2f7a 100644
--- a/metadata/md5-cache/dev-dotnet/libgdiplus-2.10.9
+++ b/metadata/md5-cache/dev-dotnet/libgdiplus-2.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16:2 >=media-libs/freetype-2.3.7 >=media-libs/fontconf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dc84e00e64102386ec89fe283fea1890
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.6.2 b/metadata/md5-cache/dev-embedded/avr-libc-1.6.2
index bb16e9d80f6f..df7a5611a223 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.6.2
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.6.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.6.2.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.6.2.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.6.2.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18f496c76838f7c32dbc2b52a3b57c13
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.6.4 b/metadata/md5-cache/dev-embedded/avr-libc-1.6.4
index 129c7adcacec..9a86196440e0 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.6.4
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.6.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.6.4.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.6.2.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.6.2.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b98394beb6daff8089e2073f7d69ae36
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.6.8 b/metadata/md5-cache/dev-embedded/avr-libc-1.6.8
index 39bf8527416b..b5d6876cd394 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.6.8
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.6.8
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.6.8.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.6.2.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.6.2.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14c8c0639575f7917315f1a4bb98e6e7
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.7.0 b/metadata/md5-cache/dev-embedded/avr-libc-1.7.0
index e5ce225c3234..6a1e3c2f734d 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.7.0
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.7.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.7.0.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.7.0.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.7.0.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8181f7222a39e283d222652c0d9471ee
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.7.1 b/metadata/md5-cache/dev-embedded/avr-libc-1.7.1
index 4ce971314fc0..4545d37e7f23 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.7.1
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.7.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.7.1.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.7.1.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.7.1.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a49058137c7845368c9daf96b2381ccb
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-1.8.0 b/metadata/md5-cache/dev-embedded/avr-libc-1.8.0
index 03e348630e91..9bc53dd0466c 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-1.8.0
+++ b/metadata/md5-cache/dev-embedded/avr-libc-1.8.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/avr-libc/avr-libc-1.8.0.tar.bz2 http://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-1.8.0.tar.bz2 doc? ( http://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-1.8.0.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa2d5f99f70ed255fbda61a40fba585b
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20 b/metadata/md5-cache/dev-embedded/libftdi-0.20
index dce97bf35180..bbfe894d187b 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ede5541d39edd22a985cca89feaf427
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index e479a360631b..25bf5a5e7f8f 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -7,5 +7,5 @@ IUSE=cxx doc examples python
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5de01f1ff240ef28d6e1157e86d92a9b
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999.1.0 b/metadata/md5-cache/dev-embedded/libftdi-9999.1.0
index f9ca3e7b99c7..07e2b054864b 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999.1.0
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999.1.0
@@ -7,5 +7,5 @@ IUSE=cxx doc examples python
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19e78593ad9f14f00567f546f5be58c3
diff --git a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120224 b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120224
index 3cc92c2990d5..f32c71139170 100644
--- a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120224
+++ b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120224
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3-r2 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.21.1.tar.bz2 mirror://gentoo/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/msp430-binutils-2.21.1_p20120224.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2b9148d81d6e1a1f539a738b8bf668cb
diff --git a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120330 b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120330
index a765fb723b97..06447879c555 100644
--- a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120330
+++ b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120330
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3-r2 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.21.1.tar.bz2 mirror://gentoo/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/msp430-binutils-2.21.1_p20120330.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b32a206184fa2bff1f0260540b12744b
diff --git a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120406 b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120406
index 37ed02c6f271..e073558cb2df 100644
--- a/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120406
+++ b/metadata/md5-cache/dev-embedded/msp430-binutils-2.21.1_p20120406
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3-r2 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.21.1.tar.bz2 mirror://gentoo/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/msp430-binutils-2.21.1_p20120406.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f00260393912e3b027ac27695ec9711
diff --git a/metadata/md5-cache/dev-embedded/msp430-binutils-2.22_p20120514 b/metadata/md5-cache/dev-embedded/msp430-binutils-2.22_p20120514
index e8fd60c761d5..c2338c28534e 100644
--- a/metadata/md5-cache/dev-embedded/msp430-binutils-2.22_p20120514
+++ b/metadata/md5-cache/dev-embedded/msp430-binutils-2.22_p20120514
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3-r2 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.22.tar.bz2 mirror://gentoo/binutils-2.22-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22-patches-1.2.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/msp430-binutils-2.22_p20120514.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77f2d178634354cedeb856656a451bf0
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
index bb8d78664619..9e37d6d64873 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1_p20120224/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.1_p20120224.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a481e1253d945d762905cf5dc2cf724
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
index f88b4761dcab..6a3f81bafc14 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2_p20120311/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.2_p20120311.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b5b5255318d19cc7fefc63e83af6142
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
index fff8814a8c4a..ddc9724d9203 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2_p20120330/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.2_p20120330.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ae0bdaf85ce67d73900beb1dc75f58b
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
index c1b037b89dcc..1336a2178976 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3_p20120406/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.3_p20120406.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=812f676b33d442d98af9c0ffa440d85c
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
index da5552531038..1f7dde8228b0 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120514/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.7.0_p20120514.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3381b08a55c0014dc850c43bd92432a
diff --git a/metadata/md5-cache/dev-embedded/msp430-gdb-7.2_p20111205 b/metadata/md5-cache/dev-embedded/msp430-gdb-7.2_p20111205
index 7a7ec625292e..5116cff7cd50 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gdb-7.2_p20111205
+++ b/metadata/md5-cache/dev-embedded/msp430-gdb-7.2_p20111205
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/msp430-gdb-7.2_p20111205.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57e6acec547735fc620db81f6e5259d4
diff --git a/metadata/md5-cache/dev-embedded/picasm-1.14 b/metadata/md5-cache/dev-embedded/picasm-1.14
index 8e9ec42c1d07..da91b8e4f7b8 100644
--- a/metadata/md5-cache/dev-embedded/picasm-1.14
+++ b/metadata/md5-cache/dev-embedded/picasm-1.14
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://www.iki.fi/trossi/pic/picasm114.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce6bd65d140f87f2ef61d99727d3e515
diff --git a/metadata/md5-cache/dev-embedded/qvfb-4.6.3 b/metadata/md5-cache/dev-embedded/qvfb-4.6.3
index 11bd59b96c51..69b87ca4a194 100644
--- a/metadata/md5-cache/dev-embedded/qvfb-4.6.3
+++ b/metadata/md5-cache/dev-embedded/qvfb-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.6.3 !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d81ffff091b4e7640690dd49dae3592
diff --git a/metadata/md5-cache/dev-games/clanlib-0.8.1 b/metadata/md5-cache/dev-games/clanlib-0.8.1
index 0222d362f4a9..2406ea9167ac 100644
--- a/metadata/md5-cache/dev-games/clanlib-0.8.1
+++ b/metadata/md5-cache/dev-games/clanlib-0.8.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libpng virtual/jpeg virtual/opengl sdl? ( media-libs/libsdl media-libs/sdl-gfx ) x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm media-libs/alsa-lib mikmod? ( media-libs/libmikmod ) vorbis? ( media-libs/libvorbis )
 SLOT=0.8
 SRC_URI=http://clanlib.org/download/releases-0.8/ClanLib-0.8.1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea50d6eeae5a9132b7874e6cd513061a
diff --git a/metadata/md5-cache/dev-games/clanlib-2.3.4 b/metadata/md5-cache/dev-games/clanlib-2.3.4
index ff8b832913ea..6458ceada755 100644
--- a/metadata/md5-cache/dev-games/clanlib-2.3.4
+++ b/metadata/md5-cache/dev-games/clanlib-2.3.4
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=sys-libs/zlib X? ( media-libs/libpng virtual/jpeg media-libs/freetype media-libs/fontconfig opengl? ( virtual/opengl ) app-arch/bzip2 x11-libs/libX11 ) sqlite? ( dev-db/sqlite ) sound? ( media-libs/alsa-lib ) mikmod? ( media-libs/libmikmod media-libs/alsa-lib ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/alsa-lib )
 SLOT=2.3
 SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=418ef0fffcbe5a8167cbbb4320556aa2
diff --git a/metadata/md5-cache/dev-games/crystalspace-1.4.0 b/metadata/md5-cache/dev-games/crystalspace-1.4.0
index 4c79bb8ac26c..720945d637df 100644
--- a/metadata/md5-cache/dev-games/crystalspace-1.4.0
+++ b/metadata/md5-cache/dev-games/crystalspace-1.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( dev-games/ode ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) sdl? ( media-libs/libsdl ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng ) wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crystal/crystalspace-src-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=64870d341b119b3b35857bca7ed4b104
diff --git a/metadata/md5-cache/dev-games/ogre-1.6.5 b/metadata/md5-cache/dev-games/ogre-1.6.5
index 9ff6d47e2483..359f21811b42 100644
--- a/metadata/md5-cache/dev-games/ogre-1.6.5
+++ b/metadata/md5-cache/dev-games/ogre-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/zziplib media-libs/freetype:2 virtual/opengl x11-libs/libXt x11
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ogre/ogre-v1-6-5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1745914da86a4ad8d8a27eab2200d5f3
diff --git a/metadata/md5-cache/dev-games/ogre-1.7.4-r1 b/metadata/md5-cache/dev-games/ogre-1.7.4-r1
index cfbb8305465b..ed25e6933b8e 100644
--- a/metadata/md5-cache/dev-games/ogre-1.7.4-r1
+++ b/metadata/md5-cache/dev-games/ogre-1.7.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( || ( boost poco tbb ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ogre/ogre_src_v1-7-4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21cc40606fee32f971e295681fea5306
diff --git a/metadata/md5-cache/dev-games/ogre-1.8.0 b/metadata/md5-cache/dev-games/ogre-1.8.0
index f61040be8acf..74ebb9f812ed 100644
--- a/metadata/md5-cache/dev-games/ogre-1.8.0
+++ b/metadata/md5-cache/dev-games/ogre-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=threads? ( || ( boost poco tbb ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ogre/ogre_src_v1-8-0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1f2d491f31f510bf4d7bed1a49a55f3
diff --git a/metadata/md5-cache/dev-games/openscenegraph-2.8.3 b/metadata/md5-cache/dev-games/openscenegraph-2.8.3
index 662167dee5e3..899e3d82085b 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-2.8.3
+++ b/metadata/md5-cache/dev-games/openscenegraph-2.8.3
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=x11-libs/libSM x11-libs/libXext virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( || ( media-libs/coin media-libs/openinventor ) ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-2.8.3/source/OpenSceneGraph-2.8.3.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1df7deb1efe84c20fef0405c7ee33549
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.0.1 b/metadata/md5-cache/dev-games/openscenegraph-3.0.1
index 74a04aec771c..3220ca9fbb4d 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.0.1
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.0.1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) itk? ( dev-tcltk/itk ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( || ( media-libs/coin media-libs/openinventor ) ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=bc428d8f032bae3f3c1ad44dfd0b43aa
diff --git a/metadata/md5-cache/dev-games/physfs-2.0.1 b/metadata/md5-cache/dev-games/physfs-2.0.1
index 25fffcd85f43..166a0dec08e2 100644
--- a/metadata/md5-cache/dev-games/physfs-2.0.1
+++ b/metadata/md5-cache/dev-games/physfs-2.0.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-2.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=130e3a4bb03c949e7aaf17d560a8f335
diff --git a/metadata/md5-cache/dev-games/physfs-2.0.2-r1 b/metadata/md5-cache/dev-games/physfs-2.0.2-r1
index acfac080dfaa..74d2efc149f2 100644
--- a/metadata/md5-cache/dev-games/physfs-2.0.2-r1
+++ b/metadata/md5-cache/dev-games/physfs-2.0.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-2.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=557646b19d79a5db9c6f3667713d9dc7
diff --git a/metadata/md5-cache/dev-java/cacao-0.99.4 b/metadata/md5-cache/dev-java/cacao-0.99.4
index 28e8a185df5a..f43c58953be5 100644
--- a/metadata/md5-cache/dev-java/cacao-0.99.4
+++ b/metadata/md5-cache/dev-java/cacao-0.99.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e72fba2357c97504b1485e0a43bc8860
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 ca52f90ada9a..59c459ee559a 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 23a3156345d5..23f5e15fdf86 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4706d3dd814b5d8b4b15c199adadf1fa
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.11.3 b/metadata/md5-cache/dev-java/icedtea-6.1.11.3
index 7fab6c3ee644..eb1eea69de7e 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.11.3
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.11.3
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.11.3.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 http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=a5cffd6bbd6f02824424f5d6727d79fd
+_md5_=6e68978ef51da72816df5f6eac6feae3
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.1.1 b/metadata/md5-cache/dev-java/icedtea-7.2.1.1
index da3f3cff6860..2140ae775ca0 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.1.1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.1.1
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sy
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.1.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/338c21646c76.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp/archive/7a8825b15df6.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/d5ddeffc4651.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/8b7c4c5f6ba9.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools/archive/b534c4c6cd9b.tar.gz http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=95684dab604ebde05a6e201395423624
+_md5_=660527f005a9de0dd90adba3b4c26703
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.2.1 b/metadata/md5-cache/dev-java/icedtea-7.2.2.1
index 05bab35e7430..59e67862e9be 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.2.1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.2.1
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sy
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.2.1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/archive/0b776ef59474.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba/archive/38deb372c569.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp/archive/335fb0b059b7.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws/archive/5471e01ef43b.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk/archive/6c3b742b735d.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot/archive/889dffcf4a54.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools/archive/beea46c7086b.tar.gz http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=abac5d90fa581579adb150364069e9fb
+_md5_=7e2fcb593705a14deb0844b6cf3fe21b
diff --git a/metadata/md5-cache/dev-java/jamvm-1.5.4-r1 b/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
index 6fa61db54c57..2178f08eb303 100644
--- a/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
+++ b/metadata/md5-cache/dev-java/jamvm-1.5.4-r1
@@ -10,5 +10,5 @@ PDEPEND=dev-java/gjdoc dev-java/eclipse-ecj
 RDEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-1.5.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=524b76530c4bfc9f17885ec643578f30
diff --git a/metadata/md5-cache/dev-java/jamvm-1.5.4-r2 b/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
index 9754c87ae565..5314defb6d69 100644
--- a/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
+++ b/metadata/md5-cache/dev-java/jamvm-1.5.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-1.5.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-vm-2	b2ea63076444c18b292e4ac8ee7170ba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2998a0941234341fa159b1e18dca715d
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 69b66c5ecd7d..a4d80e9ad5c3 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 413ef580b7ee..98e81c0dfa0f 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 5a290e036141..850ecc82a635 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 0519ddcc7e03..70cd01f76865 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01c49897f7d884ddea9c83593d0f67fa
diff --git a/metadata/md5-cache/dev-java/jikes-1.22-r1 b/metadata/md5-cache/dev-java/jikes-1.22-r1
index 02ba4cedf3fb..0693c90f9163 100644
--- a/metadata/md5-cache/dev-java/jikes-1.22-r1
+++ b/metadata/md5-cache/dev-java/jikes-1.22-r1
@@ -5,5 +5,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=IBM
 SLOT=0
 SRC_URI=mirror://sourceforge/jikes/jikes-1.22.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c5a6f4ed64ac163d9932c0b1e304172
diff --git a/metadata/md5-cache/dev-java/jikes-1.22-r13 b/metadata/md5-cache/dev-java/jikes-1.22-r13
index d985e09c9808..adffd0712a91 100644
--- a/metadata/md5-cache/dev-java/jikes-1.22-r13
+++ b/metadata/md5-cache/dev-java/jikes-1.22-r13
@@ -6,5 +6,5 @@ LICENSE=IBM
 RDEPEND=>=dev-java/java-config-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jikes/jikes-1.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bcdc36f3a29aa4b8ab71a5a4946978f
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 279478a83327..ec162cdd542b 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 be621acca5b8..5f5ddfa90831 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 0e11155ed921..418c67418bc3 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.0
+++ b/metadata/md5-cache/dev-java/jna-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source?
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.0 -> jna-3.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3734af59bba3e2623dca5a07da051647
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 0cada531df23..259db380d3ca 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=03301d7661e39c4860498a89c4734232
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 24be0210f668..558ebca50bcd 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 c0059eceb881..1fdf1dbaa02f 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 37cf4cebe8c7..409a062fbfc0 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=257207896a88489992fa40bc4259a464
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 419bb7d9feb6..29aa14cf24ec 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a client, protocol, and server for running Java apps without incurri
 EAPI=2
 HOMEPAGE=http://martiansoftware.com/nailgun/index.html
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 !app-editors/ng >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=52234592a8ee44a8e5903dd2d71390da
+_md5_=4caf4c1ebe16e5594bf11107253a324a
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 9f4a7aab73df..6a9ba5ca5c6e 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 62f2ba6b3d74..c6ca9220477f 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7df0482b4e1a6576b7a617795086434
diff --git a/metadata/md5-cache/dev-lang/R-2.10.1 b/metadata/md5-cache/dev-lang/R-2.10.1
index b8c2306e9924..30b303f81465 100644
--- a/metadata/md5-cache/dev-lang/R-2.10.1
+++ b/metadata/md5-cache/dev-lang/R-2.10.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas vi
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.10.1.tar.gz bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2267f77cae5649c65ba72d963ac2deb0
diff --git a/metadata/md5-cache/dev-lang/R-2.14.1 b/metadata/md5-cache/dev-lang/R-2.14.1
index 91ee59108116..3a4760d574a3 100644
--- a/metadata/md5-cache/dev-lang/R-2.14.1
+++ b/metadata/md5-cache/dev-lang/R-2.14.1
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.14.1.tar.gz bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=44369d4fbc324da2c4ba25a4708a2537
diff --git a/metadata/md5-cache/dev-lang/R-2.14.2 b/metadata/md5-cache/dev-lang/R-2.14.2
index 0d78256a90c7..2a8fd9338b93 100644
--- a/metadata/md5-cache/dev-lang/R-2.14.2
+++ b/metadata/md5-cache/dev-lang/R-2.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.14.2.tar.gz bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45a5e7a9e0c1adbd089ae10c24b910df
diff --git a/metadata/md5-cache/dev-lang/R-2.15.0 b/metadata/md5-cache/dev-lang/R-2.15.0
index d6b4ec485b22..a6c26da4e5ff 100644
--- a/metadata/md5-cache/dev-lang/R-2.15.0
+++ b/metadata/md5-cache/dev-lang/R-2.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-2/R-2.15.0.tar.gz bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20120306.bash_completion.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d6b995801a7e7fccad18ffff83b6680
diff --git a/metadata/md5-cache/dev-lang/cilk-5.4.6 b/metadata/md5-cache/dev-lang/cilk-5.4.6
index c86d05a798f3..88230a29dd7b 100644
--- a/metadata/md5-cache/dev-lang/cilk-5.4.6
+++ b/metadata/md5-cache/dev-lang/cilk-5.4.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://supertech.csail.mit.edu/cilk/cilk-5.4.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95a29062d4066d1931257fe82770ed80
diff --git a/metadata/md5-cache/dev-lang/falcon-0.9.6.4 b/metadata/md5-cache/dev-lang/falcon-0.9.6.4
index e1a0415ee9a6..8de1e16c2349 100644
--- a/metadata/md5-cache/dev-lang/falcon-0.9.6.4
+++ b/metadata/md5-cache/dev-lang/falcon-0.9.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/zlib readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://falconpl.org/project_dl/_official_rel/Falcon-0.9.6.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb72d00f1ed8734076694d1a68edb2e2
diff --git a/metadata/md5-cache/dev-lang/gdl-0.9.2-r2 b/metadata/md5-cache/dev-lang/gdl-0.9.2-r2
index 86a14bdae1c9..7704543840a2 100644
--- a/metadata/md5-cache/dev-lang/gdl-0.9.2-r2
+++ b/metadata/md5-cache/dev-lang/gdl-0.9.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl sci-libs/plplot sys-libs/ncurses sys-libs/readline sys-libs/zlib x11-libs/libX11 fftw? ( >=sci-libs/fftw-3 ) grib? ( sci-libs/grib_api ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs ) hdf? ( sci-libs/hdf ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( media-gfx/imagemagick ) netcdf? ( || ( sci-libs/netcdf-cxx sci-libs/netcdf[cxx] ) ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) python? ( dev-python/numpy ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnudatalanguage/gdl-0.9.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1f6f632abfbf4fdc1180a96d3a486b5a
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.0 b/metadata/md5-cache/dev-lang/gforth-0.7.0
index c1f46321c362..c3087c7bab8c 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.0
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/ffcall emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.0.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15d40d1812024bb931fea431ddf811c8
diff --git a/metadata/md5-cache/dev-lang/ghc-6.10.4-r1 b/metadata/md5-cache/dev-lang/ghc-6.10.4-r1
index 71e76930c300..733ac61ef225 100644
--- a/metadata/md5-cache/dev-lang/ghc-6.10.4-r1
+++ b/metadata/md5-cache/dev-lang/ghc-6.10.4-r1
@@ -9,5 +9,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-0.9* ) bash-completion? ( ap
 RDEPEND=!dev-lang/ghc-bin >=sys-devel/gcc-2.95.3 >=sys-devel/binutils-2.17 >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=!binary? ( http://haskell.org/ghc/dist/6.10.4/ghc-6.10.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~ivanm/ghc-bin-6.10.4-alpha.tbz2 ) x86? ( http://code.haskell.org/~ivanm/ghc-bin-6.10.4-x86.tbz2 ) amd64? ( http://haskell.org/~kolmodin/ghc-bin-6.10.4-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-6.10.4-ia64.tbz2 ) sparc? ( http://haskell.org/~duncan/ghc/ghc-bin-6.10.4-sparc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-6.10.4-ppc64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-6.10.4-ppc.tbz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf851c80ce548652c521077bbfa5c6ab
diff --git a/metadata/md5-cache/dev-lang/ghc-6.12.3 b/metadata/md5-cache/dev-lang/ghc-6.12.3
index aeb0fb4c740d..3eb690528789 100644
--- a/metadata/md5-cache/dev-lang/ghc-6.12.3
+++ b/metadata/md5-cache/dev-lang/ghc-6.12.3
@@ -9,5 +9,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.1* ) bash-completion? ( ap
 RDEPEND=!dev-lang/ghc-bin >=sys-devel/gcc-2.95.3 >=sys-devel/binutils-2.17 >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=!binary? ( http://darcs.haskell.org/download/dist/6.12.3/ghc-6.12.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-6.12.3-alpha-haddock.tbz2 ) x86? ( mirror://gentoo/ghc-bin-6.12.3-x86.tbz2 ) amd64? ( mirror://gentoo/ghc-bin-6.12.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-6.12.3-ia64-haddock.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-6.12.3-sparc.tbz2 ) ppc64? ( mirror://gentoo/ghc-bin-6.12.3-ppc64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-6.12.3-ppc.tbz2 ) x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-6.12.3-x86-fbsd.tbz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27559275191417782ba0599bd7006501
diff --git a/metadata/md5-cache/dev-lang/ghc-6.12.3-r2 b/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
index 80e15b4a41c1..dad54d4b3439 100644
--- a/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
+++ b/metadata/md5-cache/dev-lang/ghc-6.12.3-r2
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( || ( =app-admin/haskell-updater-1.2* =app-admin/haskell
 RDEPEND=!dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=!binary? ( http://darcs.haskell.org/download/dist/6.12.3/ghc-6.12.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-6.12.3-alpha-haddock.tbz2 ) x86? ( mirror://gentoo/ghc-bin-6.12.3-x86.tbz2 ) amd64? ( mirror://gentoo/ghc-bin-6.12.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-6.12.3-ia64-haddock.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-6.12.3-sparc.tbz2 ) ppc64? ( mirror://gentoo/ghc-bin-6.12.3-ppc64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-6.12.3-ppc.tbz2 ) x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-6.12.3-x86-fbsd.tbz2 ) x86-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-i386-apple-darwin.tar.bz2 ) ppc-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-powerpc-apple-darwin.tar.bz2 ) x86-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-i386-unknown-solaris2.tar.bz2 ) sparc-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-sparc-sun-solaris2.tar.bz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b44f729815faff15d7a4270ba46db59
diff --git a/metadata/md5-cache/dev-lang/ghc-7.0.4 b/metadata/md5-cache/dev-lang/ghc-7.0.4
index 81e4ac67d67b..494fef59e28b 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.0.4
+++ b/metadata/md5-cache/dev-lang/ghc-7.0.4
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) dev-haskell/syb llvm?
 RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.0.4-alpha.tbz2 ) arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-7.0.4-arm.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.0.4-amd64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-7.0.4-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.0.4-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.0.4-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.0.4-x86.tbz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4ffb0b483b359b57bef4791890f98eb8
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.1 b/metadata/md5-cache/dev-lang/ghc-7.4.1
index 2dac82876636..04e6b4b9a209 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.1
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) llvm? ( sys-devel/llv
 RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.4.1-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.4.1-amd64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.4.1-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.4.1-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.4.1-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.4.1-x86.tbz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e7737e67394a8c44a29c6a8822433690
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.1-r1 b/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
index 1e9ea951ab28..7865d43cc9ce 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.1-r1
@@ -10,5 +10,5 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) llvm? ( sys-devel/llv
 RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 virtual/libffi !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.4.1-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.4.1-amd64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.4.1-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.4.1-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.4.1-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.4.1-x86.tbz2 ) x86-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-i386-apple-darwin.tar.bz2 ) x64-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-x86_64-apple-darwin.tar.bz2 ) x86-solaris? ( http://www.haskell.org/ghc/dist/7.0.3/maeder/ghc-7.0.3-i386-unknown-solaris2.tar.bz2 ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	ghc-package	f39fadb76cd4747582996e6b0d44479c	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=473411025994a59c41f98dac20d4d659
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6 b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
index 17e936dd3f3c..0bb9ce75f8a8 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-ada-3.4.6.tar.bz2 ppc? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-ppc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-i386.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eeb2c6d21655f7920d5a97153b959136
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2 b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
index 0c5650a4311d..9d9732e23a4f 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-core-4.1.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-ada-4.1.2.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab3e832a7916ce58d06d2351ab1801d2
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
index 167dd9bc1a52..0be8134631fd 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-core-4.2.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-ada-4.2.3.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a259448f05c628e3c0dbaff18e98777c
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
index 84b59a4f7ccb..7d95c0f1c655 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.2/gcc-core-4.3.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.2/gcc-ada-4.3.2.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b461113a7cba5452cd562a0e123c3e83
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
index 82e4d626e8ed..cd533ac036ab 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.3
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.3/gcc-core-4.3.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.3/gcc-ada-4.3.3.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=feeaad423a65bb02db9e628ad86c56cb
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
index 745f0561f340..adddd026b403 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-core-4.3.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-ada-4.3.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=76a71d17e6c6151874c70b5e8024fae5
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
index 4f13edfc2378..c90e580894db 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-core-4.3.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-ada-4.3.6.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8056623dcf0d15ae01bc0d5e232a5a3b
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
index 1810847ec41b..8728eaaa31dd 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-core-4.4.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-ada-4.4.3.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4654072e6cd012c2779063e02be289f
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
index 7cc37730fc9d..907e00ee7f06 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-core-4.4.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-ada-4.4.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4be9ae2cb9f084af14c892f57079eb4
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
index 69627d92b952..c7313d674408 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.5.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07d2be1f7a611c199a2d10e48661480d
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
index 409d9a13c9b0..64aa2723ac78 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.6.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.6.1.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-3.4-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e57bf5568e12cf472f0206ff9055cbda
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
index 28a26c92820d..78d92c1495fd 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/gcc-branch-4.1.3.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-4.1.3.2007.tar.bz2 x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1701384a77c51221065f0275dad4cd91
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008
index bda178494250..6c2c381ff0b0 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo//gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=76627fb84877d02ab081b9ac837898e5
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r1
index 8e93efbd3404..e8e9ea6196b7 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1-2008
 SRC_URI=mirror://gentoo//gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a57a7e08825e07e7601307d6656595c1
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
index c9f444765aa6..05bdfc30b217 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo//gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnatbuild	f76e63e8ed9a219e692b865f934a20b6	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=724c229abdf5e59f6042b058fd28dc18
diff --git a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.1 b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.1
index cf868c03ba01..a2a9b191ce97 100644
--- a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.1
+++ b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/smalltalk/smalltalk-3.2.1.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=971a66c913f3fdb23b5fcec83d6dbd09
diff --git a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.2 b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.2
index fd22819dbb46..8442f72d3188 100644
--- a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.2
+++ b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/smalltalk/smalltalk-3.2.2.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00d5280c116b3077d3c8daee74e52c50
diff --git a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.3 b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.3
index 2fc41e35a8af..b1f231c4c4fb 100644
--- a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.3
+++ b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/smalltalk/smalltalk-3.2.3.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fac6fabe5a78b4812c4f7abb2f53573
diff --git a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.4 b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.4
index 8d44404df6b8..76529611c305 100644
--- a/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.4
+++ b/metadata/md5-cache/dev-lang/gnu-smalltalk-3.2.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/smalltalk/smalltalk-3.2.4.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19964b374ed34020691b7fc8561aeba1
diff --git a/metadata/md5-cache/dev-lang/gpc-20051104 b/metadata/md5-cache/dev-lang/gpc-20051104
index c33957cf346b..35273cb80e24 100644
--- a/metadata/md5-cache/dev-lang/gpc-20051104
+++ b/metadata/md5-cache/dev-lang/gpc-20051104
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.math.uni.wroc.pl/~hebisch/gpc/gpc-20051104.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=930a44e4436be529c013c6a109fe10d1
diff --git a/metadata/md5-cache/dev-lang/gpc-20070904 b/metadata/md5-cache/dev-lang/gpc-20070904
index 41781e044798..d2538c159b64 100644
--- a/metadata/md5-cache/dev-lang/gpc-20070904
+++ b/metadata/md5-cache/dev-lang/gpc-20070904
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.math.uni.wroc.pl/~hebisch/gpc/gpc-20070904.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20d371bee37a5fc827e5dc0f323fc45a
diff --git a/metadata/md5-cache/dev-lang/gprolog-1.4.0 b/metadata/md5-cache/dev-lang/gprolog-1.4.0
index e7c506e912a3..ecc06530dd69 100644
--- a/metadata/md5-cache/dev-lang/gprolog-1.4.0
+++ b/metadata/md5-cache/dev-lang/gprolog-1.4.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gprolog/gprolog-1.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79b8ed227810a0d7e7d18d52caf1ee5b
diff --git a/metadata/md5-cache/dev-lang/icon-9.4.3-r5 b/metadata/md5-cache/dev-lang/icon-9.4.3-r5
index 59b026a235d6..fb0e7cada0b8 100644
--- a/metadata/md5-cache/dev-lang/icon-9.4.3-r5
+++ b/metadata/md5-cache/dev-lang/icon-9.4.3-r5
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=X? ( x11-proto/xextproto x11-proto/xproto x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) sys-devel/gcc
 SLOT=0
 SRC_URI=http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v943src.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f280d63118e264dd4fcac93a1917289
diff --git a/metadata/md5-cache/dev-lang/icon-9.5.0 b/metadata/md5-cache/dev-lang/icon-9.5.0
index 45c3016cd905..e0501bc9e048 100644
--- a/metadata/md5-cache/dev-lang/icon-9.5.0
+++ b/metadata/md5-cache/dev-lang/icon-9.5.0
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=X? ( x11-proto/xextproto x11-proto/xproto x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) sys-devel/gcc
 SLOT=0
 SRC_URI=http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v950src.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1972eafdddcdd75eec32af8e813e19d2
diff --git a/metadata/md5-cache/dev-lang/io-2011.09.12-r1 b/metadata/md5-cache/dev-lang/io-2011.09.12-r1
index 252b28c89d2b..b6d541d2e247 100644
--- a/metadata/md5-cache/dev-lang/io-2011.09.12-r1
+++ b/metadata/md5-cache/dev-lang/io-2011.09.12-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 REQUIRED_USE=vorbis? ( ogg )
 SLOT=0
 SRC_URI=mirror://gentoo/io-2011.09.12.tar.gz http://dev.gentoo.org/~araujo/snapshots/io-2011.09.12.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f0670f3c0c7a5206ae0f841e46f4668
diff --git a/metadata/md5-cache/dev-lang/mercury-11.01 b/metadata/md5-cache/dev-lang/mercury-11.01
index e4628e75a8a5..d9d31d726e8e 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.01
+++ b/metadata/md5-cache/dev-lang/mercury-11.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.01.tar.gz mirror://gentoo/mercury-11.01-gentoo-patchset-1.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.01.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bfcc66e7f2265d6880c442eea0c6258c
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07 b/metadata/md5-cache/dev-lang/mercury-11.07
index 3a2efe57c202..90a4bdee82ae 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07
+++ b/metadata/md5-cache/dev-lang/mercury-11.07
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.tar.gz mirror://gentoo/mercury-11.07-gentoo-patchset-0.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd17983c27917ae3410740e6c95a6bf1
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.1 b/metadata/md5-cache/dev-lang/mercury-11.07.1
index 28c21307370c..2a8219d21473 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.1
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-2.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4b561b88eb19398d8eaf03a75e7f6615
+SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-3.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2a7e3e8d6412719ee1896ee17a289678
diff --git a/metadata/md5-cache/dev-lang/mono-2.10.5 b/metadata/md5-cache/dev-lang/mono-2.10.5
index dca7656fb773..1b8a8302afc7 100644
--- a/metadata/md5-cache/dev-lang/mono-2.10.5
+++ b/metadata/md5-cache/dev-lang/mono-2.10.5
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/monodoc !minimal? ( =dev-dotnet/libgdiplus-2.10* ) ia64? ( sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-2.10.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d3e7417751aeaffa315f49062e20f9b
diff --git a/metadata/md5-cache/dev-lang/mono-2.10.8 b/metadata/md5-cache/dev-lang/mono-2.10.8
index a514ec60807f..9b74da09a6a9 100644
--- a/metadata/md5-cache/dev-lang/mono-2.10.8
+++ b/metadata/md5-cache/dev-lang/mono-2.10.8
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/monodoc !minimal? ( =dev-dotnet/libgdiplus-2.10* ) ia64? ( sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-2.10.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c497205cef2f50432bd75560cb858310
diff --git a/metadata/md5-cache/dev-lang/mono-2.10.9 b/metadata/md5-cache/dev-lang/mono-2.10.9
index 054f7cabf95a..f30992690544 100644
--- a/metadata/md5-cache/dev-lang/mono-2.10.9
+++ b/metadata/md5-cache/dev-lang/mono-2.10.9
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/monodoc !minimal? ( =dev-dotnet/libgdiplus-2.10* ) ia64? ( sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-2.10.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=649c6c4ae003b698b2128ce8016e54b7
diff --git a/metadata/md5-cache/dev-lang/mono-2.11.1 b/metadata/md5-cache/dev-lang/mono-2.11.1
index e7474e4f285a..fa6f57d18f0c 100644
--- a/metadata/md5-cache/dev-lang/mono-2.11.1
+++ b/metadata/md5-cache/dev-lang/mono-2.11.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-util/monodoc !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-2.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bdb254fd057a8d8990eaf3e21abc921d
diff --git a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p7311 b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p7311
index a7f507a1b6bb..50b747b25c10 100644
--- a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p7311
+++ b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p7311
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/gmp-5.0.2 >=dev-libs/mpfr-3.0.1 >=sys-libs/glibc-2.8 >=sys-li
 RESTRICT=strip test
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.20.1.tar.bz2 ftp://sources.redhat.com/pub/newlib/newlib-1.18.0.tar.gz mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r7311/nacltoolchain-buildscripts-r7311.tar.gz http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r7311/naclbinutils-2.20.1-r7311.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r7311/naclnewlib-1.18.0-r7311.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r7311/naclgcc-4.4.3-r7311.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7758fc3d4497f6983f87f0e82bd2153a
diff --git a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8034 b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8034
index a5b2706e53a7..d02f84a80b1a 100644
--- a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8034
+++ b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8034
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/gmp-5.0.2 >=dev-libs/mpfr-3.0.1 >=sys-libs/glibc-2.8 >=sys-li
 RESTRICT=strip test
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.20.1.tar.bz2 ftp://sources.redhat.com/pub/newlib/newlib-1.18.0.tar.gz mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8034/nacltoolchain-buildscripts-r8034.tar.gz http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8034/naclbinutils-2.20.1-r8034.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8034/naclnewlib-1.18.0-r8034.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8034/naclgcc-4.4.3-r8034.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8102bf61cf4f68213057e6f5b1f6e96
diff --git a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8989 b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8989
index 640a0854da58..e507dfd7cf67 100644
--- a/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8989
+++ b/metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p8989
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/gmp-5.0.2 >=dev-libs/mpfr-3.0.1 >=sys-libs/glibc-2.8 >=sys-li
 RESTRICT=strip test
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.20.1.tar.bz2 ftp://sources.redhat.com/pub/newlib/newlib-1.20.0.tar.gz mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8989/nacltoolchain-buildscripts-r8989.tar.gz http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8989/naclbinutils-2.20.1-r8989.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8989/naclnewlib-1.20.0-r8989.patch.bz2 http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r8989/naclgcc-4.4.3-r8989.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1036b5f5ef403af9f38ab2514742fcf4
diff --git a/metadata/md5-cache/dev-lang/nasm-2.09.10 b/metadata/md5-cache/dev-lang/nasm-2.09.10
index 2e7b4d75908c..d80c0933f7d6 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.09.10
+++ b/metadata/md5-cache/dev-lang/nasm-2.09.10
@@ -8,5 +8,5 @@ KEYWORDS=-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.09.10/nasm-2.09.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2690cdbc912bafe74101ceadcce055b
diff --git a/metadata/md5-cache/dev-lang/nasm-2.10 b/metadata/md5-cache/dev-lang/nasm-2.10
index 5728ffb33ed8..95bb9a1fc933 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.10
+++ b/metadata/md5-cache/dev-lang/nasm-2.10
@@ -8,5 +8,5 @@ KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.10/nasm-2.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1a858cf554b3915877072e022590e08
diff --git a/metadata/md5-cache/dev-lang/nasm-2.10.01 b/metadata/md5-cache/dev-lang/nasm-2.10.01
index 035da9f10e7c..6898cfa03cdf 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.10.01
+++ b/metadata/md5-cache/dev-lang/nasm-2.10.01
@@ -8,5 +8,5 @@ KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-lin
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.10.01/nasm-2.10.01.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=552963d25b2d93c04e23e0f9a831c938
diff --git a/metadata/md5-cache/dev-lang/ocaml-3.11.2 b/metadata/md5-cache/dev-lang/ocaml-3.11.2
index b9d3d96262a2..77805fa432f2 100644
--- a/metadata/md5-cache/dev-lang/ocaml-3.11.2
+++ b/metadata/md5-cache/dev-lang/ocaml-3.11.2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=tk? ( >=dev-lang/tk-3.3.3 ) ncurses? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-proto/xproto ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-3.11/ocaml-3.11.2.tar.bz2 mirror://gentoo/ocaml-patches-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62eff2acdd1e8fcc10aecbe9441316c5
diff --git a/metadata/md5-cache/dev-lang/ocaml-3.12.1 b/metadata/md5-cache/dev-lang/ocaml-3.12.1
index 91ac27122e09..502bbf6d1f10 100644
--- a/metadata/md5-cache/dev-lang/ocaml-3.12.1
+++ b/metadata/md5-cache/dev-lang/ocaml-3.12.1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=tk? ( >=dev-lang/tk-3.3.3 ) ncurses? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-proto/xproto ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-3.12/ocaml-3.12.1.tar.bz2 mirror://gentoo/ocaml-patches-3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d34b72d1ca430152de1fe0110c27a60
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.00.0_beta2 b/metadata/md5-cache/dev-lang/ocaml-4.00.0_beta2
index 85c940dc7ffd..12e8cd75f08d 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.00.0_beta2
+++ b/metadata/md5-cache/dev-lang/ocaml-4.00.0_beta2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=tk? ( >=dev-lang/tk-3.3.3 ) ncurses? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-proto/xproto )
 SLOT=0
 SRC_URI=ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-4.00/ocaml-4.00.0+beta2.tar.bz2 mirror://gentoo/ocaml-patches-4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d69be76338fc99015cad60a4e686fd33
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.11 b/metadata/md5-cache/dev-lang/orc-0.4.11
index 0997b4bc29cf..404e0a14fa4a 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.11
+++ b/metadata/md5-cache/dev-lang/orc-0.4.11
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-sol
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.11.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2578f9ab529cdb585dc1c4ae3a667252
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.14 b/metadata/md5-cache/dev-lang/orc-0.4.14
index 97c31a0fdb5b..0e7eebabc2a6 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.14
+++ b/metadata/md5-cache/dev-lang/orc-0.4.14
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.14.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09f294300d02217076aef1c79b3c4333
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.16 b/metadata/md5-cache/dev-lang/orc-0.4.16
index ab25fb34555e..b8c0420dc8c7 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.16
+++ b/metadata/md5-cache/dev-lang/orc-0.4.16
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~p
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5f1ba333022a3e3e97d9750cdc692e1
diff --git a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110821 b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110821
index 103bd227fa03..9fb305d6748a 100644
--- a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110821
+++ b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110821
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!native? ( sys-devel/gcc[vanilla] ) native? ( || ( dev-lang/ekopath dev-lang/path64 ) ) valgrind? ( dev-util/valgrind )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~xarthisius/distfiles/path64-suite-1.0.0_pre20110821.tbz2 http://dev.gentoo.org/~xarthisius/distfiles/path64-compiler-1.0.0_pre20110821.tbz2 assembler? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-assembler-1.0.0_pre20110821.tbz2 ) debugger? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-debugger-1.0.0_pre20110821.tbz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a4b1f7af6978c864b461f7062c8aab5
diff --git a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110924 b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110924
index 10efc5121120..0a3b8730cf6c 100644
--- a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110924
+++ b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20110924
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!native? ( sys-devel/gcc[vanilla] ) native? ( || ( dev-lang/ekopath dev-lang/path64 ) ) valgrind? ( dev-util/valgrind )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~xarthisius/distfiles/path64-suite-1.0.0_pre20110924.tbz2 http://dev.gentoo.org/~xarthisius/distfiles/path64-compiler-1.0.0_pre20110924.tbz2 assembler? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-assembler-1.0.0_pre20110924.tbz2 ) debugger? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-debugger-1.0.0_pre20110924.tbz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=819fa3e252ee71288e379dcd2ab418f5
diff --git a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20111108 b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20111108
index 635f583ee5bd..f5e51936decd 100644
--- a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20111108
+++ b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20111108
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!native? ( sys-devel/gcc[vanilla] ) native? ( || ( dev-lang/ekopath dev-lang/path64 ) ) valgrind? ( dev-util/valgrind )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~xarthisius/distfiles/path64-suite-1.0.0_pre20111108.tbz2 http://dev.gentoo.org/~xarthisius/distfiles/path64-compiler-1.0.0_pre20111108.tbz2 assembler? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-assembler-1.0.0_pre20111108.tbz2 ) debugger? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-debugger-1.0.0_pre20111108.tbz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c708d496b5ab6e5fa2c7db0d8faaaaa
diff --git a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20120223 b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20120223
index ec6841ef40aa..319f9c9aeafd 100644
--- a/metadata/md5-cache/dev-lang/path64-1.0.0_pre20120223
+++ b/metadata/md5-cache/dev-lang/path64-1.0.0_pre20120223
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!native? ( sys-devel/gcc[vanilla] ) native? ( || ( dev-lang/ekopath dev-lang/path64 ) ) valgrind? ( dev-util/valgrind )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~xarthisius/distfiles/path64-suite-1.0.0_pre20120223.tbz2 http://dev.gentoo.org/~xarthisius/distfiles/path64-compiler-1.0.0_pre20120223.tbz2 assembler? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-assembler-1.0.0_pre20120223.tbz2 ) debugger? ( http://dev.gentoo.org/~xarthisius/distfiles/path64-debugger-1.0.0_pre20120223.tbz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2e3d00ba06877382908a2517e193cd1
diff --git a/metadata/md5-cache/dev-lang/perl-5.10.1 b/metadata/md5-cache/dev-lang/perl-5.10.1
index 57b25bfe0d2f..aec777fa740c 100644
--- a/metadata/md5-cache/dev-lang/perl-5.10.1
+++ b/metadata/md5-cache/dev-lang/perl-5.10.1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2_pre090920
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-devel/libperl-5.10.1 !!<sys-devel/libperl-5.10.1 app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.10.1.tar.bz2 mirror://gentoo/perl-5.10.1-9.tar.bz2 http://dev.gentoo.org/~tove/files/perl-5.10.1-9.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b728b5a85c5f00e6bfc9473b787f8df6
diff --git a/metadata/md5-cache/dev-lang/perl-5.12.3-r1 b/metadata/md5-cache/dev-lang/perl-5.12.3-r1
index 0dea5a162178..542c37cda066 100644
--- a/metadata/md5-cache/dev-lang/perl-5.12.3-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.12.3-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-devel/libperl-5.10.1 !!<sys-devel/libperl-5.10.1 app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.12.3.tar.bz2 mirror://cpan/authors/id/R/RJ/RJBS/perl-5.12.3.tar.bz2 mirror://gentoo/perl-5.12.3-4.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.12.3-4.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a44b1a177faeaa4d006a014222f0b28b
diff --git a/metadata/md5-cache/dev-lang/perl-5.12.4 b/metadata/md5-cache/dev-lang/perl-5.12.4
index e91f6c6248f1..260cec2aaf3c 100644
--- a/metadata/md5-cache/dev-lang/perl-5.12.4
+++ b/metadata/md5-cache/dev-lang/perl-5.12.4
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-devel/libperl-5.10.1 !!<sys-devel/libperl-5.10.1 app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.12.4.tar.bz2 mirror://cpan/authors/id/L/LB/LBROCARD/perl-5.12.4.tar.bz2 mirror://gentoo/perl-5.12.4-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.12.4-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ff1639ccf3feb61683030c644f6f79b
diff --git a/metadata/md5-cache/dev-lang/perl-5.12.4-r1 b/metadata/md5-cache/dev-lang/perl-5.12.4-r1
index 6cb1d7e9f167..944ce0528146 100644
--- a/metadata/md5-cache/dev-lang/perl-5.12.4-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.12.4-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-devel/libperl-5.10.1 !!<sys-devel/libperl-5.10.1 app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.12.4.tar.bz2 mirror://cpan/authors/id/L/LB/LBROCARD/perl-5.12.4.tar.bz2 mirror://gentoo/perl-5.12.4-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.12.4-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=931be1ceeb6f77201d0fde6a515d90a6
diff --git a/metadata/md5-cache/dev-lang/perl-5.12.4-r2 b/metadata/md5-cache/dev-lang/perl-5.12.4-r2
index 77c5f6410e6c..cf0a185abc51 100644
--- a/metadata/md5-cache/dev-lang/perl-5.12.4-r2
+++ b/metadata/md5-cache/dev-lang/perl-5.12.4-r2
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-devel/libperl-5.10.1 !!<sys-devel/libperl-5.10.1 app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.12.4.tar.bz2 mirror://cpan/authors/id/L/LB/LBROCARD/perl-5.12.4.tar.bz2 mirror://gentoo/perl-5.12.4-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.12.4-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0767e1bd9c1af33eb8e2e1f5b0847ea
diff --git a/metadata/md5-cache/dev-lang/perl-5.14.1 b/metadata/md5-cache/dev-lang/perl-5.14.1
index 3f8a93434929..80a457e8412f 100644
--- a/metadata/md5-cache/dev-lang/perl-5.14.1
+++ b/metadata/md5-cache/dev-lang/perl-5.14.1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.14.1.tar.bz2 mirror://cpan/authors/id/J/JE/JESSE/perl-5.14.1.tar.bz2 mirror://gentoo/perl-5.14.1-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.14.1-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfc12ddc5eb12c363b0cf8add2cb023a
diff --git a/metadata/md5-cache/dev-lang/perl-5.14.1-r1 b/metadata/md5-cache/dev-lang/perl-5.14.1-r1
index 7bec64c734aa..4478acb83f9d 100644
--- a/metadata/md5-cache/dev-lang/perl-5.14.1-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.14.1-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.14.1.tar.bz2 mirror://cpan/authors/id/J/JE/JESSE/perl-5.14.1.tar.bz2 mirror://gentoo/perl-5.14.1-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.14.1-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=418d266015326eaa441cb81e5fb50b4c
diff --git a/metadata/md5-cache/dev-lang/perl-5.14.2 b/metadata/md5-cache/dev-lang/perl-5.14.2
index 857b92ec5150..30ad63b77722 100644
--- a/metadata/md5-cache/dev-lang/perl-5.14.2
+++ b/metadata/md5-cache/dev-lang/perl-5.14.2
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.14.2.tar.bz2 mirror://cpan/authors/id/F/FL/FLORA/perl-5.14.2.tar.bz2 mirror://gentoo/perl-5.14.2-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.14.2-1.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c66b12fb808111dff247fab5df94b11
diff --git a/metadata/md5-cache/dev-lang/perl-5.16.0 b/metadata/md5-cache/dev-lang/perl-5.16.0
index 86248f03d252..e48dc43e44d3 100644
--- a/metadata/md5-cache/dev-lang/perl-5.16.0
+++ b/metadata/md5-cache/dev-lang/perl-5.16.0
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.16.0.tar.bz2 mirror://cpan/authors/id/R/RJ/RJBS/perl-5.16.0.tar.bz2 mirror://gentoo/perl-5.16.0-3.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.16.0-3.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed7dbef76e4342edb941d4ce10373f7f
diff --git a/metadata/md5-cache/dev-lang/perl-5.8.8-r8 b/metadata/md5-cache/dev-lang/perl-5.8.8-r8
index dc012cbf3fea..16ecebe406ae 100644
--- a/metadata/md5-cache/dev-lang/perl-5.8.8-r8
+++ b/metadata/md5-cache/dev-lang/perl-5.8.8-r8
@@ -9,5 +9,5 @@ PDEPEND=>=app-admin/perl-cleaner-1.03
 RDEPEND=~sys-devel/libperl-5.8.8 berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) build? ( !perl-core/Test-Harness !perl-core/PodParser !dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://cpan/src/perl-5.8.8.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ab32304418affdc74fc3a3f0a0c0b07
diff --git a/metadata/md5-cache/dev-lang/php-5.3.13 b/metadata/md5-cache/dev-lang/php-5.3.13
index b7e5e905c386..bf09290d2d46 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.13
+++ b/metadata/md5-cache/dev-lang/php-5.3.13
@@ -12,5 +12,5 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 RESTRICT=mirror
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.13.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.13-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a0ccad9bb9a646445e709b5110b473f
diff --git a/metadata/md5-cache/dev-lang/php-5.3.14 b/metadata/md5-cache/dev-lang/php-5.3.14
index bbb36bfc34c0..49449c113da0 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.14
+++ b/metadata/md5-cache/dev-lang/php-5.3.14
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=4
 HOMEPAGE=http://php.net/
 IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) apache2? ( =www-servers/apache-2* )
@@ -12,5 +12,5 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 RESTRICT=mirror
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.14.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.14-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e1f340cf431a06b122209e9cce1001b9
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2e78b7bf89f4bb1ea9a367a50774c523
diff --git a/metadata/md5-cache/dev-lang/php-5.3.14_rc2 b/metadata/md5-cache/dev-lang/php-5.3.14_rc2
index c89eb1c354bc..b25eaf9024f7 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.14_rc2
+++ b/metadata/md5-cache/dev-lang/php-5.3.14_rc2
@@ -11,5 +11,5 @@ RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[un
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.3
 SRC_URI=http://downloads.php.net/johannes/php-5.3.14RC2.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.14_rc2-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ef4c8555d41bdd393ba0c6e87a1b5f0
diff --git a/metadata/md5-cache/dev-lang/php-5.4.3 b/metadata/md5-cache/dev-lang/php-5.4.3
index e6dba8618d74..c790ffd0299f 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.3
+++ b/metadata/md5-cache/dev-lang/php-5.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2?
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.3.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9f9040baa0da435344ec98aec8a292c
diff --git a/metadata/md5-cache/dev-lang/php-5.4.4 b/metadata/md5-cache/dev-lang/php-5.4.4
index 6454e8b6447f..96ea257ebc29 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.4
+++ b/metadata/md5-cache/dev-lang/php-5.4.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2?
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.4.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bea6625af93b53c14e76379d7439ade1
diff --git a/metadata/md5-cache/dev-lang/php-5.4.4_rc2 b/metadata/md5-cache/dev-lang/php-5.4.4_rc2
index dc23d9b3f7d5..befc3a31afa8 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.4_rc2
+++ b/metadata/md5-cache/dev-lang/php-5.4.4_rc2
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2?
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://downloads.php.net/stas/php-5.4.4RC2.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a0b32f9b61e9e5d85a6e30ec777c6ba
diff --git a/metadata/md5-cache/dev-lang/python-2.5.4-r4 b/metadata/md5-cache/dev-lang/python-2.5.4-r4
index f6abc0e10eb6..de165e0a1d1f 100644
--- a/metadata/md5-cache/dev-lang/python-2.5.4-r4
+++ b/metadata/md5-cache/dev-lang/python-2.5.4-r4
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) doc? ( dev-python/python-docs:2.5 ) !build? ( app-misc/mime-types ) >=app-admin/eselect-python-20091230
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2 mirror://gentoo/python-gentoo-patches-2.5.4-r3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14068a44813134706d81b384248d337e
diff --git a/metadata/md5-cache/dev-lang/python-2.6.6-r2 b/metadata/md5-cache/dev-lang/python-2.6.6-r2
index 51a7e33f00f1..0bec4744c0ce 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.6-r2
+++ b/metadata/md5-cache/dev-lang/python-2.6.6-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.6-r2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7833649ee7bb3da48cf8a21dfd4242b
diff --git a/metadata/md5-cache/dev-lang/python-2.6.7-r2 b/metadata/md5-cache/dev-lang/python-2.6.7-r2
index 559c97aaf030..f26712ffba61 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.7-r2
+++ b/metadata/md5-cache/dev-lang/python-2.6.7-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c3f5598fd1866ecda1a4105f5be8dc3
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8 b/metadata/md5-cache/dev-lang/python-2.6.8
index 56a724c03caa..d73a2534cb3a 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.8
+++ b/metadata/md5-cache/dev-lang/python-2.6.8
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb42f23b1b6a5913f3dcbe5431ee3647
diff --git a/metadata/md5-cache/dev-lang/python-2.7.2-r3 b/metadata/md5-cache/dev-lang/python-2.7.2-r3
index cbfeee14a703..5b9936cbb8fe 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.2-r3
+++ b/metadata/md5-cache/dev-lang/python-2.7.2-r3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.2/Python-2.7.2.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a805c57db6074d02b33b82f24bc8bee
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3 b/metadata/md5-cache/dev-lang/python-2.7.3
index 1b09cd57dc24..e6fb3ecb3141 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3
+++ b/metadata/md5-cache/dev-lang/python-2.7.3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8400274bcebb4578995b2a2b6816b5d
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r1 b/metadata/md5-cache/dev-lang/python-2.7.3-r1
index 7dce8d78277c..d501313230f0 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff06fadeff1647560231a1a4f733cbdf
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r2 b/metadata/md5-cache/dev-lang/python-2.7.3-r2
index c0504068066a..08098c576556 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3-r2
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da1590237e788c1b532ad31d07c302a4
diff --git a/metadata/md5-cache/dev-lang/python-3.1.4-r3 b/metadata/md5-cache/dev-lang/python-3.1.4-r3
index cfba6746bfc7..def6df46d040 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.4-r3
+++ b/metadata/md5-cache/dev-lang/python-3.1.4-r3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.4/Python-3.1.4.tar.xz mirror://gentoo/python-gentoo-patches-3.1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=547eefa37f3b21bc06781ba6f6de3804
diff --git a/metadata/md5-cache/dev-lang/python-3.1.4-r4 b/metadata/md5-cache/dev-lang/python-3.1.4-r4
index 350a7bbb2a9b..148f666f7038 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.4-r4
+++ b/metadata/md5-cache/dev-lang/python-3.1.4-r4
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.4/Python-3.1.4.tar.xz mirror://gentoo/python-gentoo-patches-3.1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fa97aff9ef2afc65ada8b566202af01
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5 b/metadata/md5-cache/dev-lang/python-3.1.5
index 28a961a0decf..5920327664df 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.5
+++ b/metadata/md5-cache/dev-lang/python-3.1.5
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=135868de28703c2da64e6d179c831f03
diff --git a/metadata/md5-cache/dev-lang/python-3.2.2 b/metadata/md5-cache/dev-lang/python-3.2.2
index 004c1786facc..df005c3f422e 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.2
+++ b/metadata/md5-cache/dev-lang/python-3.2.2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.2/Python-3.2.2.tar.xz mirror://gentoo/python-gentoo-patches-3.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3f54ad98d59f0ba48bcb6852e8935f6
diff --git a/metadata/md5-cache/dev-lang/python-3.2.2-r1 b/metadata/md5-cache/dev-lang/python-3.2.2-r1
index 7b2c544958c9..2485bcbec796 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.2-r1
+++ b/metadata/md5-cache/dev-lang/python-3.2.2-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater app-admin/python-updater
 RDEPEND=>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.2/Python-3.2.2.tar.xz mirror://gentoo/python-gentoo-patches-3.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12213c0f87a3b1c7ab1b5fcfdd9265e0
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3 b/metadata/md5-cache/dev-lang/python-3.2.3
index 6bb296b9d9c0..3d18eba28039 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3
+++ b/metadata/md5-cache/dev-lang/python-3.2.3
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a287735733b58a12ac8dc74680ac1184
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3-r1 b/metadata/md5-cache/dev-lang/python-3.2.3-r1
index c382b78b28af..974069299f83 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.2.3-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02fcdfae858d54697f9ed41ca3603ca2
diff --git a/metadata/md5-cache/dev-lang/rubinius-1.2.4.20110705 b/metadata/md5-cache/dev-lang/rubinius-1.2.4.20110705
index 10aa745e20cb..b6eb0f1bc995 100644
--- a/metadata/md5-cache/dev-lang/rubinius-1.2.4.20110705
+++ b/metadata/md5-cache/dev-lang/rubinius-1.2.4.20110705
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/readline >=sys-devel/llvm-2.8 dev-libs/openssl sys-libs/zlib
 SLOT=0
 SRC_URI=http://asset.rubini.us/rubinius-1.2.4-20110705.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2259b85063bf9fbd6602fc8d0eae8218
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p352 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p352
index 898193282c70..8003993d7683 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p352
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p352
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p352.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p352.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e18eb8756c5011f00e44e22f76ab68e8
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p357 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p357
index cd4b0f012a04..742f96b83e85 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p357
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p357
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p357.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p357.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a74f46288c9d6a75d9bc97c4050828aa
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p358 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
index ca18833780b0..18de027279fa 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p358.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p358.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89e726b711f17687909c77a23a12b803
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p0 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p0
index 96afc14a4f75..413544a25257 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p0
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p0
@@ -10,5 +10,5 @@ PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemac
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p0.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d54e6a6620218398d4875b687977bb6
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
index c60147cbfbe7..93b41b46b43b 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
@@ -10,5 +10,5 @@ PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemac
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p125.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p125.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edfaeae362babf0cfce1c6c5030d686e
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194
index 87a02f955872..c72eb5e4045f 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194
@@ -10,5 +10,5 @@ PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemac
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p194.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p194.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=efecb9be44d7534800f16de2997ae798
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
index f06210ea4380..f08b9fe5a887 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p194-r1
@@ -10,5 +10,5 @@ PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemac
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p194.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p194-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d80bb96ef14fa29c54a0b74ad38c12c
diff --git a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1 b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
index 4197149eb4ea..21588995167a 100644
--- a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
+++ b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 SLOT=1.8
 SRC_URI=mirror://rubyforge/emm-ruby/ruby-enterprise-1.8.7-2010.02.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2010.02-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5d90f8ed427d296a5021fd94c2bd754
diff --git a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2011.03 b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2011.03
index 9706d6c802f9..77ff45c1c22d 100644
--- a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2011.03
+++ b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2011.03
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 SLOT=1.8
 SRC_URI=http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2011.03.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=635c3268d1b477137f8e4e5c844eade3
diff --git a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2012.02 b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2012.02
index 0171f0c7db1a..0ecfefb75b73 100644
--- a/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2012.02
+++ b/metadata/md5-cache/dev-lang/ruby-enterprise-1.8.7.2012.02
@@ -10,5 +10,5 @@ PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 SLOT=1.8
 SRC_URI=http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2012.02.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2012.02.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=65fbf6aed0e2391fd39a227378b3a177
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r1 b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r1
index b7401d116e9d..0ca4eae2e225 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=NPL-1.1
 RDEPEND=threadsafe? ( dev-libs/nspr )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4faffff8d5f0a696070945b98a8c9be
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r2 b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r2
index d62a0d255c18..b495c0946a7c 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r2
@@ -8,5 +8,5 @@ LICENSE=NPL-1.1
 RDEPEND=threadsafe? ( dev-libs/nspr )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bbf393adc7a601ee459e7ddac292497
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-5.10.5-r1 b/metadata/md5-cache/dev-lang/swi-prolog-5.10.5-r1
index f26ea38a08b9..5dd9c24fd751 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-5.10.5-r1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-5.10.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-5.10.5.tar.gz mirror://gentoo/swi-prolog-5.10.5-gentoo-patchset-5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5649378d055a5488f572d777263f6a2
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.0.0 b/metadata/md5-cache/dev-lang/swi-prolog-6.0.0
index 7135fb9bfec5..7f5d85c30b01 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.0.0
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.0.0.tar.gz mirror://gentoo/swi-prolog-6.0.0-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5a0a004c2ff15be7c2f1e941940649d
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.0.1 b/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
index ffaf6756f217..d0d662184f47 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.0.1.tar.gz mirror://gentoo/swi-prolog-6.0.1-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d5245b3a9f0d8a1f5870f7af8b728c3
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.0 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.0
index 6c6e47431f0a..b75d2b97740a 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.0
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.0.tar.gz mirror://gentoo/swi-prolog-6.1.0-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45c7fdc2c223b2098414e0e93270e30f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.1 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.1
index ed81a71044cd..1124334093f0 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.1.tar.gz mirror://gentoo/swi-prolog-6.1.1-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c209bf5aea4c229a7c23eaf10a56bde2
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.2 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.2
index 8e75636d8fac..9788242444f1 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.2
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.2.tar.gz mirror://gentoo/swi-prolog-6.1.2-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d9be8440270ef9c626abfde6ed00fa8
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.3 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.3
index 0d3fcbb3a9da..8cda8123f587 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.3
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.3.tar.gz mirror://gentoo/swi-prolog-6.1.3-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5691c588b9671895153d3aa69dbd5f86
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.4 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
index 1161b9388b9c..9deab8c6579c 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.4.tar.gz mirror://gentoo/swi-prolog-6.1.4-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37f9d643e2657669f55050b2d04a7680
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.5 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.5
index fcf02a7eb13e..763959036a95 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.5
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.5.tar.gz mirror://gentoo/swi-prolog-6.1.5-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=534a0dd7fb5f4da40ad83ef4a4cea079
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.6 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.6
index d771e738e5b5..114f46c35404 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.6
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.6.tar.gz mirror://gentoo/swi-prolog-6.1.6-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1082bbe45555d07d4e219fe5f57f50b
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.10-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
index eb35b94ac0ec..8eeef718ba27 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.10-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.10-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc1dbfbffcb5f95be162818d27b7ac5a
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.11 b/metadata/md5-cache/dev-lang/tcl-8.5.11
index f44a12ab73fb..2d8629eaf9cd 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.11
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.11
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.11-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f47314aed49f80a7e7c17bcee86c840
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.11-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.11-r1
index fe1244cd7ce6..7f136dbacd40 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.11-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.11-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.11-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e48e5db17a1eb8ee8290ff3ceeb3583d
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.7 b/metadata/md5-cache/dev-lang/tcl-8.5.7
index d1ff7fc6ed43..f72125fb9345 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.7
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.7
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.7-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9478642c96c4d343df92158572d383b
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.8-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.8-r1
index 5416b1095fee..ec77c723739d 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.8-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.8-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.8-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca26763e9b0bfe9e0a6314e87bf785c9
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.8-r2 b/metadata/md5-cache/dev-lang/tcl-8.5.8-r2
index ee6fce235a1e..7a9e97397173 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.8-r2
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.8-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.8-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5216702a38506538dd138885832e46bc
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.9 b/metadata/md5-cache/dev-lang/tcl-8.5.9
index 9edabea14bd6..3a1ece642398 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.9
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.9
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.9-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12824bc86c2e427a8dbd4c463ed44211
diff --git a/metadata/md5-cache/dev-lang/tendra-4.1.2 b/metadata/md5-cache/dev-lang/tendra-4.1.2
index 98c2a42a591e..f8daa224f02d 100644
--- a/metadata/md5-cache/dev-lang/tendra-4.1.2
+++ b/metadata/md5-cache/dev-lang/tendra-4.1.2
@@ -6,5 +6,5 @@ LICENSE=as-is
 RDEPEND=!dev-lang/tcc
 SLOT=0
 SRC_URI=ftp://ftp.allbsd.org/pub/TenDRA/releases/tendra/TenDRA-4.1.2.tar.bz2 mirror://gentoo/tendra-4.1.2-misc.patch.bz2 mirror://gentoo/tendra-4.1.2-minix.patch.bz2 http://dev.gentoo.org/~truedfx/tendra-4.1.2-misc.patch.bz2 http://dev.gentoo.org/~truedfx/tendra-4.1.2-minix.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46a14309e62c7a39ac5cfcdfccd756ce
diff --git a/metadata/md5-cache/dev-lang/tendra-5.0_pre20070510-r2 b/metadata/md5-cache/dev-lang/tendra-5.0_pre20070510-r2
index 6581edd31ab4..fc22a0369b2a 100644
--- a/metadata/md5-cache/dev-lang/tendra-5.0_pre20070510-r2
+++ b/metadata/md5-cache/dev-lang/tendra-5.0_pre20070510-r2
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=!dev-lang/tcc
 SLOT=0
 SRC_URI=mirror://gentoo/tendra-1073.tbz2 mirror://gentoo/tendra-patches-1.6.tbz2 http://dev.gentoo.org/~truedfx/tendra-1073.tbz2 http://dev.gentoo.org/~truedfx/tendra-patches-1.6.tbz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d2b4e3d7bf36f1467bbb650b7d62ec1
diff --git a/metadata/md5-cache/dev-lang/v8cgi-0.9.2 b/metadata/md5-cache/dev-lang/v8cgi-0.9.2
index 1b17621315d0..7fcf7207981c 100644
--- a/metadata/md5-cache/dev-lang/v8cgi-0.9.2
+++ b/metadata/md5-cache/dev-lang/v8cgi-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/v8 memcached? ( dev-libs/libmemcached ) apache? ( www-servers/apache ) opengl? ( virtual/opengl ) xerces? ( >=dev-libs/xerces-c-3.0.0 ) gd? ( media-libs/gd ) sqlite? ( dev-db/sqlite ) mysql? ( dev-db/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://v8cgi.googlecode.com/files/v8cgi-0.9.2-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d18cfe611eb3dd06613b33569d50c334
diff --git a/metadata/md5-cache/dev-lang/yap-6.2.2 b/metadata/md5-cache/dev-lang/yap-6.2.2
index c977f489ddec..756c8931b4b2 100644
--- a/metadata/md5-cache/dev-lang/yap-6.2.2
+++ b/metadata/md5-cache/dev-lang/yap-6.2.2
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.2.2.tar.gz mirror://gentoo/yap-6.2.2-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41c98bbcdaeab00040856a86d49fcb4b
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.0 b/metadata/md5-cache/dev-lang/yap-6.3.0
index 8f17d25b4134..82ca6e42cbaf 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.0
+++ b/metadata/md5-cache/dev-lang/yap-6.3.0
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.0.tar.gz mirror://gentoo/yap-6.3.0-gentoo-patchset-1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b447ffbb2267a863dbd664d41f75de53
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.1 b/metadata/md5-cache/dev-lang/yap-6.3.1
index e6de5b3b35ef..fd7cbaef7349 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.1
+++ b/metadata/md5-cache/dev-lang/yap-6.3.1
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.1.tar.gz mirror://gentoo/yap-6.3.1-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=84da5eb6ec188ab39255b83acb32db4a
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.2 b/metadata/md5-cache/dev-lang/yap-6.3.2
new file mode 100644
index 000000000000..0bc3eed09a0d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/yap-6.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) doc? ( app-text/texi2html ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=YAP is a high-performance Prolog compiler.
+EAPI=2
+HOMEPAGE=http://www.dcc.fc.up.pt/~vsc/Yap/
+IUSE=R debug doc examples gmp java mpi mysql odbc readline static threads elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Artistic LGPL-2
+RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0
+SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.2.tar.gz mirror://gentoo/yap-6.3.2-gentoo-patchset-0.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=60ddef246ede8303422d7b38ef2b9c34
diff --git a/metadata/md5-cache/dev-libs/OpenSRF-1.0.7 b/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
index 89a9cc1bad4f..227b8ea1db9b 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
+++ b/metadata/md5-cache/dev-libs/OpenSRF-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/net-server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://open-ils.org/downloads/OpenSRF-1.0.7.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edfce136dfa951a24c0da5a85ff68a77
diff --git a/metadata/md5-cache/dev-libs/boost-1.35.0-r2 b/metadata/md5-cache/dev-libs/boost-1.35.0-r2
index 52b070ed9bdc..f60a29301f53 100644
--- a/metadata/md5-cache/dev-libs/boost-1.35.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.35.0-r2
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) expat? ( dev-libs/expat ) mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) ) sys-libs/zlib dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/boost/boost_1_35_0.tar.bz2 mirror://gentoo/boost-patches-1.35.0-3.tbz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f79aa9ff0b260678a1261e03c58dcb74
diff --git a/metadata/md5-cache/dev-libs/boost-1.35.0-r5 b/metadata/md5-cache/dev-libs/boost-1.35.0-r5
index 394d52983dd3..04f8c3503c9a 100644
--- a/metadata/md5-cache/dev-libs/boost-1.35.0-r5
+++ b/metadata/md5-cache/dev-libs/boost-1.35.0-r5
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) expat? ( dev-libs/expat ) mpi? ( sys-cluster/openmpi[cxx] ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=0
 SRC_URI=mirror://sourceforge/boost/boost_1_35_0.tar.bz2 mirror://gentoo/boost-patches-1.35.0-5.tbz2 http://www.gentoo.org/~dev-zero/distfiles/boost-patches-1.35.0-5.tbz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fb6c53afbb4798682a2e3c2d9d3ebd7
diff --git a/metadata/md5-cache/dev-libs/boost-1.37.0-r1 b/metadata/md5-cache/dev-libs/boost-1.37.0-r1
index 2629d99eb20f..51e0c3ce6a6f 100644
--- a/metadata/md5-cache/dev-libs/boost-1.37.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.37.0-r1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) expat? ( dev-libs/expat ) mpi? ( sys-cluster/openmpi[cxx] ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.37
 SRC_URI=mirror://sourceforge/boost/boost_1_37_0.tar.bz2 mirror://gentoo/boost-patches-1.37.0-1.tbz2 http://www.gentoo.org/~dev-zero/distfiles/boost-patches-1.37.0-1.tbz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a80281eda88d2be87353b182db64d967
diff --git a/metadata/md5-cache/dev-libs/boost-1.39.0 b/metadata/md5-cache/dev-libs/boost-1.39.0
index 4bfe8d5fe14e..ef51e0eacf59 100644
--- a/metadata/md5-cache/dev-libs/boost-1.39.0
+++ b/metadata/md5-cache/dev-libs/boost-1.39.0
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) expat? ( dev-libs/expat ) mpi? ( sys-cluster/openmpi[cxx] ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.39
 SRC_URI=mirror://sourceforge/boost/boost_1_39_0.tar.bz2 mirror://gentoo/boost-patches-1.39.0-1.tbz2 http://www.gentoo.org/~dev-zero/distfiles/boost-patches-1.39.0-1.tbz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c19d7b1c2c0f50f9d9426035f3b98522
diff --git a/metadata/md5-cache/dev-libs/boost-1.41.0-r3 b/metadata/md5-cache/dev-libs/boost-1.41.0-r3
index 24bb9ab64ab2..f8484321fd47 100644
--- a/metadata/md5-cache/dev-libs/boost-1.41.0-r3
+++ b/metadata/md5-cache/dev-libs/boost-1.41.0-r3
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) expat? ( dev-libs/expat ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.41
 SRC_URI=mirror://sourceforge/boost/boost_1_41_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7ad0c582c3ccf153cda2dac72659640
diff --git a/metadata/md5-cache/dev-libs/boost-1.42.0 b/metadata/md5-cache/dev-libs/boost-1.42.0
index c2c4d8d95f80..d731049827f2 100644
--- a/metadata/md5-cache/dev-libs/boost-1.42.0
+++ b/metadata/md5-cache/dev-libs/boost-1.42.0
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.42
 SRC_URI=mirror://sourceforge/boost/boost_1_42_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46305aad1c19a0daab6958d8cc6f771a
diff --git a/metadata/md5-cache/dev-libs/boost-1.42.0-r1 b/metadata/md5-cache/dev-libs/boost-1.42.0-r1
index 072045654d63..7e56fbf0a667 100644
--- a/metadata/md5-cache/dev-libs/boost-1.42.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.42.0-r1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.42
 SRC_URI=mirror://sourceforge/boost/boost_1_42_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8506154390181526c702bbe40a88bbb1
diff --git a/metadata/md5-cache/dev-libs/boost-1.42.0-r2 b/metadata/md5-cache/dev-libs/boost-1.42.0-r2
index 70a56fb1224c..a51559208392 100644
--- a/metadata/md5-cache/dev-libs/boost-1.42.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.42.0-r2
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.42
 SRC_URI=mirror://sourceforge/boost/boost_1_42_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=128301586d34beaf29f1be2f17d2dd60
diff --git a/metadata/md5-cache/dev-libs/boost-1.45.0 b/metadata/md5-cache/dev-libs/boost-1.45.0
index 028e4e7526fc..b139cd613a33 100644
--- a/metadata/md5-cache/dev-libs/boost-1.45.0
+++ b/metadata/md5-cache/dev-libs/boost-1.45.0
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.45
 SRC_URI=mirror://sourceforge/boost/boost_1_45_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7423f023753c0e2013ca2698f36f957f
diff --git a/metadata/md5-cache/dev-libs/boost-1.46.1-r1 b/metadata/md5-cache/dev-libs/boost-1.46.1-r1
index dcaded63f94c..a5cd0bcd8f23 100644
--- a/metadata/md5-cache/dev-libs/boost-1.46.1-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.46.1-r1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.46
 SRC_URI=mirror://sourceforge/boost/boost_1_46_1.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36e21baa5d1093e971c1a16e27dfd1f8
diff --git a/metadata/md5-cache/dev-libs/boost-1.47.0 b/metadata/md5-cache/dev-libs/boost-1.47.0
index eb03dcf2ca93..5974d6c138f4 100644
--- a/metadata/md5-cache/dev-libs/boost-1.47.0
+++ b/metadata/md5-cache/dev-libs/boost-1.47.0
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.47
 SRC_URI=mirror://sourceforge/boost/boost_1_47_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c69d903f8bd73151dbe4e31a3616db64
diff --git a/metadata/md5-cache/dev-libs/boost-1.47.0-r1 b/metadata/md5-cache/dev-libs/boost-1.47.0-r1
index b75e3c491dcb..f50d7dba5e57 100644
--- a/metadata/md5-cache/dev-libs/boost-1.47.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.47.0-r1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3
 SLOT=1.47
 SRC_URI=mirror://sourceforge/boost/boost_1_47_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=61d7bfa7bacc95feb003dc6bcb568545
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 2dccff470055..3a980358db4b 100644
--- a/metadata/md5-cache/dev-libs/boost-1.48.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.48.0-r2
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e6fb3c812aa75918587a08c1e40e244a
diff --git a/metadata/md5-cache/dev-libs/boost-1.49.0-r1 b/metadata/md5-cache/dev-libs/boost-1.49.0-r1
index 2837a4929c05..9d7078aea752 100644
--- a/metadata/md5-cache/dev-libs/boost-1.49.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.49.0-r1
@@ -9,5 +9,5 @@ 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.49
 SRC_URI=mirror://sourceforge/boost/boost_1_49_0.tar.bz2
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5663a11cdc37a9750e16c893b07df4e9
diff --git a/metadata/md5-cache/dev-libs/cryptlib-3.4.0 b/metadata/md5-cache/dev-libs/cryptlib-3.4.0
index 25283e6e5530..e17eff2dc255 100644
--- a/metadata/md5-cache/dev-libs/cryptlib-3.4.0
+++ b/metadata/md5-cache/dev-libs/cryptlib-3.4.0
@@ -9,5 +9,5 @@ LICENSE=DB
 RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=ftp://ftp.franken.de/pub/crypt/cryptlib/cl340.zip doc? ( mirror://gentoo/cryptlib-3.4.0-manual.pdf.bz2 )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f976cc24a73f4169ffdd221dc2af25c1
diff --git a/metadata/md5-cache/dev-libs/crypto++-5.6.1-r1 b/metadata/md5-cache/dev-libs/crypto++-5.6.1-r1
index 329f721b0d74..1811aafac9c8 100644
--- a/metadata/md5-cache/dev-libs/crypto++-5.6.1-r1
+++ b/metadata/md5-cache/dev-libs/crypto++-5.6.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=cryptopp
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptopp/cryptopp561.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06b107390b1b4ffdf5b8f2cdffbb1b1f
diff --git a/metadata/md5-cache/dev-libs/crypto++-5.6.1-r3 b/metadata/md5-cache/dev-libs/crypto++-5.6.1-r3
index 73d35797b9b0..5ea9f338b7fa 100644
--- a/metadata/md5-cache/dev-libs/crypto++-5.6.1-r3
+++ b/metadata/md5-cache/dev-libs/crypto++-5.6.1-r3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=cryptopp
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptopp/cryptopp561.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33ed994f8dac71060a9837653a8760dc
diff --git a/metadata/md5-cache/dev-libs/cygwin-1.5.25.15 b/metadata/md5-cache/dev-libs/cygwin-1.5.25.15
index b1e6438d7b78..b534e248ad19 100644
--- a/metadata/md5-cache/dev-libs/cygwin-1.5.25.15
+++ b/metadata/md5-cache/dev-libs/cygwin-1.5.25.15
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=!crosscompile_opts_headers-only? ( ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-1.5.25-15-src.tar.bz2 ) crosscompile_opts_headers-only? ( ftp://sourceware.org/pub/cygwin/release/w32api/w32api-3.12-1.tar.bz2 ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-1.5.25-15.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09b20a9bc924f6116ccba4d426d8a351
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
index 93b45bb8bf06..25eb2057ea60 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz ntlm_unsupported_patch? ( mirror://gentoo/cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3575c736695632b57cba29fc5fc7a01
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
index 762233d158e2..3104e8b8b85c 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d7f20ec8128f520f9e9f03310fd8ec7
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
index 8e27c6a73725..116ba478d50d 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c9fb4a7ad8f074f116b755ea34fc1f3
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
index aace1623caa4..e49a33507e97 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b532139b18ba1a6023f082d1bfe3d106
diff --git a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2 b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
index e4bc0b95dc30..f9db3fbfab22 100644
--- a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
@@ -9,5 +9,5 @@ LICENSE=OracleDB Apache-1.1 BSD
 RDEPEND=|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb8b90299c99c60f6e1245f4a5ded3ea
diff --git a/metadata/md5-cache/dev-libs/dietlibc-0.30-r2 b/metadata/md5-cache/dev-libs/dietlibc-0.30-r2
index 4f25b4c2c0f2..230ffcd4e55e 100644
--- a/metadata/md5-cache/dev-libs/dietlibc-0.30-r2
+++ b/metadata/md5-cache/dev-libs/dietlibc-0.30-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ~mips sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/dietlibc-0.30.tar.bz2 http://dev.gentoo.org/~phreak/distfiles/dietlibc-patches-0.30-r2.tar.bz2 http://dev.gentoo.org/~hollow/distfiles/dietlibc-patches-0.30-r2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c19d24138c6eb03885e2b66bfe80c18
diff --git a/metadata/md5-cache/dev-libs/dietlibc-0.33_pre20110403 b/metadata/md5-cache/dev-libs/dietlibc-0.33_pre20110403
index 888d0059e1b4..aa6fc60cf2c7 100644
--- a/metadata/md5-cache/dev-libs/dietlibc-0.33_pre20110403
+++ b/metadata/md5-cache/dev-libs/dietlibc-0.33_pre20110403
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm -hppa ~mips ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://nodeload.github.com/hollow/dietlibc/tarball/v0.33_pre20110403 -> dietlibc-0.33_pre20110403.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d75d7b62b9538bc6b6b1d22fc9aadbf9
diff --git a/metadata/md5-cache/dev-libs/distorm64-1.7.30-r1 b/metadata/md5-cache/dev-libs/distorm64-1.7.30-r1
index a200b19f9a01..5dc381357335 100644
--- a/metadata/md5-cache/dev-libs/distorm64-1.7.30-r1
+++ b/metadata/md5-cache/dev-libs/distorm64-1.7.30-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=python? ( >=dev-lang/python-2.4 )
 SLOT=0
 SRC_URI=http://ragestorm.net/distorm/distorm64-pkg1.7.30.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=346dbd6a817cda466307d6ccaed4db33
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.153 b/metadata/md5-cache/dev-libs/elfutils-0.153
index d474d8104517..d052236af845 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.153
+++ b/metadata/md5-cache/dev-libs/elfutils-0.153
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.2.3 ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) !dev-libs/libelf
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.153/elfutils-0.153.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.153/elfutils-portability.patch -> elfutils-0.153-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.153/elfutils-robustify.patch -> elfutils-0.153-robustify.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28650e997bc753628b18852e719a0b6a
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.154 b/metadata/md5-cache/dev-libs/elfutils-0.154
new file mode 100644
index 000000000000..6b5da85622a6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.154
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=zlib? ( >=sys-libs/zlib-1.2.2.3 ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=3
+HOMEPAGE=https://fedorahosted.org/elfutils/
+IUSE=bzip2 lzma nls test zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2-with-exceptions
+RDEPEND=zlib? ( >=sys-libs/zlib-1.2.2.3 ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) !dev-libs/libelf
+SLOT=0
+SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-0.154.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-portability.patch -> elfutils-0.154-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.154/elfutils-robustify.patch -> elfutils-0.154-robustify.patch
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d8655f16b1fa16d669ce9f1740c1ffe5
diff --git a/metadata/md5-cache/dev-libs/embryo-1.2.0 b/metadata/md5-cache/dev-libs/embryo-1.2.0
new file mode 100644
index 000000000000..638d11c9d159
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/embryo-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-libs/eina-1.2.0 doc? ( app-doc/doxygen )
+DESCRIPTION=load and control programs compiled in embryo language (small/pawn variant)
+HOMEPAGE=http://www.enlightenment.org/
+IUSE=static-libs nls doc
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/eina-1.2.0 nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=http://download.enlightenment.org/releases/embryo-1.2.0.tar.bz2
+_eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e49c062d3fc04267e6070b0ef4a6cb82
diff --git a/metadata/md5-cache/dev-libs/ffcall-1.10 b/metadata/md5-cache/dev-libs/ffcall-1.10
index 2177ec96fbb8..5bae4d00a3ca 100644
--- a/metadata/md5-cache/dev-libs/ffcall-1.10
+++ b/metadata/md5-cache/dev-libs/ffcall-1.10
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 ~hppa ppc sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 LGPL-2 )
 SLOT=0
 SRC_URI=ftp://ftp.santafe.edu/pub/gnu/ffcall-1.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86176a8d330e98734c62d48a8d579cde
diff --git a/metadata/md5-cache/dev-libs/ffcall-1.10-r2 b/metadata/md5-cache/dev-libs/ffcall-1.10-r2
index 4adc2efcffe7..939b58054173 100644
--- a/metadata/md5-cache/dev-libs/ffcall-1.10-r2
+++ b/metadata/md5-cache/dev-libs/ffcall-1.10-r2
@@ -5,5 +5,5 @@ KEYWORDS=alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 LGPL-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/clisp/clisp-2.41.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5843eb13b87b6b2928b0adf488074ba5
diff --git a/metadata/md5-cache/dev-libs/ffcall-1.10-r3 b/metadata/md5-cache/dev-libs/ffcall-1.10-r3
index be891ca376c6..5c0bb23b5e0c 100644
--- a/metadata/md5-cache/dev-libs/ffcall-1.10-r3
+++ b/metadata/md5-cache/dev-libs/ffcall-1.10-r3
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 LGPL-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/clisp/clisp-2.41.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93a7537b527b344267746a20508e4eec
diff --git a/metadata/md5-cache/dev-libs/glib-1.2.10-r5 b/metadata/md5-cache/dev-libs/glib-1.2.10-r5
index 600b9f85309f..7cd8ff41999b 100644
--- a/metadata/md5-cache/dev-libs/glib-1.2.10-r5
+++ b/metadata/md5-cache/dev-libs/glib-1.2.10-r5
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=LGPL-2.1
 SLOT=1
 SRC_URI=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/glib-1.2.10.tar.gz mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d79e13e03ffd69f7b7c59d6f3f4b9a25
diff --git a/metadata/md5-cache/dev-libs/glib-2.30.2 b/metadata/md5-cache/dev-libs/glib-2.30.2
index e01c57ab0c21..b14e178c188f 100644
--- a/metadata/md5-cache/dev-libs/glib-2.30.2
+++ b/metadata/md5-cache/dev-libs/glib-2.30.2
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=484aa5c8c69d34a441c146409ae7e25a
diff --git a/metadata/md5-cache/dev-libs/glib-2.30.3 b/metadata/md5-cache/dev-libs/glib-2.30.3
index 40410f067a35..0541282115ec 100644
--- a/metadata/md5-cache/dev-libs/glib-2.30.3
+++ b/metadata/md5-cache/dev-libs/glib-2.30.3
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.3 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9f8d3d44ae8d74d41a2823c25628b15b
diff --git a/metadata/md5-cache/dev-libs/glib-2.32.2 b/metadata/md5-cache/dev-libs/glib-2.32.2
index 1f452831ece3..4c57236e811d 100644
--- a/metadata/md5-cache/dev-libs/glib-2.32.2
+++ b/metadata/md5-cache/dev-libs/glib-2.32.2
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.11 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.2 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=77f6aabbbec56481348d9ad84bfff229
diff --git a/metadata/md5-cache/dev-libs/glib-2.32.3 b/metadata/md5-cache/dev-libs/glib-2.32.3
index 6bf88b5f3450..ce181f09b2d6 100644
--- a/metadata/md5-cache/dev-libs/glib-2.32.3
+++ b/metadata/md5-cache/dev-libs/glib-2.32.3
@@ -10,5 +10,5 @@ PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.11 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.32.3 ) utils? ( =dev-lang/python-2* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=57e8cc4fdcc534fc0ec1aaa1c4455236
diff --git a/metadata/md5-cache/dev-libs/gmetadom-0.2.6 b/metadata/md5-cache/dev-libs/gmetadom-0.2.6
index 81ee59c70838..185788a9d9d7 100644
--- a/metadata/md5-cache/dev-libs/gmetadom-0.2.6
+++ b/metadata/md5-cache/dev-libs/gmetadom-0.2.6
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib >=dev-libs/gdome2-0.8.0 >=dev-libs/libxslt-1.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/gmetadom/gmetadom-0.2.6.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8ef3f26e987e7d9b228859b4c009ca4
diff --git a/metadata/md5-cache/dev-libs/gmp-4.3.2 b/metadata/md5-cache/dev-libs/gmp-4.3.2
index e6107b6090a5..c668e717d935 100644
--- a/metadata/md5-cache/dev-libs/gmp-4.3.2
+++ b/metadata/md5-cache/dev-libs/gmp-4.3.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-4.3.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8bfe2cc114f10a2ee3e77ed222729db
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.1 b/metadata/md5-cache/dev-libs/gmp-5.0.1
index f17ce580f517..2d0a5832809a 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.1
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c158842ca455498e7b424f73351845ff
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.2 b/metadata/md5-cache/dev-libs/gmp-5.0.2
index ee1fddbfe91a..cce78b5cd837 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.2
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc0bb11c7faf3a834cded9dc6ff301ac
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.2_p1 b/metadata/md5-cache/dev-libs/gmp-5.0.2_p1
index 95616a92059e..74919aace5fd 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.2_p1
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.2_p1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.2.tar.bz2 doc? ( http://gmplib.org/gmp-man-5.0.2.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8dd166d6fd7e629a01c8a55552c08d33
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.3 b/metadata/md5-cache/dev-libs/gmp-5.0.3
index f22972415896..1cdd995012e0 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.3
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.3.tar.xz doc? ( http://gmplib.org/gmp-man-5.0.3.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0baec14b47d175cf1ccea1153e111ce8
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.4 b/metadata/md5-cache/dev-libs/gmp-5.0.4
index d3a9117efee3..d2a72090ce7b 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.4
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.4.tar.xz doc? ( http://gmplib.org/gmp-man-5.0.4.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7124c0f8931c064066d175ff2bbda779
diff --git a/metadata/md5-cache/dev-libs/gmp-5.0.5 b/metadata/md5-cache/dev-libs/gmp-5.0.5
index b57e4a68d64a..6115d544118c 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.0.5
+++ b/metadata/md5-cache/dev-libs/gmp-5.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.0.5.tar.xz doc? ( http://gmplib.org/gmp-man-5.0.5.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=666548daf586b522b65020fc447c3d8d
diff --git a/metadata/md5-cache/dev-libs/granite-0.1.0 b/metadata/md5-cache/dev-libs/granite-0.1.0
index 23e6b892fb85..c2138cf6c820 100644
--- a/metadata/md5-cache/dev-libs/granite-0.1.0
+++ b/metadata/md5-cache/dev-libs/granite-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.x/0.1/+download/granite-0.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e0c9a284a538dc167ab4268d1eea734
diff --git a/metadata/md5-cache/dev-libs/grantlee-0.1.8 b/metadata/md5-cache/dev-libs/grantlee-0.1.8
index f44abd79f810..ccfd1dd50338 100644
--- a/metadata/md5-cache/dev-libs/grantlee-0.1.8
+++ b/metadata/md5-cache/dev-libs/grantlee-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.5.0:4 >=x11-libs/qt-gui-4.5.0:4 >=x11-libs/qt-scrip
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.loegria.net/grantlee/grantlee-0.1.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce576a60bfc27fa709ddf59b2215b425
diff --git a/metadata/md5-cache/dev-libs/grantlee-0.1.9 b/metadata/md5-cache/dev-libs/grantlee-0.1.9
index 2728e90a56c1..0be1e09f7cc3 100644
--- a/metadata/md5-cache/dev-libs/grantlee-0.1.9
+++ b/metadata/md5-cache/dev-libs/grantlee-0.1.9
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.5.0:4 >=x11-libs/qt-gui-4.5.0:4 >=x11-libs/qt-scrip
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.loegria.net/grantlee/grantlee-0.1.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9211dd3c5d2757c949ee1b21ebb1dbd0
diff --git a/metadata/md5-cache/dev-libs/hashit-0.9.7 b/metadata/md5-cache/dev-libs/hashit-0.9.7
index 6e743f07b2a2..b8a5e4b351c5 100644
--- a/metadata/md5-cache/dev-libs/hashit-0.9.7
+++ b/metadata/md5-cache/dev-libs/hashit-0.9.7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pleyades.net/david/projects/hashit/hashit-0.9.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77b244ef950218e86a2c64a80aae6883
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 fc3fb46dfc1b..557bad786378 100644
--- a/metadata/md5-cache/dev-libs/icu-49.1.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-49.1.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71902e1813b77b53675ba1acc96b52ba
diff --git a/metadata/md5-cache/dev-libs/isl-0.07-r1 b/metadata/md5-cache/dev-libs/isl-0.10
similarity index 82%
rename from metadata/md5-cache/dev-libs/isl-0.07-r1
rename to metadata/md5-cache/dev-libs/isl-0.10
index 502c11cfcc67..4d5a12e874fc 100644
--- a/metadata/md5-cache/dev-libs/isl-0.07-r1
+++ b/metadata/md5-cache/dev-libs/isl-0.10
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp
 SLOT=0
-SRC_URI=http://www.kotnet.org/~skimo/isl/isl-0.07.tar.bz2
+SRC_URI=http://www.kotnet.org/~skimo/isl/isl-0.10.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8323ab92f8b235015364e8ed42bc976a
+_md5_=84e77fcd018f5678726c578fb69fc547
diff --git a/metadata/md5-cache/dev-libs/libattica-0.3.0 b/metadata/md5-cache/dev-libs/libattica-0.3.0
index bd87bd96dc4a..09ed5295295e 100644
--- a/metadata/md5-cache/dev-libs/libattica-0.3.0
+++ b/metadata/md5-cache/dev-libs/libattica-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/qt-core:4
 SLOT=0
 SRC_URI=mirror://kde/stable/attica/attica-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2fa93dcebe3507621e94c947c666103
diff --git a/metadata/md5-cache/dev-libs/libattica-0.4.0 b/metadata/md5-cache/dev-libs/libattica-0.4.0
index c9c070294659..d27469e27e86 100644
--- a/metadata/md5-cache/dev-libs/libattica-0.4.0
+++ b/metadata/md5-cache/dev-libs/libattica-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/qt-core:4
 SLOT=0
 SRC_URI=mirror://kde/stable/attica/attica-0.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=485d0532998490cae507d9af1eaf8f9a
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.37-r2 b/metadata/md5-cache/dev-libs/libcgroup-0.37-r2
index 0d899158b2e3..e6c152511e12 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.37-r2
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.37-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/libcg/libcgroup-0.37.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb5d193f24c6b2a49c8547900be949e1
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.8.2 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.8.2
index 6d585bb5c195..c3a659873fe8 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.8.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.6.3:4 >=x11-libs/qt-gui-4.6.3:4[dbus]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~scarabeus/libdbusmenu-qt-0.8.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cfadfb91c8ca278d6f320650b7f78fb9
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.2 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.2
index b3f0f2b61597..cd4b2fdb2fcc 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.6.3:4 >=x11-libs/qt-gui-4.6.3:4[dbus]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~creffett/libdbusmenu-qt-0.9.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e99ed12e28d3e671a61c0bea6aa39859
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
index 6c4e9a7b65b0..a906009462e4 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=565b866393bd64e1fd95fade74c57386
diff --git a/metadata/md5-cache/dev-libs/libexecinfo-1.1 b/metadata/md5-cache/dev-libs/libexecinfo-1.1
index a46086879b11..3f80033dcd14 100644
--- a/metadata/md5-cache/dev-libs/libexecinfo-1.1
+++ b/metadata/md5-cache/dev-libs/libexecinfo-1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=mirror://freebsd/distfiles/libexecinfo-1.1.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e1cda66e14826e6544cc7e560117f68
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
index f882cb3f273f..7c8d4ec83f03 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d34bcc770e06ba8e4022b1d78ff495ae
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
index e6ce91654d5d..9b88366fbdbb 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2 mirror://gentoo/libgcrypt-1.5.0-idea.patch.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=611144391027dd20858347d6e376efa4
+_md5_=4b7cf7d0faaf6c3f7f0fab6e786d979d
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.16.0 b/metadata/md5-cache/dev-libs/libgit2-0.16.0
index 55930a53d948..c7437e41dc2c 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.16.0
+++ b/metadata/md5-cache/dev-libs/libgit2-0.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://github/libgit2/libgit2/libgit2-0.16.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76b8aa0dfc06beaa4bc0bcaa328ae84e
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.17.0 b/metadata/md5-cache/dev-libs/libgit2-0.17.0
index e3fd5e6a507a..ecc3a7e7de97 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.17.0
+++ b/metadata/md5-cache/dev-libs/libgit2-0.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://github/libgit2/libgit2/libgit2-0.17.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3447e3e42ad05522c56e56959e6e56b
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.13.1 b/metadata/md5-cache/dev-libs/libiconv-1.13.1
index 7ca72d5e53cf..461df170c1ab 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.13.1
+++ b/metadata/md5-cache/dev-libs/libiconv-1.13.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !sys-apps/man-pages
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.13.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=515b9921918e50510648c66e113dbe06
diff --git a/metadata/md5-cache/dev-libs/libindicate-qt-0.2.5.91 b/metadata/md5-cache/dev-libs/libindicate-qt-0.2.5.91
index 8f947a34735b..b30433a8ecee 100644
--- a/metadata/md5-cache/dev-libs/libindicate-qt-0.2.5.91
+++ b/metadata/md5-cache/dev-libs/libindicate-qt-0.2.5.91
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/libindicate-0.6 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/libi/libindicate-qt/libindicate-qt_0.2.5.91.orig.tar.bz2 mirror://ubuntu/pool/main/libi/libindicate-qt/libindicate-qt_0.2.5.91-1ubuntu2.debian.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cf2c7f1ff50a4f9ae7eaac9234c87bce
diff --git a/metadata/md5-cache/dev-libs/libmelf-0.4.0 b/metadata/md5-cache/dev-libs/libmelf-0.4.0
index 711e9abbd73c..00707036406c 100644
--- a/metadata/md5-cache/dev-libs/libmelf-0.4.0
+++ b/metadata/md5-cache/dev-libs/libmelf-0.4.0
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.hick.org/code/skape/libmelf/libmelf-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecc9af118a7ecd34dad54969b5800618
diff --git a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1 b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
index 5f9554ce1317..ae3cde0bc542 100644
--- a/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
+++ b/metadata/md5-cache/dev-libs/libmelf-0.4.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.hick.org/code/skape/libmelf/libmelf-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f2d0340f29ee73194c8435b0752e53e
diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17 b/metadata/md5-cache/dev-libs/liboil-0.3.17
index 1d106d3835e4..43bdb56b04cc 100644
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=examples? ( dev-libs/glib:2 )
 SLOT=0.3
 SRC_URI=http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a57a29711c09cc9cc7e2c9f46e46b0ad
diff --git a/metadata/md5-cache/dev-libs/liboop-1.0 b/metadata/md5-cache/dev-libs/liboop-1.0
index dc1fa75da513..674cb5f5618f 100644
--- a/metadata/md5-cache/dev-libs/liboop-1.0
+++ b/metadata/md5-cache/dev-libs/liboop-1.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=adns? ( net-libs/adns ) gnome? ( dev-libs/glib ) tcl? ( dev-lang/tcl ) readline? ( sys-libs/readline ) libwww? ( net-libs/libwww )
 SLOT=0
 SRC_URI=http://download.ofb.net/liboop/liboop-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5668252365aae8f74e2517688d7e870
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.28-r1 b/metadata/md5-cache/dev-libs/libowfat-0.28-r1
index b606a68d2465..b32b2b3f4c89 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.28-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.28-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=http://dl.fefe.de/libowfat-0.28.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16276110c04a587b3a71b087f592e31e
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.13-r1 b/metadata/md5-cache/dev-libs/libpcre-8.13-r1
index dc4459070bf3..b99e64284a10 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.13-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.13-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.13.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.13.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb7a78efff21b019899de755bdcb3f3f
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.20 b/metadata/md5-cache/dev-libs/libpcre-8.20
index 6b1c346c6d42..995540e02713 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.20
+++ b/metadata/md5-cache/dev-libs/libpcre-8.20
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.20.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.20.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7286c849926a743bff5de3e6ad5dbb25
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.21 b/metadata/md5-cache/dev-libs/libpcre-8.21
index a1d41550b970..661d113ed16a 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.21
+++ b/metadata/md5-cache/dev-libs/libpcre-8.21
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.21.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b399f6a843c993a6d60f3512d7a3b7f5
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.30-r2 b/metadata/md5-cache/dev-libs/libpcre-8.30-r2
index 1999d69cad1d..b37448b5c586 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.30-r2
+++ b/metadata/md5-cache/dev-libs/libpcre-8.30-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.30.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a39456532f4878251c289029bffabf85
diff --git a/metadata/md5-cache/dev-libs/libprelude-0.9.15.2 b/metadata/md5-cache/dev-libs/libprelude-0.9.15.2
index 3353b66062fb..b51ea7dba8df 100644
--- a/metadata/md5-cache/dev-libs/libprelude-0.9.15.2
+++ b/metadata/md5-cache/dev-libs/libprelude-0.9.15.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/gnutls-1.0.17 !net-analyzer/prelude-nids
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libprelude-0.9.15.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d0b72989f4d912d5d57dada1f0e3216
diff --git a/metadata/md5-cache/dev-libs/libprelude-0.9.22 b/metadata/md5-cache/dev-libs/libprelude-0.9.22
index a18f6de2324b..ef0671b74d37 100644
--- a/metadata/md5-cache/dev-libs/libprelude-0.9.22
+++ b/metadata/md5-cache/dev-libs/libprelude-0.9.22
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/gnutls-1.0.17 !net-analyzer/prelude-nids
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libprelude/libprelude-0.9.22.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5d286a872b88e4f40774cbf15f22d75
diff --git a/metadata/md5-cache/dev-libs/libprelude-0.9.24 b/metadata/md5-cache/dev-libs/libprelude-0.9.24
index ec958b67c939..62838073e269 100644
--- a/metadata/md5-cache/dev-libs/libprelude-0.9.24
+++ b/metadata/md5-cache/dev-libs/libprelude-0.9.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/gnutls-1.0.17 !net-analyzer/prelude-nids
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libprelude/libprelude-0.9.24.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a771bd16df3e9b8fa5f987f725f9365
diff --git a/metadata/md5-cache/dev-libs/libprelude-1.0.0-r1 b/metadata/md5-cache/dev-libs/libprelude-1.0.0-r1
index 0d9b3e46c0a8..aa45601c36c3 100644
--- a/metadata/md5-cache/dev-libs/libprelude-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libprelude-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgcrypt-1.1.94 >=net-libs/gnutls-1.0.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) !net-analyzer/prelude-nids python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.prelude-technologies.com/download/releases/libprelude/libprelude-1.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50cecea9ba1761831b46db71042920ba
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-0.9.13 b/metadata/md5-cache/dev-libs/libpreludedb-0.9.13
index 51c93658076c..c652805c89dd 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-0.9.13
+++ b/metadata/md5-cache/dev-libs/libpreludedb-0.9.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.10 doc? ( dev-util/gtk-doc ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite3? ( =dev-db/sqlite-3* )
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libpreludedb-0.9.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1aef874bb6062a54d3ddf17db3d5303
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-0.9.15.1 b/metadata/md5-cache/dev-libs/libpreludedb-0.9.15.1
index 27fab75a9b6f..ee9950ea1640 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-0.9.15.1
+++ b/metadata/md5-cache/dev-libs/libpreludedb-0.9.15.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.10 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( =dev-db/sqlite-3* )
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libpreludedb/libpreludedb-0.9.15.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=176119202349f8e07da716fa67345f88
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-0.9.2 b/metadata/md5-cache/dev-libs/libpreludedb-0.9.2
index 4f666f716808..3dddfc820799 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-0.9.2
+++ b/metadata/md5-cache/dev-libs/libpreludedb-0.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libprelude-0.9.0 doc? ( dev-util/gtk-doc ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://www.prelude-ids.org/download/releases/libpreludedb-0.9.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ce0cfa91d345b308d7f2c7a88ad1f82
diff --git a/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8 b/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8
index d806a91b49bf..30313c1424b6 100644
--- a/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8
+++ b/metadata/md5-cache/dev-libs/libproccpuinfo-0.0.8
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~hppa ~mips x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/proccpuinfo/libproccpuinfo-0.0.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73d81ab6ffbc920d08676b4f418acd3d
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
index 7aa2f6f258bf..b5c2b54e37ef 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b19a4eab231b47e74c9662d8c3485ef7
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
index c4fc7becd265..2ce2dab1b8f2 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=55ffbbea5ea6294361b3d504fd04145c
diff --git a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0 b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
index 5e3746df7ef2..779dc6639ac0 100644
--- a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
+++ b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libzeitgeist >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libqzeitgeist/0.8.0/src/libqzeitgeist-0.8.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ec9932c0f116a9e2532e3f1b2397b63
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.2.10 b/metadata/md5-cache/dev-libs/libsigc++-2.2.10
index 45e68f115bce..521a538a508c 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.2.10
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.2.10
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=LGPL-2.1
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.2/libsigc++-2.2.10.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b226e38cc788dc489ad8e11cdcca7367
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.2.7 b/metadata/md5-cache/dev-libs/libsigc++-2.2.7
index 0b17594a8331..488fcbe34c14 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.2.7
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.2.7
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=LGPL-2.1
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.2/libsigc++-2.2.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=15d0512b46d4bf24dfcc22dc3554b475
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.2.9 b/metadata/md5-cache/dev-libs/libsigc++-2.2.9
index 1b3d93d634a6..3bc2dbd73624 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.2.9
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.2.9
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.2/libsigc++-2.2.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be1d52f662c0b1ff4811f15a53e8c29a
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r1 b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r1
index db4f3247ae70..54a2efc94fd1 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r1
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a011aaf2dfaa2c1814803a97ed48c44
diff --git a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2 b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
index 8182abef82f5..9fca0ed0222a 100644
--- a/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
+++ b/metadata/md5-cache/dev-libs/libtecla-1.6.1-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2279db7b9c5df4dc11ac52e7e4713d5c
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.10.1 b/metadata/md5-cache/dev-libs/libwbxml-0.10.1
index 8781bd30caee..4141635227a1 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.10.1
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.10.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.10.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3be260277d410156fa09ecde7e3ed989
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.10.9 b/metadata/md5-cache/dev-libs/libwbxml-0.10.9
index 783d78a390f4..6599e62df46d 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.10.9
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.10.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.10.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=500b35c8b92fe5c3098ccbe8e9580ada
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.0 b/metadata/md5-cache/dev-libs/libwbxml-0.11.0
index 17cc2c05af62..a8986f752bae 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.0
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d174781416b2fb4ff2604d5ab03fd718
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.7.8-r5 b/metadata/md5-cache/dev-libs/libxml2-2.7.8-r5
index 694a9c48508a..434b2e4b5ec4 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.7.8-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.7.8-r5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.7.8.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9823e76a0958ce99f3105d6fcae626f1
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 705471bbb253..053c761cf62d 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=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] )
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61afb5690522c78febdc89b5478d7e1f
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.8.0_rc1 b/metadata/md5-cache/dev-libs/libxml2-2.8.0_rc1
index e0073f7d5ddb..e2b428e4907e 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0_rc1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0_rc1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=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] )
 SLOT=2
 SRC_URI=mirror://gentoo/libxml2-2.8.0-rc1.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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c371ca412a4539cde6ef953684e3099f
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.2 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.2
index 6ddbb4ad3129..0fca708d650d 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.2
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.5.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.2
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03701c66ce2fd9557eeeaa1e4ef91f1d
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.3 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.3
index 8dccf479e281..17303c2b3fba 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.3
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.5.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.3
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f901fea0f4079f291b629b5f25e1e4e2
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.4 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.4
index f47d894860a5..67b23a5d466d 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.4
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.5.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.4
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bca392d0d0e15bf314e7ec0792429b75
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.5 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.5
index e1d9982fc38e..fcd63653bf47 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.5
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.5
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c84d11d4c87577c63b20cd3ed6543edb
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.2.1 b/metadata/md5-cache/dev-libs/mini-xml-2.2.1
index 2d2c3cada92c..a00edbfcf603 100644
--- a/metadata/md5-cache/dev-libs/mini-xml-2.2.1
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.2.1
@@ -5,5 +5,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://easysw/mxml/2.2.1/mxml-2.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9fbd4e83163d8e4a412504d18a9fa0e
diff --git a/metadata/md5-cache/dev-libs/mpatrol-1.4.8-r3 b/metadata/md5-cache/dev-libs/mpatrol-1.4.8-r3
index 9217d891bab9..5b517a5a929e 100644
--- a/metadata/md5-cache/dev-libs/mpatrol-1.4.8-r3
+++ b/metadata/md5-cache/dev-libs/mpatrol-1.4.8-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( >=x11-libs/openmotif-2.3:0 ) !dev-lang/mercury
 SLOT=0
 SRC_URI=http://www.cbmamiga.demon.co.uk/mpatrol/files/mpatrol_1.4.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f9b9c36210597ef80a19a7794996405
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.1-r1 b/metadata/md5-cache/dev-libs/nspr-4.9.1-r2
similarity index 96%
rename from metadata/md5-cache/dev-libs/nspr-4.9.1-r1
rename to metadata/md5-cache/dev-libs/nspr-4.9.1-r2
index cd57e27d5505..a12817b482c3 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9.1-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.9.1-r2
@@ -9,4 +9,4 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.1/src/nspr-4.9.1.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0428b2874e1fe52bea7ef4afacb3f352
+_md5_=051b35fce4a0814ebc68f987138cd0a5
diff --git a/metadata/md5-cache/dev-libs/nss-3.12.11-r1 b/metadata/md5-cache/dev-libs/nss-3.12.11-r1
index 69d131ed1558..169856226718 100644
--- a/metadata/md5-cache/dev-libs/nss-3.12.11-r1
+++ b/metadata/md5-cache/dev-libs/nss-3.12.11-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.8.9 >=dev-db/sqlite-3.5
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_RTM/src/nss-3.12.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b59dfddcc1161cb569f6d0d7c74e5b15
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.2 b/metadata/md5-cache/dev-libs/nss-3.13.2
index 7024162f9954..ce4f472b44b7 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.2
+++ b/metadata/md5-cache/dev-libs/nss-3.13.2
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_2_RTM/src/nss-3.13.2.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.2-add_cacert_ca_certs-ported.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da882ce2e0a657b716121a676f3314b6
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.3 b/metadata/md5-cache/dev-libs/nss-3.13.3
index 746e872f213b..8331bcdda877 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.3
+++ b/metadata/md5-cache/dev-libs/nss-3.13.3
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-3.13.3.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba9d07ba0e167863ebedcb6dffb7938f
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.4 b/metadata/md5-cache/dev-libs/nss-3.13.4
index 791486842cd9..6289eda5cf02 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.4
+++ b/metadata/md5-cache/dev-libs/nss-3.13.4
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_4_RTM/src/nss-3.13.4.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e98ea318397283dc3a33bf7ce9a97a0
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.5 b/metadata/md5-cache/dev-libs/nss-3.13.5
index c7f89eb42d45..41808fe89f1c 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.5
+++ b/metadata/md5-cache/dev-libs/nss-3.13.5
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9.1 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_5_RTM/src/nss-3.13.5.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82d8933a54fdbfc76e22666e151d2531
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.5-r1 b/metadata/md5-cache/dev-libs/nss-3.13.5-r1
index 3df398ac67be..a3028a3066d1 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.5-r1
+++ b/metadata/md5-cache/dev-libs/nss-3.13.5-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9.1 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_5_RTM/src/nss-3.13.5.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b52213172be00494a3ed2e99137cfac
diff --git a/metadata/md5-cache/dev-libs/ntl-5.5.2 b/metadata/md5-cache/dev-libs/ntl-5.5.2
index f3824d6e6c61..ec29f52eb195 100644
--- a/metadata/md5-cache/dev-libs/ntl-5.5.2
+++ b/metadata/md5-cache/dev-libs/ntl-5.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.3 >=dev-libs/gf2x-0.9
 SLOT=0
 SRC_URI=http://www.shoup.net/ntl/ntl-5.5.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34c17bebd6048f210d459bb099e69058
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5 b/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
index 92a6c338d22d..073c716d0422 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
+++ b/metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
@@ -10,5 +10,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/opencryptoki-2.3.3.tar.bz2 http://dev.gentoo.org/~flameeyes/opencryptoki/opencryptoki-2.3.3-backports-3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31df884580d6cceebc6ee77cc4ad8d3e
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r2 b/metadata/md5-cache/dev-libs/openct-0.6.20-r2
index dd090df83e52..8622c5930c79 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r2
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) sys-devel/libtool udev? ( >=sys-fs/udev-096 ) sys-apps/openrc
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/openct/openct-0.6.20.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72d3c599507b9a9b8f4386259eaa5888
diff --git a/metadata/md5-cache/dev-libs/opensc-0.12.2-r1 b/metadata/md5-cache/dev-libs/opensc-0.12.2-r1
index 50673a5b354c..821f3c27db93 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.12.2-r1
+++ b/metadata/md5-cache/dev-libs/opensc-0.12.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=libtool? ( sys-devel/libtool ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Libraries and applications to access smartcards
 EAPI=4
 HOMEPAGE=http://www.opensc-project.org/opensc/
@@ -11,4 +11,4 @@ REQUIRED_USE=pcsc-lite? ( !openct ) openct? ( !pcsc-lite )
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/opensc/opensc-0.12.2.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=273ddb84f4f86502d232a66880087bcb
+_md5_=15c8f3f60e394b1e1004d0de0a889822
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8u b/metadata/md5-cache/dev-libs/openssl-0.9.8u
index fc47e64b0d96..07fb94fbda2a 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8u
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8u
@@ -9,5 +9,5 @@ LICENSE=openssl
 RDEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8u.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42bfd2e4c3419adc0bf1e754ba5a4ac3
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8v b/metadata/md5-cache/dev-libs/openssl-0.9.8v
index 238dcafe6b8e..1217b5846569 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8v
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8v
@@ -9,5 +9,5 @@ LICENSE=openssl
 RDEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8v.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35bed93762c32d150a69e7f0b7a77f67
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8w b/metadata/md5-cache/dev-libs/openssl-0.9.8w
index da317578851b..94a22e98c05f 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8w
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8w
@@ -9,5 +9,5 @@ LICENSE=openssl
 RDEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8w.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a8a50f3593458095102cc3cc4c61869
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8x b/metadata/md5-cache/dev-libs/openssl-0.9.8x
index c46e6f3bbbbf..f78914847c52 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8x
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8x
@@ -9,5 +9,5 @@ LICENSE=openssl
 RDEPEND=gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) !=dev-libs/openssl-0.9.8*:0
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8x.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c024178a1399521895a59e11af9b5b2
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.0h b/metadata/md5-cache/dev-libs/openssl-1.0.0h
index 377af747fd17..89186dc74d2e 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.0h
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.0h
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.0h.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ce07889d2cf11d46ef3b9b6a15d5188
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.0i b/metadata/md5-cache/dev-libs/openssl-1.0.0i
index 475fa3a64b30..2fc99aae3836 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.0i
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.0i
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.0i.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17ca1e91b2ae26256be90f30ecbf9cbd
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.0j b/metadata/md5-cache/dev-libs/openssl-1.0.0j
index b2505c778897..f1dbbb5db7cd 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.0j
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.0j
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.0j.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6f8ed4ad9fa0ee79d8b6501e8497e7d
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1a b/metadata/md5-cache/dev-libs/openssl-1.0.1a
index ecad095251a6..8fabf91ac3ab 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1a
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1a
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1a.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09b95e4b021be7b263161e8405d5c98f
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1b b/metadata/md5-cache/dev-libs/openssl-1.0.1b
index 95b23ed4217d..919ca8989585 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1b
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1b
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1b.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47af3166c6edc04d357f551f737b99cc
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1c b/metadata/md5-cache/dev-libs/openssl-1.0.1c
index 9905d2d2abfa..9effd95e7742 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1c
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1c
@@ -10,5 +10,5 @@ PDEPEND=app-misc/ca-certificates
 RDEPEND=static-libs? ( gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 ) ) !static-libs? ( gmp? ( dev-libs/gmp ) zlib? ( sys-libs/zlib ) kerberos? ( app-crypt/mit-krb5 ) ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1c.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08dff79f1a22f3a7ca6d6f61b841c11d
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r1 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r1
index 2b7428e97a4d..965c78f2ecce 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r1
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=php? ( || ( =dev-libs/ossp-uuid-1.6.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a1711b1d5916b25c19effcac9251b6e
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
index f82bbd79e10a..2e52466f24e4 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=perl? ( dev-lang/perl ) php? ( || ( =dev-libs/ossp-uuid-1.6.2-r2[php_targets_php5-3] =dev-libs/ossp-uuid-1.6.2-r2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=840a13704e7ddcfd70fc2d205a488c60
diff --git a/metadata/md5-cache/dev-libs/poco-1.3.3_p1 b/metadata/md5-cache/dev-libs/poco-1.3.3_p1
index b1717f59502d..1f417e3828e2 100644
--- a/metadata/md5-cache/dev-libs/poco-1.3.3_p1
+++ b/metadata/md5-cache/dev-libs/poco-1.3.3_p1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/libpcre dev-libs/expat sys-libs/zlib mysql? ( dev-db/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/poco/poco-1.3.3p1-all.tar.bz2 doc? ( mirror://sourceforge/poco/poco-1.3.3-doc.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1911ec1903248ff6ea980d35987bea52
diff --git a/metadata/md5-cache/dev-libs/poco-1.3.6_p2 b/metadata/md5-cache/dev-libs/poco-1.3.6_p2
index 1f0d4f021fb2..406bf36fce20 100644
--- a/metadata/md5-cache/dev-libs/poco-1.3.6_p2
+++ b/metadata/md5-cache/dev-libs/poco-1.3.6_p2
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/libpcre dev-libs/expat sys-libs/zlib mysql? ( dev-db/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/poco/poco-1.3.6p2-all.tar.bz2 doc? ( mirror://sourceforge/poco/poco-1.3.6-all-doc.zip )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=845a95e554b41c25caec9a072649781d
diff --git a/metadata/md5-cache/dev-libs/poco-1.4.3_p1 b/metadata/md5-cache/dev-libs/poco-1.4.3_p1
index c5b12efe0c89..daf614e8ed09 100644
--- a/metadata/md5-cache/dev-libs/poco-1.4.3_p1
+++ b/metadata/md5-cache/dev-libs/poco-1.4.3_p1
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/poco/poco-1.4.3p1-all.tar.bz2 doc? ( mirror://sourceforge/poco/poco-1.4.3-all-doc.zip )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57edefa661335de5d4d3b2c11dbd98d8
diff --git a/metadata/md5-cache/dev-libs/pth-2.0.7-r3 b/metadata/md5-cache/dev-libs/pth-2.0.7-r3
index 84c15972d183..8bed47140cee 100644
--- a/metadata/md5-cache/dev-libs/pth-2.0.7-r3
+++ b/metadata/md5-cache/dev-libs/pth-2.0.7-r3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gnu/pth/pth-2.0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c4b3f7467cc29526f705b4971c9b580
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.2 b/metadata/md5-cache/dev-libs/pugixml-1.2
index 526b921d7a8e..d5fe7d5cdad6 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.2
+++ b/metadata/md5-cache/dev-libs/pugixml-1.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://pugixml.googlecode.com/files/pugixml-1.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=687a2a81c826c30e2df21034ed384ad6
diff --git a/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3 b/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
index 4034059067c7..4b2225d74870 100644
--- a/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
+++ b/metadata/md5-cache/dev-libs/pwlib-1.10.10-r3
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=alsa? ( media-libs/alsa-lib ) ldap? ( >=net-nds/openldap-2.3.35 ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/expat )
 SLOT=0
 SRC_URI=http://www.ekiga.org/admin/downloads/latest/sources/sources/pwlib-1.10.10.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96656cece6a7fb62e048a8461113a656
diff --git a/metadata/md5-cache/dev-libs/qjson-0.7.1-r1 b/metadata/md5-cache/dev-libs/qjson-0.7.1-r1
index 6904c8b5549f..196f5d0ed152 100644
--- a/metadata/md5-cache/dev-libs/qjson-0.7.1-r1
+++ b/metadata/md5-cache/dev-libs/qjson-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/qt-core:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qjson/qjson-0.7.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aad43ab76fef29612e0fc8c742df27d6
diff --git a/metadata/md5-cache/dev-libs/qrosscore-0.2.0 b/metadata/md5-cache/dev-libs/qrosscore-0.2.0
index 3155bbec29bc..e584d2d465f7 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-0.2.0
+++ b/metadata/md5-cache/dev-libs/qrosscore-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script
 SLOT=0
 SRC_URI=mirror://github/0xd34df00d/Qross/qross-0.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=274f40afc802a94779884146d4052ba0
diff --git a/metadata/md5-cache/dev-libs/qrosscore-0.2.2 b/metadata/md5-cache/dev-libs/qrosscore-0.2.2
index bee16f468493..ebf54b87a91c 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-0.2.2
+++ b/metadata/md5-cache/dev-libs/qrosscore-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script
 SLOT=0
 SRC_URI=mirror://github/0xd34df00d/Qross/qross-0.2.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf88c1188ceb20a59795ad0ca38afa24
diff --git a/metadata/md5-cache/dev-libs/qrosscore-9999 b/metadata/md5-cache/dev-libs/qrosscore-9999
index 2cf5f6e6d9e4..26f5cb5f35b2 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-9999
+++ b/metadata/md5-cache/dev-libs/qrosscore-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff2368990a64469f8b3c8d7402e39969
diff --git a/metadata/md5-cache/dev-libs/qrosspython-9999 b/metadata/md5-cache/dev-libs/qrosspython-9999
index f887fd93d400..d47d2f463300 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-9999
+++ b/metadata/md5-cache/dev-libs/qrosspython-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND==dev-libs/qrosscore-9999 =dev-lang/python-2*
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34010717462975f4976e6bdbf99fcbf5
diff --git a/metadata/md5-cache/dev-libs/quazip-0.4.4 b/metadata/md5-cache/dev-libs/quazip-0.4.4
index 9450675d2dd9..fc361fb1c311 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.4.4
+++ b/metadata/md5-cache/dev-libs/quazip-0.4.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib x11-libs/qt-core:4
 SLOT=0
 SRC_URI=mirror://sourceforge/quazip/quazip-0.4.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=675c99a7aedca9f24b4ed6a045f6cd12
diff --git a/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.10.0 b/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.10.0
index 4161596047db..2e51e3b137cc 100644
--- a/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.10.0
+++ b/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.10.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-li
 LICENSE=|| ( BSD CCPL-Attribution-ShareAlike-3.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oscaf/shared-desktop-ontologies/shared-desktop-ontologies-0.10.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52b8bad84abe9ff1eb2d8f6270aa02a6
diff --git a/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.9.0 b/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.9.0
index c0a70ba4ad56..9a6a40fbdfb5 100644
--- a/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.9.0
+++ b/metadata/md5-cache/dev-libs/shared-desktop-ontologies-0.9.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD CCPL-Attribution-ShareAlike-3.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oscaf/shared-desktop-ontologies/shared-desktop-ontologies-0.9.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23e26d126fc40448984a9b4664f74d78
diff --git a/metadata/md5-cache/dev-libs/skyutils-2.8-r1 b/metadata/md5-cache/dev-libs/skyutils-2.8-r1
index e755c4a885ba..8c36a55ae6d8 100644
--- a/metadata/md5-cache/dev-libs/skyutils-2.8-r1
+++ b/metadata/md5-cache/dev-libs/skyutils-2.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://gentoo/skyutils-2.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd9047f43c69b693205dc24c0e622d75
diff --git a/metadata/md5-cache/dev-libs/skyutils-2.8-r2 b/metadata/md5-cache/dev-libs/skyutils-2.8-r2
index 67bc70b399b1..3113dd3ba173 100644
--- a/metadata/md5-cache/dev-libs/skyutils-2.8-r2
+++ b/metadata/md5-cache/dev-libs/skyutils-2.8-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://gentoo/skyutils-2.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1275e2dac80ad84d58149e665d791576
diff --git a/metadata/md5-cache/dev-libs/soprano-2.7.6 b/metadata/md5-cache/dev-libs/soprano-2.7.6
index b31a3a0172e0..662240eae287 100644
--- a/metadata/md5-cache/dev-libs/soprano-2.7.6
+++ b/metadata/md5-cache/dev-libs/soprano-2.7.6
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.5.0:4 clucene? ( dev-cpp/clucene ) dbus? ( >=x11-li
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/soprano/soprano-2.7.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c418cb31eda3dc3f51065a8b57e45d7
diff --git a/metadata/md5-cache/dev-libs/syck-0.55-r4 b/metadata/md5-cache/dev-libs/syck-0.55-r4
index dfdebb32d17d..00bffa208a31 100644
--- a/metadata/md5-cache/dev-libs/syck-0.55-r4
+++ b/metadata/md5-cache/dev-libs/syck-0.55-r4
@@ -10,5 +10,5 @@ PDEPEND=php? ( dev-php/pecl-syck !=dev-libs/syck-0.55-r1 )
 RDEPEND=python? ( !dev-python/pysyck ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://rubyforge.org/frs/download.php/4492/syck-0.55.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=253130f3388413ed7cc9184474cadc20
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
index 5387bc7f7822..929295692f47 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86 ~x64-macos ~x86-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8843cd1db231b0b46621f66a96864f3e
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-1.0.1_p20120531 b/metadata/md5-cache/dev-libs/tinyxml2-1.0.1_p20120531
index e25fc9f6ab94..8629cc556aa1 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-1.0.1_p20120531
+++ b/metadata/md5-cache/dev-libs/tinyxml2-1.0.1_p20120531
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/tinyxml2-1.0.1_p20120531.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=581b4f6dd2edebff17f14e7964f19ce7
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.10.0 b/metadata/md5-cache/dev-libs/xalan-c-1.10.0
index 18e2e52ad9b5..3e8a19a2dfc4 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.10.0
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.10.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/xerces-c-2.7.0
 SLOT=0
 SRC_URI=mirror://apache/xml/xalan-c/Xalan-C_1_10_0-src.tar.gz http://www.tux.org/pub/net/apache/dist/xml/xalan-c/Xalan-C_1_10_0-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68f9beb8878995a4942b7c4dd366accf
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059 b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
index 20cd34fb8cb5..05357be5c8a8 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/xerces-c-2.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/Xalan-C_r1153059-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c97eb50797078a39b6ebe27b67b0ce7
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre705082 b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre705082
index 4d30f5c66575..aa0b8b718444 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre705082
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre705082
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/xerces-c-2.7.0
 SLOT=0
 SRC_URI=mirror://gentoo/Xalan-C_r705082-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=409afeecd5f1ce68366f2d7fb5a5eb99
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre797991 b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre797991
index 17e9501f9f24..349f53b50b67 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre797991
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre797991
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/xerces-c-2.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/Xalan-C_r797991-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d79c032a569d231b25e32f19d613b08a
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.10 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.10
index 60519708b6f0..7572c88f0242 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.10
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/xapian-1.2.10* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.10[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.10/xapian-bindings-1.2.10.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53752885866178196d9c0e7e44f81bc4
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.8 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.8
index 1de6285dccc6..8b7b93986531 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.8
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.8[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.8/xapian-bindings-1.2.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86ba1ab6416b8ee0b7a75d9815d794e9
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.9 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.9
index 339779ee33cf..a8d0e65d955c 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.9
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/xapian-1.2.9* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.9[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.9/xapian-bindings-1.2.9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a7fde40e317b883610350cf328202d8
diff --git a/metadata/md5-cache/dev-libs/yajl-1.0.11 b/metadata/md5-cache/dev-libs/yajl-1.0.11
index 50c54d86f1be..bec44cecf6c9 100644
--- a/metadata/md5-cache/dev-libs/yajl-1.0.11
+++ b/metadata/md5-cache/dev-libs/yajl-1.0.11
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm hppa ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/1.0.11 -> yajl-1.0.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=531cee66cabf578f828fb4aa0c79b575
diff --git a/metadata/md5-cache/dev-libs/yajl-1.0.11-r1 b/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
index bc902e1ca4cf..31eef130a07e 100644
--- a/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
+++ b/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/1.0.11 -> yajl-1.0.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8ae937b484ffb26bd6bc2cf96da99ef
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.2 b/metadata/md5-cache/dev-libs/yajl-2.0.2
index e781b01c4e3b..3ae209789876 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.2
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.2 -> yajl-2.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb7e66253d52653f697831c92b53012f
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.3 b/metadata/md5-cache/dev-libs/yajl-2.0.3
index 03d72c4b8663..248ce03aa543 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.3
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.3 -> yajl-2.0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d30a34b5e01234bd014d40ffd3fe458a
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.4 b/metadata/md5-cache/dev-libs/yajl-2.0.4
index 3d5b31fd56a2..402d97d222d3 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.4
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.4 -> yajl-2.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ea3d7e67595f5d31b9cf018571315ff
diff --git a/metadata/md5-cache/dev-libs/yaz++-1.1.0 b/metadata/md5-cache/dev-libs/yaz++-1.1.0
index 515676c7eddc..8bbfc7fdec7e 100644
--- a/metadata/md5-cache/dev-libs/yaz++-1.1.0
+++ b/metadata/md5-cache/dev-libs/yaz++-1.1.0
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/yaz-3.0.26
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz++/yazpp-1.1.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81cd22dea35964d300acb8a0c9f289bf
diff --git a/metadata/md5-cache/dev-libs/yaz++-1.1.4 b/metadata/md5-cache/dev-libs/yaz++-1.1.4
index 08275fd51acd..b54ad91a018d 100644
--- a/metadata/md5-cache/dev-libs/yaz++-1.1.4
+++ b/metadata/md5-cache/dev-libs/yaz++-1.1.4
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/yaz-3.0.26
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yazpp/yazpp-1.1.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1bafdf69208297cc33c0ad6a2441955c
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.60 b/metadata/md5-cache/dev-libs/zziplib-0.13.60
index 4a3ef84db147..1a0d49442b5d 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.60
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.60
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/zziplib/zziplib-0.13.60.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41729ba81323c1b3a0ea7ed78c34692b
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.60-r1 b/metadata/md5-cache/dev-libs/zziplib-0.13.60-r1
index 811c5c5f18e1..b78a54ba8997 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.60-r1
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.60-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/zziplib/zziplib-0.13.60.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8521241e489cf85fe1ae076c045ab68f
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.47-r1 b/metadata/md5-cache/dev-lisp/clisp-2.47-r1
index db3c18ca77c0..d6213bdf310e 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.47-r1
+++ b/metadata/md5-cache/dev-lisp/clisp-2.47-r1
@@ -10,5 +10,5 @@ PDEPEND=dev-lisp/gentoo-init
 RDEPEND=virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 ) pari? ( >=sci-mathematics/pari-2.3.0 ) postgres? ( >=dev-db/postgresql-base-8.0 ) readline? ( >=sys-libs/readline-5.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( new-clx? ( x11-libs/libXpm ) ) hyperspec? ( dev-lisp/hyperspec )
 SLOT=2
 SRC_URI=mirror://sourceforge/clisp/clisp-2.47.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70cde855be46b07490eca8dd5d1514d1
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.48-r1 b/metadata/md5-cache/dev-lisp/clisp-2.48-r1
index c6b75cdafef2..6e390b5f4055 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.48-r1
+++ b/metadata/md5-cache/dev-lisp/clisp-2.48-r1
@@ -10,5 +10,5 @@ PDEPEND=dev-lisp/gentoo-init
 RDEPEND=virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 ) pari? ( >=sci-mathematics/pari-2.3.0 ) postgres? ( >=dev-db/postgresql-base-8.0 ) readline? ( >=sys-libs/readline-5.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( new-clx? ( x11-libs/libXpm ) ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.5 )
 SLOT=2
 SRC_URI=mirror://sourceforge/clisp/clisp-2.48.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=474c1e8d842c7ca419ae925d7a2ddff8
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.48-r2 b/metadata/md5-cache/dev-lisp/clisp-2.48-r2
index dab917bbbeb6..06ab3e278f1f 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.48-r2
+++ b/metadata/md5-cache/dev-lisp/clisp-2.48-r2
@@ -10,5 +10,5 @@ PDEPEND=dev-lisp/gentoo-init
 RDEPEND=virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 ) pari? ( >=sci-mathematics/pari-2.3.0 ) postgres? ( >=dev-db/postgresql-base-8.0 ) readline? ( >=sys-libs/readline-5.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( new-clx? ( x11-libs/libXpm ) ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.7 )
 SLOT=2
 SRC_URI=mirror://sourceforge/clisp/clisp-2.48.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=820923f6b79fe84e8c0e993fce147549
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7 b/metadata/md5-cache/dev-lisp/gcl-2.6.7
index c3a23d403953..ee5c8cb8c748 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=403c5a000d7d0a219a2e6db2e3c7f20c
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1 b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
index c306a1c9e6b7..336a5d41741c 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7cb56bb36ea05cc9987de775bd11932
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r2 b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r2
index dab108507b28..b3c599e3c494 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r2
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gcl/gcl_2.6.7.orig.tar.gz mirror://debian/pool/main/g/gcl/gcl_2.6.7-32.diff.gz mirror://gnu/gcl/gcl.info.tgz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef43d48bddcf15a4418da031ff2ca19d
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r3 b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r3
index 1e9056301d7c..365e91ac617c 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.7-r3
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.7-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gcl/gcl_2.6.7.orig.tar.gz mirror://debian/pool/main/g/gcl/gcl_2.6.7-34.diff.gz mirror://gnu/gcl/gcl.info.tgz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6369666cb4506e509afdea28de57c792
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419 b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419
index 173209d5c10f..4c510d76e84a 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/gcl-2.6.8_pre20090419.tar.bz2
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3022093cbc9aacb83923b56bdb35fdb9
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221 b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221
index 3113adc13b78..a4428701675b 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grozin/gcl-2.6.8_pre20111221.tar.bz2
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c92782e6360bf88681aed6a956b31805
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.0.55-r1 b/metadata/md5-cache/dev-lisp/sbcl-1.0.55-r1
index 8e3edb85975b..e65e162ae02a 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.0.55-r1
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.0.55-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=asdf? ( >=dev-lisp/gentoo-init-0.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.0.55-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.0.37-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.0.37-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) mips? ( !cobalt? ( mirror://sourceforge/sbcl/sbcl-1.0.23-mips-linux-binary.tar.bz2 ) ) mips? ( cobalt? ( mirror://sourceforge/sbcl/sbcl-1.0.28-mipsel-linux-binary.tar.bz2 ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1d0b7e0f7ee42c1feb584135c309855
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-0.2 b/metadata/md5-cache/dev-lua/lua-zlib-0.2
index 23823c89a218..dc45f8f9f6f4 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-0.2
+++ b/metadata/md5-cache/dev-lua/lua-zlib-0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/lua sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/tarball/v0.2 -> lua-zlib-0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a13c9eb254f8126b9e60c9a1855324b8
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.5-r1 b/metadata/md5-cache/dev-lua/luadbi-0.5-r1
index a3f38fe843fd..bd3dda9e24a0 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.5-r1
+++ b/metadata/md5-cache/dev-lua/luadbi-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=http://luadbi.googlecode.com/files/luadbi.0.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3439763d8411ece15d2edaed4f932cb0
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.2.0 b/metadata/md5-cache/dev-lua/luaexpat-1.2.0
index 1caab0df7784..7ca6fc8c468c 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.2.0
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1[deprecated] dev-libs/expat
 SLOT=0
 SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10667ddd4fb31875e65b44360fa51edb
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.2.0-r1 b/metadata/md5-cache/dev-lua/luaexpat-1.2.0-r1
index 7146f809acd1..ac46cfcb97a8 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.2.0-r1
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1[deprecated] dev-libs/expat
 SLOT=0
 SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf4561726754ae2ada68c373036b738b
diff --git a/metadata/md5-cache/dev-lua/luasec-0.4 b/metadata/md5-cache/dev-lua/luasec-0.4
index 3ba047df6d2f..54a41b0ceb0a 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.4
+++ b/metadata/md5-cache/dev-lua/luasec-0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1[deprecated] dev-lua/luasocket dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ac2ef4cbf520096fb465cfa93919a60
diff --git a/metadata/md5-cache/dev-lua/luasec-0.4.1 b/metadata/md5-cache/dev-lua/luasec-0.4.1
index f6c9b1bdcaec..77293a89eaf8 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.4.1
+++ b/metadata/md5-cache/dev-lua/luasec-0.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1[deprecated] dev-lua/luasocket dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-0.4.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b341afb253de3c0d10095a3c2ad1c13e
diff --git a/metadata/md5-cache/dev-lua/luasocket-2.0.2 b/metadata/md5-cache/dev-lua/luasocket-2.0.2
index 812396e55583..2fbadc68239f 100644
--- a/metadata/md5-cache/dev-lua/luasocket-2.0.2
+++ b/metadata/md5-cache/dev-lua/luasocket-2.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1[deprecated]
 SLOT=0
 SRC_URI=http://luaforge.net/frs/download.php/2664/luasocket-2.0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2ace1e8b80fb9b4955aeac0fb9965e5
diff --git a/metadata/md5-cache/dev-ml/ocamlduce-3.12.1.0 b/metadata/md5-cache/dev-ml/ocamlduce-3.12.1.0
index aa2b4b15b451..1a952aaaacd2 100644
--- a/metadata/md5-cache/dev-ml/ocamlduce-3.12.1.0
+++ b/metadata/md5-cache/dev-ml/ocamlduce-3.12.1.0
@@ -9,5 +9,5 @@ LICENSE=QPL-1.0 LGPL-2
 RDEPEND=~dev-lang/ocaml-3.12.1[ocamlopt?] >=dev-ml/findlib-1.2.4-r1 !!<dev-ml/ocamlduce-3.12.1.0
 SLOT=0
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/644/ocamlduce-3.12.1.0.tar.gz ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-3.12/ocaml-3.12.1.tar.bz2 mirror://gentoo/ocaml-patches-3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7af3fed12e810eae988d4b49eb908ac0
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.110.0 b/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.110.0
new file mode 100644
index 000000000000..e868afb14938
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.110.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/B-Hooks-OP-Check >=dev-perl/extutils-depends-0.302 test? ( dev-perl/Test-Exception dev-perl/B-Hooks-EndOfScope ) dev-lang/perl[-build]
+DESCRIPTION=Interface to perls parser variables
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/B-Hooks-Parser/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/B-Hooks-OP-Check dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/B-Hooks-Parser-0.11.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4995b193d6a2150b5d040f208adbbb89
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.420.0 b/metadata/md5-cache/dev-perl/Config-Auto-0.420.0
new file mode 100644
index 000000000000..3ce92d31ad3e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Auto-0.420.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec dev-perl/yaml dev-lang/perl[-build]
+DESCRIPTION=Magical config file parser
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Config-Auto/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec dev-perl/yaml dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.42.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6eec14e81bbbc7d393ab696e77e6ec30
diff --git a/metadata/md5-cache/dev-perl/Data-Uniqid-0.12 b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0
similarity index 64%
rename from metadata/md5-cache/dev-perl/Data-Uniqid-0.12
rename to metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0
index 9b66f4ca0904..f282479c2fa4 100644
--- a/metadata/md5-cache/dev-perl/Data-Uniqid-0.12
+++ b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
-DESCRIPTION=Perl extension for simple genrating of unique id's
+DEPEND=virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
+DESCRIPTION=Perl extension for simple generating of unique ids
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Data-Uniqid/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
+RDEPEND=virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dde32ad4dd3975bcc64ffe4705e13bbf
+_md5_=8004742e0879e2b5b23fd2cc23c79244
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.910.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.910.0
index 0a9788730101..4fff62a45f31 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.910.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.910.0
@@ -4,10 +4,10 @@ DESCRIPTION=Easy MIME message parsing
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Email-MIME/
 IUSE=test
-KEYWORDS=alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Email-MessageID >=dev-perl/Email-MIME-Encodings-1.310 >=dev-perl/Email-MIME-ContentType-1.012 >=dev-perl/Email-Simple-2.100 >=dev-perl/MIME-Types-1.18 !dev-perl/Email-MIME-Modifier !dev-perl/Email-MIME-Creator dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.910.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82c69c09e6d6bd17837e5fe0fa903b97
+_md5_=20411a043ffdd9c3593dcaf1ee3f2ba6
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0
new file mode 100644
index 000000000000..bfc5c6dc5a6f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl[-build]
+DESCRIPTION=Logging/debugging aid
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Log-TraceMessages/
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e49fc7f83ce7a77945c9fd7c687fb756
diff --git a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.03 b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.30.0
similarity index 84%
rename from metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.03
rename to metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.30.0
index 30630f99d650..e65c994dfedc 100644
--- a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.03
+++ b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.30.0
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdiscid-0.2.2 dev-lang/perl[-build]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz
+SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz http://dev.gentoo.org/~tove/distfiles/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-patch.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c994f66855a0e1efeb395dae70eb8813
+_md5_=cb8b563b43dcf7aa91866d3b2c235b50
diff --git a/metadata/md5-cache/dev-perl/Sys-SigAction-0.150.0 b/metadata/md5-cache/dev-perl/Sys-SigAction-0.150.0
index c369fb742cc5..c8120abb3ac6 100644
--- a/metadata/md5-cache/dev-perl/Sys-SigAction-0.150.0
+++ b/metadata/md5-cache/dev-perl/Sys-SigAction-0.150.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Perl extension for Consistent Signal Handling
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Sys-SigAction/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.15.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2a93cdceedd5f7a9d4b392de8d8faea0
+_md5_=66cef2e529bc7a635338c9747b258d5c
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.0.100 b/metadata/md5-cache/dev-perl/XML-LibXML-2.0.100
new file mode 100644
index 000000000000..6b6efeadf917
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.0.100
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
+DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/XML-LibXML/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0001.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b217f8e19ddaa637b80a2e335a2c0ee0
diff --git a/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4 b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4
index 064f6e3b4b63..ca14fa90e9a2 100644
--- a/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4
+++ b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl
-DESCRIPTION=A Perl 5 module for performing remote procedure calls using extensible markup language
-HOMEPAGE=http://perl-xml.sourceforge.net/xml-rpc/
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl[-build]
+DESCRIPTION=Perform remote procedure calls using extensible markup language
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Frontier-RPC/ http://perl-xml.sourceforge.net/xml-rpc/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl[-build]
 SLOT=0
-SRC_URI=http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
+SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.07b4.tar.gz http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c303dfa1889ca161da29af25c2a6e330
+_md5_=46ccd97da04b723c63361ce766a464fa
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.200.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.200.0
index 9670690c3b4b..d318770cd057 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.200.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.200.0
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.20.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4652440c0d16d66a3cd86b44f3fa8658
+_md5_=6b8dce258e7b891d090c9f52e87594b7
diff --git a/metadata/md5-cache/dev-perl/yaml-0.810.0 b/metadata/md5-cache/dev-perl/yaml-0.810.0
index a88a30d59064..bbc6e700320f 100644
--- a/metadata/md5-cache/dev-perl/yaml-0.810.0
+++ b/metadata/md5-cache/dev-perl/yaml-0.810.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=YAML Ain't Markup Language (tm)
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/YAML/
-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
+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-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-0.81.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d180c8b5d8ba9f821f3bd04a88b5f58
+_md5_=9bb0f3d6e6bd70a489e2ef3a55408725
diff --git a/metadata/md5-cache/dev-php/DBUnit-1.0.1 b/metadata/md5-cache/dev-php/DBUnit-1.0.1
index cfcad057f76c..aab58ca719b8 100644
--- a/metadata/md5-cache/dev-php/DBUnit-1.0.1
+++ b/metadata/md5-cache/dev-php/DBUnit-1.0.1
@@ -5,8 +5,8 @@ EAPI=3
 HOMEPAGE=http://www.phpunit.de
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-php/ezc-ConsoleTools-1.6 >=dev-php/File_Iterator-1.2.2 dev-php/PHP_TokenStream dev-php/Text_Template dev-lang/php >=dev-php/pear-1.9.0
+RDEPEND=>=dev-php/File_Iterator-1.2.2 dev-php/PHP_TokenStream dev-php/Text_Template dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/DbUnit-1.0.1.tgz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	php-pear-lib-r1	9cde23649a65088374c6f1cf79307881	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07895e9cb06d01e638fd22c23addc43e
+_md5_=2ea2f7531fff06befd78be5f20af6fc5
diff --git a/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.0 b/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.0
index f6094f66c680..2632b5a4a712 100644
--- a/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.0
+++ b/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.0
@@ -9,4 +9,4 @@ RDEPEND=!dev-php4/phpunit >=dev-php/PEAR-PEAR-1.9.1 >=dev-lang/php-5.2[simplexml
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHPUnit_Selenium-1.0.0.tgz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	php-pear-lib-r1	9cde23649a65088374c6f1cf79307881	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d0180a04d2316814048ab36edfbe2a3
+_md5_=38b67ea77c6add1c716912afffd68c85
diff --git a/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1 b/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1
index cb98afa14646..9c77d04e07a2 100644
--- a/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1
+++ b/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1
@@ -9,4 +9,4 @@ RDEPEND=!dev-php4/phpunit >=dev-php/PEAR-PEAR-1.9.1 >=dev-lang/php-5.2[simplexml
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHPUnit_Selenium-1.0.1.tgz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	php-pear-lib-r1	9cde23649a65088374c6f1cf79307881	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=695421001960b551b60229b7e252f3e4
+_md5_=95a58a4992247db1f49168c071d60bc0
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.1.0 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.1.0
deleted file mode 100644
index 515413a3d19c..000000000000
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.9.0
-DESCRIPTION=Library that provides collection, processing, and rendering functionality for PHP code coverage
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/ezc-ConsoleTools-1.6 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.0 >=dev-php/Text_Template-1.1.1 dev-lang/php >=dev-php/pear-1.9.0
-SLOT=0
-SRC_URI=http://pear.phpunit.de/get/PHP_CodeCoverage-1.1.0.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	php-pear-lib-r1	9cde23649a65088374c6f1cf79307881	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e93f2ed576823b2589d28c9d28b583a3
diff --git a/metadata/md5-cache/dev-php/adodb-ext-504-r2 b/metadata/md5-cache/dev-php/adodb-ext-504-r2
index c33ea56e7b21..6b089477126d 100644
--- a/metadata/md5-cache/dev-php/adodb-ext-504-r2
+++ b/metadata/md5-cache/dev-php/adodb-ext-504-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-php/adodb-4.70 || ( =dev-php/adodb-ext-504-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://phplens.com/lens/dl/adodb-ext-504.zip
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f90b106a338871fd863eb9c894cb308f
diff --git a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r1 b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r1
index a0d13e3831f2..95425fb1e8b1 100644
--- a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r1
+++ b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57d54d7050a0cdd027e2e7693f4280c7
diff --git a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r3 b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r3
index eca24be0225d..823623b34d1d 100644
--- a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r3
+++ b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dc80541aa591e6e22cc012e1759475c
diff --git a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r4 b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r4
index b69daa47e304..fb8abee4b28a 100644
--- a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r4
+++ b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r4[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4e4b7e011ef0206fe8e9cf0eb5099c1
diff --git a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5 b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
index e0a89b67512a..0610268bdf34 100644
--- a/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
+++ b/metadata/md5-cache/dev-php/eaccelerator-0.9.6.1-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r5[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e2a1db979488b1172e384fe6dc898db
diff --git a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1 b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
index 7b844c16ea9b..7d74254c649c 100644
--- a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
+++ b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( =d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f300be1e61a067e334b4b0ad11b5de80
diff --git a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1 b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
index 9b43cd13275a..6f7cd40e7791 100644
--- a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
+++ b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( =dev-php/igbinary-1.1.1-r1[php_targets_php5-3] =dev-php/igbinary-1.1.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ffc2cc9f864708390d19f928aaa3b39
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.4.1 b/metadata/md5-cache/dev-php/libvirt-php-0.4.1
index c084eeb4f696..db3a1c99bdee 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.4.1
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.4.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.4.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be0eac1878bd40b31c123a31191086d4
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.4.2 b/metadata/md5-cache/dev-php/libvirt-php-0.4.2
index 3ee200346c2b..f702f9e59aa2 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-0.4.2
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.4.2
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.4.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35551b0ed3a2d77c553b7a31a99f1e9a
diff --git a/metadata/md5-cache/dev-php/libvirt-php-9999 b/metadata/md5-cache/dev-php/libvirt-php-9999
index eb87adace3fa..9a17668a77a4 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-9999
+++ b/metadata/md5-cache/dev-php/libvirt-php-9999
@@ -7,5 +7,5 @@ IUSE=doc php_targets_php5-3
 LICENSE=PHP-3.01
 RDEPEND=app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-9999[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe493fe0260a57d6fa5c0538268a97df
diff --git a/metadata/md5-cache/dev-php/magickwand-1.0.8-r1 b/metadata/md5-cache/dev-php/magickwand-1.0.8-r1
index 556987e3da5a..187fc7a11274 100644
--- a/metadata/md5-cache/dev-php/magickwand-1.0.8-r1
+++ b/metadata/md5-cache/dev-php/magickwand-1.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=MagickWand
 RDEPEND=>=media-gfx/imagemagick-6.5.2.9 || ( =dev-php/magickwand-1.0.8-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://www.magickwand.org/download/php/MagickWandForPHP-1.0.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f584be4f80ee63a3f2f5b9c5df04fc5b
diff --git a/metadata/md5-cache/dev-php/magickwand-1.0.9 b/metadata/md5-cache/dev-php/magickwand-1.0.9
index 426cb4552297..7af9d1cb3534 100644
--- a/metadata/md5-cache/dev-php/magickwand-1.0.9
+++ b/metadata/md5-cache/dev-php/magickwand-1.0.9
@@ -9,5 +9,5 @@ LICENSE=MagickWand
 RDEPEND=>=media-gfx/imagemagick-6.5.2.9 || ( =dev-php/magickwand-1.0.9[php_targets_php5-3] =dev-php/magickwand-1.0.9[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://www.magickwand.org/download/php/MagickWandForPHP-1.0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb4f7c26482cb2bef97d94f3cb3ed277
diff --git a/metadata/md5-cache/dev-php/pecl-apc-3.1.10 b/metadata/md5-cache/dev-php/pecl-apc-3.1.10
index 9c59f9943b75..2f2bfe89b0ce 100644
--- a/metadata/md5-cache/dev-php/pecl-apc-3.1.10
+++ b/metadata/md5-cache/dev-php/pecl-apc-3.1.10
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.10[php_
 REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/APC-3.1.10.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1008f0140b6b7cd3d4a72fe3e68db8be
diff --git a/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2 b/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
index 75cec06f1dad..3e5033750e08 100644
--- a/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
+++ b/metadata/md5-cache/dev-php/pecl-apc-3.1.9-r2
@@ -10,5 +10,5 @@ RDEPEND=!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9-r2[ph
 REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/APC-3.1.9.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b175aa01a2ca6dbddc4fa4c5bbdbce9f
diff --git a/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1 b/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
index 7044b916b2b2..c0f83417b3a5 100644
--- a/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
+++ b/metadata/md5-cache/dev-php/pecl-bbcode-1.0.3_beta1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01 BSD
 RDEPEND=|| ( =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-3] =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/bbcode-1.0.3b1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad8301d3d67062404e15f647db948dd4
diff --git a/metadata/md5-cache/dev-php/pecl-cairo-0.3.1 b/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
index 52b1da25f659..c0939e1aeccf 100644
--- a/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
+++ b/metadata/md5-cache/dev-php/pecl-cairo-0.3.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=x11-libs/cairo-1.4[svg] || ( =dev-php/pecl-cairo-0.3.1[php_targets_php5-3] =dev-php/pecl-cairo-0.3.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/cairo-0.3.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8e1aa98e9417d9635b0e8bb8fdccbc3
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r1 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r1
index 3a43381e48d9..9b1b45491468 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r1
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3 CRACKLIB
 RDEPEND=|| ( =dev-php/pecl-crack-0.4-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1778f9ce002f24e75a64fe4d3386025d
diff --git a/metadata/md5-cache/dev-php/pecl-dbx-1.1.2 b/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
index 580029a245e0..f38e260feb1e 100644
--- a/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-dbx-1.1.2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-dbx-1.1.2[php_targets_php5-3] =dev-php/pecl-dbx-1.1.2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/dbx-1.1.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40d37f178803b6b21c895851e440857b
diff --git a/metadata/md5-cache/dev-php/pecl-dio-0.0.4_rc4-r2 b/metadata/md5-cache/dev-php/pecl-dio-0.0.4_rc4-r2
index 928a87c608d7..16ec504b06a5 100644
--- a/metadata/md5-cache/dev-php/pecl-dio-0.0.4_rc4-r2
+++ b/metadata/md5-cache/dev-php/pecl-dio-0.0.4_rc4-r2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-dio-0.0.4_rc4-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/dio-0.0.4RC4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25ad92d8b400a65bf4657bb14901b29c
diff --git a/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r1 b/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r1
index 6b1206864a92..97c1a1873aea 100644
--- a/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-drizzle-0.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-db/drizzle || ( =dev-php/pecl-drizzle-0.4.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/drizzle-0.4.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23d2050a59fcbca343a6d6cf351e6561
diff --git a/metadata/md5-cache/dev-php/pecl-gearman-0.8.0 b/metadata/md5-cache/dev-php/pecl-gearman-0.8.0
index 6a5178ea77d0..70f7029e86e9 100644
--- a/metadata/md5-cache/dev-php/pecl-gearman-0.8.0
+++ b/metadata/md5-cache/dev-php/pecl-gearman-0.8.0
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=sys-cluster/gearmand || ( =dev-php/pecl-gearman-0.8.0[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gearman-0.8.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc8795d748bbe0bed99fffb24576a124
diff --git a/metadata/md5-cache/dev-php/pecl-gearman-1.0.1 b/metadata/md5-cache/dev-php/pecl-gearman-1.0.1
index 07f246a0233a..72d5614e4223 100644
--- a/metadata/md5-cache/dev-php/pecl-gearman-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-gearman-1.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gearman-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88982cab0e7f6ca80d024c66e917a5bf
diff --git a/metadata/md5-cache/dev-php/pecl-gearman-1.0.1-r1 b/metadata/md5-cache/dev-php/pecl-gearman-1.0.1-r1
index 74dcd40ca039..c79822336ff0 100644
--- a/metadata/md5-cache/dev-php/pecl-gearman-1.0.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-gearman-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.1-r1[php_targets_php5-3] =dev-php/pecl-gearman-1.0.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gearman-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1aa8e53f467317ff9a205985ff05ee9f
diff --git a/metadata/md5-cache/dev-php/pecl-gearman-1.0.2 b/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
index 97ae38326070..9b83190eafbc 100644
--- a/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
+++ b/metadata/md5-cache/dev-php/pecl-gearman-1.0.2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.2[php_targets_php5-3] =dev-php/pecl-gearman-1.0.2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gearman-1.0.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1bbfa00b5f8b52d48b7bacaa401458e
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.0.7-r1 b/metadata/md5-cache/dev-php/pecl-geoip-1.0.7-r1
index 4c148a07cafa..6b7747b67950 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.0.7-r1
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.0.7-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.7-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/geoip-1.0.7.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b38157eeaadd1974a6054b911d61e76a
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1 b/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
index 9df95d4a0014..ac77f773b4cb 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.8-r1[php_targets_php5-3] =dev-php/pecl-geoip-1.0.8-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/geoip-1.0.8.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d92521bdfbf495bbb25efd360570e064
diff --git a/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1 b/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
index ccf0d777be8c..dd6d2c07f055 100644
--- a/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-gnupg-1.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=app-crypt/gpgme || ( =dev-php/pecl-gnupg-1.3.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/gnupg-1.3.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56d43e8585f0d9b7b6973e70eb7ca9ee
diff --git a/metadata/md5-cache/dev-php/pecl-haru-1.0.0-r1 b/metadata/md5-cache/dev-php/pecl-haru-1.0.0-r1
index fadf990219ae..fbd4c254bfec 100644
--- a/metadata/md5-cache/dev-php/pecl-haru-1.0.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-haru-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=media-libs/libharu[png?,zlib?] || ( =dev-php/pecl-haru-1.0.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/haru-1.0.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=411096b09b8d42ad687d66cc39cde9c7
diff --git a/metadata/md5-cache/dev-php/pecl-haru-1.0.3 b/metadata/md5-cache/dev-php/pecl-haru-1.0.3
index 414527067dc3..34f5a1578f03 100644
--- a/metadata/md5-cache/dev-php/pecl-haru-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-haru-1.0.3
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=media-libs/libharu[png?,zlib?] || ( =dev-php/pecl-haru-1.0.3[php_targets_php5-3] =dev-php/pecl-haru-1.0.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/haru-1.0.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa2ff80c6d6df7ae781ef70d577de974
diff --git a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.0 b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.0
index 104fc6f0516b..26ceb55d2a69 100644
--- a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.0
+++ b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.0
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-1.0.0[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/htscanner-1.0.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7663a966c1c3e850f0587ce86fcd861
diff --git a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1 b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
index 14d992cb56fc..0c9a3ee1c61d 100644
--- a/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-htscanner-1.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/htscanner-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dd54a98a619705a7ef4bb487a5e4e0e
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.0-r1 b/metadata/md5-cache/dev-php/pecl-http-1.7.0-r1
index f7954231bf65..8c63831a74b9 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5f37d7a10c89b1eb213bebdc927d710
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.1 b/metadata/md5-cache/dev-php/pecl-http-1.7.1
index ef303b209661..1c244bdbfcbb 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.1
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] =dev-php/pecl-http-1.7.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=926315bf230f9ebb51bff90c4d865d18
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.3 b/metadata/md5-cache/dev-php/pecl-http-1.7.3
index a28633261521..44e8c2f6bb1c 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.3
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb97c0187b44f51d2b954fa2590a4c74
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.3-r1 b/metadata/md5-cache/dev-php/pecl-http-1.7.3-r1
index bc3bc864c2dd..234841b0d92f 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=381dd22424cf7bdf6864ec1d0a2f77b2
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.4 b/metadata/md5-cache/dev-php/pecl-http-1.7.4
index b76720ae8cab..28ec86eaa133 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.4
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.4
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8e6f4fa39917e1232e302c3ff906079
diff --git a/metadata/md5-cache/dev-php/pecl-id3-0.2-r2 b/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
index 2be2a8ce0faf..d8cd5c3ea1d0 100644
--- a/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
+++ b/metadata/md5-cache/dev-php/pecl-id3-0.2-r2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-id3-0.2-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/id3-0.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c30f25ea96c5f5ddf2e11cd64a33816a
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.0.0-r1 b/metadata/md5-cache/dev-php/pecl-imagick-3.0.0-r1
index 071dc4c96c0a..d18ddc487f4b 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.0.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.0.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed3d729e9b096092764d9eb898475b00
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1 b/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
index bde4260effad..9c3e3b19e6d9 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50f5e941e1bae8c61e7edfaef2b96b2e
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc1 b/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc1
index 86e81b6fa031..1d9a33c252f8 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.1.0_rc1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=>=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.1.0_rc1[php_targets_php5-3] =dev-php/pecl-imagick-3.1.0_rc1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/imagick-3.1.0RC1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8f634cecaff930a4857339b9eda574f
diff --git a/metadata/md5-cache/dev-php/pecl-libevent-0.0.4 b/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
index 6d7ab2a8bf57..76e4480791dd 100644
--- a/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
+++ b/metadata/md5-cache/dev-php/pecl-libevent-0.0.4
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/libevent-1.4.0 || ( =dev-php/pecl-libevent-0.0.4[php_targets_php5-3] =dev-php/pecl-libevent-0.0.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/libevent-0.0.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ed4ae0d3b0b1beea44a7a3db8112fd7
diff --git a/metadata/md5-cache/dev-php/pecl-lzf-1.5.2-r1 b/metadata/md5-cache/dev-php/pecl-lzf-1.5.2-r1
index 7ff4fcf3c73b..2cddd68cda5b 100644
--- a/metadata/md5-cache/dev-php/pecl-lzf-1.5.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-lzf-1.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-lzf-1.5.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/LZF-1.5.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bc11fe5bcf6dd43cd73aeacbb07b82a
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.5-r1 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.5-r1
index 7ad46af48d73..45fc77b5c777 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.5-r1
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-2.02
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.5-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.5.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1371f8b88fb3bdb2510daf4ce3e6ddd1
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
index 488822c09904..dd1e4181aca3 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
@@ -9,5 +9,5 @@ LICENSE=PHP-2.02
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.6[php_targets_php5-3] =dev-php/pecl-mailparse-2.1.6[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.6.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55e6dff6a3c15fd9c3f89dce790aa06c
diff --git a/metadata/md5-cache/dev-php/pecl-mcve-7.0.3-r1 b/metadata/md5-cache/dev-php/pecl-mcve-7.0.3-r1
index d2217584d161..3e706468037e 100644
--- a/metadata/md5-cache/dev-php/pecl-mcve-7.0.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-mcve-7.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-libs/openssl net-libs/libmonetra dev-lang/php[ssl] || ( =dev-php/pecl-mcve-7.0.3-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mcve-7.0.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=039f6d934482717a8ac8936f35b859ea
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r1 b/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r1
index 29595f7ab2f3..11268ad2b4be 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcache-2.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-2.2.6-r
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-2.2.6.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab35793f19aca80294524b1af30c1950
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r1 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r1
index b912edf54923..2ce9be053cc8 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.5.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=453d1cccec2a84ce3a5aa8ae9def8ebb
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r2 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r2
index bd845a7e31b0..fe1f0dfca3a8 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r2
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.5.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a90db34f592382fdb9d262191b8162b9
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.6 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.6
index 17329cb145bb..f6fec3e147b7 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.6
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6[p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.6.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71d13d7f164a2a2891a53bfecb61884b
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.6-r1 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.6-r1
index 47b3a25d2320..dd1a653cc715 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.6-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6-r
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcache-3.0.6.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57523ab268d16dabfc2103b13411dc09
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1 b/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
index 11c8851697ed..7541312168f1 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcached-1.0.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-1.0.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9404876b1b627e18d05420536c60dfe5
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-2.0.1 b/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
index 17b81edc565b..6326c1c92961 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( =dev-php/pecl-memcached-2.0.1[php_targets_php5-3] =dev-php/pecl-memcached-2.0.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-2.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d89539918133698f45df9020b5b498c4
diff --git a/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1 b/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
index 23a328cc9aac..3a5e161896b8 100644
--- a/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
+++ b/metadata/md5-cache/dev-php/pecl-mogilefs-0.9.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/neon || ( =dev-php/pecl-mogilefs-0.9.1[php_targets_php5-3] =dev-php/pecl-mogilefs-0.9.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mogilefs-0.9.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4a0cc10125da35976650ed22a13214a
diff --git a/metadata/md5-cache/dev-php/pecl-mongo-1.2.9 b/metadata/md5-cache/dev-php/pecl-mongo-1.2.9
index 0e603109e3e6..9ad8acda0cb0 100644
--- a/metadata/md5-cache/dev-php/pecl-mongo-1.2.9
+++ b/metadata/md5-cache/dev-php/pecl-mongo-1.2.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( =dev-php/pecl-mongo-1.2.9[php_targets_php5-3] =dev-php/pecl-mongo-1.2.9[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mongo-1.2.9.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0500eb5b7459d213dd854aaa37e6927
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.1 b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.1
index 62d6b7a2caf0..8ea8ff0a2f64 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.1
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_ms-1.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=65c6a826e594c8725ca5ea6b06f2e7eb
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.2 b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.2
index 38c6a65db65e..ecb568517d20 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.1.2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_ms-1.1.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a015978373bc773561dcf9d1416c3b95
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.2.2 b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.2.2
index 6789f9dfd9fa..ee2554ea4914 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.2.2
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_ms-1.2.2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.2.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_ms-1.2.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c021448a02276a684ff793015b58992
diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1 b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
index cf7bedc19e64..55ca246866cc 100644
--- a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_qc-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mysqlnd_qc-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61947cf383c88578896bee31759a6576
diff --git a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1 b/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
index 3d3d1c81e4e1..a0c5628a8527 100644
--- a/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-ncurses-1.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=sys-libs/ncurses || ( =dev-php/pecl-ncurses-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ncurses-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9872b3eecb3c0ce441d9f126d78412e2
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2 b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2
index 0e2cbe5c35e5..184ba0192344 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2
+++ b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/php[hash] || ( =dev-php/pecl-oauth-1.2.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/oauth-1.2.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b57ac6f56e335a7f4c0a9ae711ef155
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1 b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
index 75138a73f6d7..6d3dbef633a5 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-oauth-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/php[hash] || ( =dev-php/pecl-oauth-1.2.2-r1[php_targets_php5-3] =dev-php/pecl-oauth-1.2.2-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/oauth-1.2.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=097f92b0b9af523b41c30a49ac87be42
diff --git a/metadata/md5-cache/dev-php/pecl-pam-1.0.2-r1 b/metadata/md5-cache/dev-php/pecl-pam-1.0.2-r1
index f4b3d566b4b7..4c1dd7771a55 100644
--- a/metadata/md5-cache/dev-php/pecl-pam-1.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-pam-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-2.02
 RDEPEND=sys-libs/pam || ( =dev-php/pecl-pam-1.0.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pam-1.0.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f22d15fcaf564b8101b8f448413d4e2
diff --git a/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1 b/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
index e913681d1caf..ebdd2a805bec 100644
--- a/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
+++ b/metadata/md5-cache/dev-php/pecl-ps-1.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-2.02
 RDEPEND=dev-libs/pslib || ( =dev-php/pecl-ps-1.3.6-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ps-1.3.6.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e368363eadbdb164420238e3d07e39ba
diff --git a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r1 b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r1
index 9ac1ba119cca..f8dfa1682468 100644
--- a/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r1
+++ b/metadata/md5-cache/dev-php/pecl-radius-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD BSD-2
 RDEPEND=|| ( =dev-php/pecl-radius-1.2.5-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/radius-1.2.5.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1f8db97a7218e1bd9c4c255671b0762
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-1.0.5 b/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
index b4fee1be99e9..9cfa312015b8 100644
--- a/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
+++ b/metadata/md5-cache/dev-php/pecl-rrd-1.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1 || ( =dev-php/pecl-rrd-1.0.5[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/rrd-1.0.5.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46b1d94a5940e50e681e06869b2ac0f2
diff --git a/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2 b/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
index 03ed749e798a..39c616e21fd4 100644
--- a/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
+++ b/metadata/md5-cache/dev-php/pecl-sca_sdo-1.2.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/php-5.2[json,soap,xml] || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3.1 ) || ( =dev-php/pecl-sca_sdo-1.2.4-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/SCA_SDO-1.2.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a10e79a21647b474114632545583475
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.2-r1 b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.2-r1
index 0e0c0c0163d1..3b580c40bd9f 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.2-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.11.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=668ea939b4c0a960001ddf91dc9b7283
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3 b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3
index 61c557418e08..9b55a6e0b882 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.11.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49e0ede55a54899bed291f717907e931
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1 b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
index deb7bdddfc3f..53327b17c7b8 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-3] =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.11.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e44579c1f82ba0eccd3a75d34e1f06df
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-1.0.3 b/metadata/md5-cache/dev-php/pecl-stomp-1.0.3
index 93533ee1699c..8d0558cc477e 100644
--- a/metadata/md5-cache/dev-php/pecl-stomp-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-stomp-1.0.3
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=ssl? ( dev-lang/php[ssl] ) || ( =dev-php/pecl-stomp-1.0.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/stomp-1.0.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e69d843b3a1fdc929874c94a81032f5
diff --git a/metadata/md5-cache/dev-php/pecl-svn-1.0.1 b/metadata/md5-cache/dev-php/pecl-svn-1.0.1
index 903657bc24e8..57994545ead0 100644
--- a/metadata/md5-cache/dev-php/pecl-svn-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-svn-1.0.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=<dev-vcs/subversion-1.7 || ( =dev-php/pecl-svn-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/svn-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=592c4601e3cab644522a6e401c854028
diff --git a/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r1 b/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r1
index 09bde5c5c77d..0baad987403b 100644
--- a/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-syck-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( =dev-php/pecl-syck-0.9.3-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/syck-0.9.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ad374fa7cb72aa58494cd5c6595fd8e
diff --git a/metadata/md5-cache/dev-php/pecl-taint-0.4.1 b/metadata/md5-cache/dev-php/pecl-taint-0.4.1
index 1bf42fedc886..bca717619c9d 100644
--- a/metadata/md5-cache/dev-php/pecl-taint-0.4.1
+++ b/metadata/md5-cache/dev-php/pecl-taint-0.4.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=|| ( =dev-php/pecl-taint-0.4.1[php_targets_php5-3] =dev-php/pecl-taint-0.4.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/taint-0.4.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b7f8fbdc666523160e31458e79ac988
diff --git a/metadata/md5-cache/dev-php/pecl-taint-0.5.3 b/metadata/md5-cache/dev-php/pecl-taint-0.5.3
index 3ffc0c0d823d..054d25a3978e 100644
--- a/metadata/md5-cache/dev-php/pecl-taint-0.5.3
+++ b/metadata/md5-cache/dev-php/pecl-taint-0.5.3
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=|| ( =dev-php/pecl-taint-0.5.3[php_targets_php5-3] =dev-php/pecl-taint-0.5.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/taint-0.5.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e752a6165917c7b305d7b62ac5680f87
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2011.13 b/metadata/md5-cache/dev-php/pecl-timezonedb-2011.13
index dce483b2c3e3..3d2e8641e4c7 100644
--- a/metadata/md5-cache/dev-php/pecl-timezonedb-2011.13
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2011.13
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-timezonedb-2011.13[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/timezonedb-2011.13.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6bf666b8020cf3130a4a151c8d4b4c5
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2011.14 b/metadata/md5-cache/dev-php/pecl-timezonedb-2011.14
index 06102ac55d6a..c60e9b1d2ee9 100644
--- a/metadata/md5-cache/dev-php/pecl-timezonedb-2011.14
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2011.14
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-timezonedb-2011.14[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/timezonedb-2011.14.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c3a99be1b249fadc6ed08c118d08be90
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2012.1 b/metadata/md5-cache/dev-php/pecl-timezonedb-2012.1
index 60fcd40bf4a8..a1f669e78956 100644
--- a/metadata/md5-cache/dev-php/pecl-timezonedb-2012.1
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2012.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-timezonedb-2012.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/timezonedb-2012.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4154d04e02cb6cddee6f836da59e751c
diff --git a/metadata/md5-cache/dev-php/pecl-translit-0.6.0-r1 b/metadata/md5-cache/dev-php/pecl-translit-0.6.0-r1
index 8f7b98a364fc..d64eb8a37e0b 100644
--- a/metadata/md5-cache/dev-php/pecl-translit-0.6.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-translit-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=|| ( =dev-php/pecl-translit-0.6.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/translit-0.6.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af6afed09cfdb2a5f0d6d8df3fccb349
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.1-r1 b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.1-r1
index c09c1a54d637..a51fb3c8e631 100644
--- a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=|| ( =dev-php/pecl-uploadprogress-1.0.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uploadprogress-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1983d8f58a67180e18f41cd170e18f05
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1 b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
index bf49d035486b..520028b628e5 100644
--- a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3.01
 RDEPEND=|| ( =dev-php/pecl-uploadprogress-1.0.3.1[php_targets_php5-3] =dev-php/pecl-uploadprogress-1.0.3.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uploadprogress-1.0.3.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a413c98dc5b0807e905224de237383ea
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.0.2 b/metadata/md5-cache/dev-php/pecl-uuid-1.0.2
index a030b64877d7..db421576f303 100644
--- a/metadata/md5-cache/dev-php/pecl-uuid-1.0.2
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/util-linux || ( =dev-php/pecl-uuid-1.0.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uuid-1.0.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62ab0131c241a81223067b4608269577
diff --git a/metadata/md5-cache/dev-php/pecl-xdiff-1.5.1-r1 b/metadata/md5-cache/dev-php/pecl-xdiff-1.5.1-r1
index 5884fc91e766..bc7abdd2b99d 100644
--- a/metadata/md5-cache/dev-php/pecl-xdiff-1.5.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-xdiff-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-2.02
 RDEPEND=dev-libs/libxdiff || ( =dev-php/pecl-xdiff-1.5.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdiff-1.5.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e3b470fe649fc57227a61a6a1ae927e
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.0.1 b/metadata/md5-cache/dev-php/pecl-yaml-1.0.1
index 21a4aaf6de39..f360a7482426 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.0.1
+++ b/metadata/md5-cache/dev-php/pecl-yaml-1.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libyaml-0.1.0 || ( =dev-php/pecl-yaml-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaml-1.0.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73fb952ce3be539bb94e2a7d9e990de8
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.1.0 b/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
index d1e05340c6c1..bc436bc04cdc 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
+++ b/metadata/md5-cache/dev-php/pecl-yaml-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libyaml-0.1.0 || ( =dev-php/pecl-yaml-1.1.0[php_targets_php5-3] =dev-php/pecl-yaml-1.1.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaml-1.1.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b0d54c3c3e64297815c10de1d834cb86
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.0.14-r1 b/metadata/md5-cache/dev-php/pecl-yaz-1.0.14-r1
index 30a446f47120..5e0fb9897074 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.0.14-r1
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.0.14-r1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.0.14-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaz-1.0.14.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccb98a315e9869d21a171823a77bca14
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.1.1 b/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
index 643b9fb80ba3..756bb112beea 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.1.1
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=>=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/yaz-1.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=855346453615fd693130c114ce3e5f3f
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.32.1-r2 b/metadata/md5-cache/dev-php/suhosin-0.9.32.1-r2
index 66290e821dbb..52c6ff159c77 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.32.1-r2
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.32.1-r2
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.32.1-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.32.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=15c5ff0cf668d04444c141816a622893
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.33 b/metadata/md5-cache/dev-php/suhosin-0.9.33
index 67b23b6c5987..a9ea783d87c5 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.33
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.33
@@ -9,5 +9,5 @@ LICENSE=PHP-3
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.33[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.33.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0996b48b5f62a4660fe0572a68acb225
diff --git a/metadata/md5-cache/dev-php/xcache-1.3.1 b/metadata/md5-cache/dev-php/xcache-1.3.1
index 77bc3aba10e5..d28473ff6c21 100644
--- a/metadata/md5-cache/dev-php/xcache-1.3.1
+++ b/metadata/md5-cache/dev-php/xcache-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcache.lighttpd.net/pub/Releases/1.3.1/xcache-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1ecd71600eb8d3b28ad3b94812e7399
diff --git a/metadata/md5-cache/dev-php/xcache-1.3.2 b/metadata/md5-cache/dev-php/xcache-1.3.2
index a65a58bbfa6d..f65788b8146f 100644
--- a/metadata/md5-cache/dev-php/xcache-1.3.2
+++ b/metadata/md5-cache/dev-php/xcache-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcache.lighttpd.net/pub/Releases/1.3.2/xcache-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de546bc791457be2da8e333e47369686
diff --git a/metadata/md5-cache/dev-php/xcache-2.0.0 b/metadata/md5-cache/dev-php/xcache-2.0.0
index c6d6c0e0c2bc..c1870781a631 100644
--- a/metadata/md5-cache/dev-php/xcache-2.0.0
+++ b/metadata/md5-cache/dev-php/xcache-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcache.lighttpd.net/pub/Releases/2.0.0/xcache-2.0.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed8789d2840824333b0e620d7158a947
diff --git a/metadata/md5-cache/dev-php/xdebug-2.1.0-r1 b/metadata/md5-cache/dev-php/xdebug-2.1.0-r1
index 37ca7a2b1028..d808b52caab0 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.1.0-r1
+++ b/metadata/md5-cache/dev-php/xdebug-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.0 || ( =dev-php/xdebug-2.1.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.1.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cc2d673ad55b5d2112aa8a312b3cf54
diff --git a/metadata/md5-cache/dev-php/xdebug-2.1.1 b/metadata/md5-cache/dev-php/xdebug-2.1.1
index b7edf736aad2..d6b8fecc1925 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.1.1
+++ b/metadata/md5-cache/dev-php/xdebug-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.1 || ( =dev-php/xdebug-2.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcf3e55d1278250b202625dc720ce3fc
diff --git a/metadata/md5-cache/dev-php/xdebug-2.1.2 b/metadata/md5-cache/dev-php/xdebug-2.1.2
index a96bca3f271a..5dadf962e060 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.1.2
+++ b/metadata/md5-cache/dev-php/xdebug-2.1.2
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.2 || ( =dev-php/xdebug-2.1.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.1.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00e2fb5f15f71c4b0295abc418151e02
diff --git a/metadata/md5-cache/dev-php/xdebug-2.1.3 b/metadata/md5-cache/dev-php/xdebug-2.1.3
index 7c31dd3d7ab3..eb1cfa998bb3 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.1.3
+++ b/metadata/md5-cache/dev-php/xdebug-2.1.3
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.3 || ( =dev-php/xdebug-2.1.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.1.3.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b7edaf278b2ee46c08c493301f1fd0c
diff --git a/metadata/md5-cache/dev-php/xdebug-2.1.4 b/metadata/md5-cache/dev-php/xdebug-2.1.4
index 2d262f3993e7..9bb1553fa0eb 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.1.4
+++ b/metadata/md5-cache/dev-php/xdebug-2.1.4
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.4 || ( =dev-php/xdebug-2.1.4[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.1.4.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42b9167c5ec9f2d8c9d961331f052db4
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0 b/metadata/md5-cache/dev-php/xdebug-2.2.0
index f4cf26a1619c..66d7a71a7da3 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0 || ( =dev-php/xdebug-2.2.0[php_targets_php5-3] =dev-php/xdebug-2.2.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47c7c822b4ef6bb769e58864f1dbcb9e
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0_rc1 b/metadata/md5-cache/dev-php/xdebug-2.2.0_rc1
index 94bb7fb9585d..b46085ea4470 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0_rc1
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0_rc1
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0_rc1 || ( =dev-php/xdebug-2.2.0_rc1[php_targets_php5-3] =dev-php/xdebug-2.2.0_rc1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0RC1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f28c490b23e2df0c284bb8ac185073e5
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0_rc2 b/metadata/md5-cache/dev-php/xdebug-2.2.0_rc2
index c2e289cb48a8..33aab539bcf4 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0_rc2
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0_rc2
@@ -9,5 +9,5 @@ LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0_rc2 || ( =dev-php/xdebug-2.2.0_rc2[php_targets_php5-3] =dev-php/xdebug-2.2.0_rc2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0RC2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d89c553865279bccf238b9305c6f5197
diff --git a/metadata/md5-cache/dev-php/xhprof-0.9.2 b/metadata/md5-cache/dev-php/xhprof-0.9.2
index c882b61b5233..47a11e16e3c0 100644
--- a/metadata/md5-cache/dev-php/xhprof-0.9.2
+++ b/metadata/md5-cache/dev-php/xhprof-0.9.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-lang/php || ( =dev-php/xhprof-0.9.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xhprof-0.9.2.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bcffa2f37a0facd7244479f041c18ca
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.8 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.8
new file mode 100644
index 000000000000..17cdb45b8ea0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/CoverageTestRunner-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-python/coverage || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=fail Python program unit tests unless they test everything
+EAPI=4
+HOMEPAGE=http://liw.fi/coverage-test-runner/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/coverage || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.8.orig.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=300d8cacdbfc2d251561e97b72294729
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.9.2 b/metadata/md5-cache/dev-python/PyQt4-4.9.2
index 323830673415..ecd32b140af4 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.9.2
+++ b/metadata/md5-cache/dev-python/PyQt4-4.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dbus? ( virtual/pkgconfig ) dev-lang/python
+DEPEND=>=dev-python/sip-4.13.3 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dbus? ( virtual/pkgconfig ) dev-lang/python
 DESCRIPTION=Python bindings for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt
 IUSE=X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dev-lang/python
+RDEPEND=>=dev-python/sip-4.13.3 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dev-lang/python
 REQUIRED_USE=assistant? ( X ) declarative? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) sql? ( X ) svg? ( X ) webkit? ( X )
 SLOT=0
 SRC_URI=http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-4.9.2.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=36b5154b612a7c122ae140e8bfb9f963
+_md5_=c612a16092cbc75b1edad92b8d89f0de
diff --git a/metadata/md5-cache/dev-python/apiextractor-0.10.10 b/metadata/md5-cache/dev-python/apiextractor-0.10.10
index b50f8febb324..63d3a68cfb2b 100644
--- a/metadata/md5-cache/dev-python/apiextractor-0.10.10
+++ b/metadata/md5-cache/dev-python/apiextractor-0.10.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4
 SLOT=0
 SRC_URI=http://www.pyside.org/files/apiextractor-0.10.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2913eb34d2cf0ca14b3d1437af1ce87c
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.13.1 b/metadata/md5-cache/dev-python/apsw-3.7.13.1
new file mode 100644
index 000000000000..a96e811c60a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apsw-3.7.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=>=dev-db/sqlite-3.7.13[extensions] app-arch/unzip dev-lang/python
+DESCRIPTION=APSW - Another Python SQLite Wrapper
+EAPI=4
+HOMEPAGE=http://code.google.com/p/apsw/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=as-is
+RDEPEND=>=dev-db/sqlite-3.7.13[extensions] dev-lang/python
+SLOT=0
+SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.13-r1.zip
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c12cb9b671a602f0c904a95b9260d9e5
diff --git a/metadata/md5-cache/dev-python/cliapp-0.29 b/metadata/md5-cache/dev-python/cliapp-0.29
index 4fc7bdcde460..1dd056fd250f 100644
--- a/metadata/md5-cache/dev-python/cliapp-0.29
+++ b/metadata/md5-cache/dev-python/cliapp-0.29
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=test? ( dev-python/CoverageTestRunner ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Framework for Unix-like command line programs
 EAPI=4
 HOMEPAGE=http://liw.fi/cliapp/
@@ -9,4 +9,4 @@ RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_0.29.orig.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=157480febd2bc45374960d41cc6b967b
+_md5_=120df5465ca5f036e5f83b04296a2e75
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.1.3 b/metadata/md5-cache/dev-python/egenix-mx-base-3.1.3
index 030bfaeef532..d0f3bdb8197a 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.1.3
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.1.3
@@ -8,5 +8,5 @@ LICENSE=eGenixPublic-1.1
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://downloads.egenix.com/python/egenix-mx-base-3.1.3.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e24d5f1197faf364602110647c86d978
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.1-r1 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.1-r1
index 067a7637c761..f9ed324cc6bc 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=eGenixPublic-1.1
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://downloads.egenix.com/python/egenix-mx-base-3.2.1.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d5a7af6e3830908e4a671385b614056
diff --git a/metadata/md5-cache/dev-python/gdmodule-0.56-r2 b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
index f4185685d06b..66b80cec2b33 100644
--- a/metadata/md5-cache/dev-python/gdmodule-0.56-r2
+++ b/metadata/md5-cache/dev-python/gdmodule-0.56-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/gd[jpeg?,png?,truetype?,xpm?] media-libs/giflib jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) truetype? ( media-libs/freetype:2 ) xpm? ( x11-libs/libXpm ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://newcenturycomputers.net/projects/download.cgi/gdmodule-0.56.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=891908c9768c8d887b57ea68d840de2a
diff --git a/metadata/md5-cache/dev-python/generatorrunner-0.6.16 b/metadata/md5-cache/dev-python/generatorrunner-0.6.16
index ab057f28e7bd..be6184406c72 100644
--- a/metadata/md5-cache/dev-python/generatorrunner-0.6.16
+++ b/metadata/md5-cache/dev-python/generatorrunner-0.6.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/apiextractor-0.10.10 >=x11-libs/qt-core-4.7.0:4
 SLOT=0
 SRC_URI=http://www.pyside.org/files/generatorrunner-0.6.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f69f9eb353b724cff6d91184282581bb
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.7 b/metadata/md5-cache/dev-python/netaddr-0.7.7
index 2745c55568c1..48760583cac2 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.7
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.7
@@ -10,4 +10,4 @@ RDEPEND=cli? ( dev-python/ipython ) dev-lang/python
 SLOT=0
 SRC_URI=mirror://github/drkjam/netaddr/netaddr-0.7.7.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=1f7d273b7e572c78a08800feb31f66e4
+_md5_=8f79613b16fea2df86e5c465c49f27e0
diff --git a/metadata/md5-cache/dev-python/numpy-1.5.1 b/metadata/md5-cache/dev-python/numpy-1.5.1
index 118834479c8a..c96f8f094fe5 100644
--- a/metadata/md5-cache/dev-python/numpy-1.5.1
+++ b/metadata/md5-cache/dev-python/numpy-1.5.1
@@ -9,5 +9,5 @@ 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.5.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.5.x/numpy-html.zip -> numpy-1.5-html.zip http://docs.scipy.org/doc/numpy-1.5.x/numpy-ref.pdf -> numpy-1.5-ref.pdf http://docs.scipy.org/doc/numpy-1.5.x/numpy-user.pdf -> numpy-1.5-user.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2e16f7a479321268099b02e915a5f010
diff --git a/metadata/md5-cache/dev-python/numpy-1.6.0 b/metadata/md5-cache/dev-python/numpy-1.6.0
index fb9607e5f510..60e32edba6ef 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.0
+++ b/metadata/md5-cache/dev-python/numpy-1.6.0
@@ -9,5 +9,5 @@ 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.0.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.5.x/numpy-html.zip -> numpy-1.5-html.zip http://docs.scipy.org/doc/numpy-1.5.x/numpy-ref.pdf -> numpy-1.5-ref.pdf http://docs.scipy.org/doc/numpy-1.5.x/numpy-user.pdf -> numpy-1.5-user.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c37e38c2992ef67b133ddb025d4bd4b2
diff --git a/metadata/md5-cache/dev-python/numpy-1.6.1 b/metadata/md5-cache/dev-python/numpy-1.6.1
index 7a1558459384..a2065cb0f369 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.1
+++ b/metadata/md5-cache/dev-python/numpy-1.6.1
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a27a61ac0f601ae8e73524cac88473c7
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 0eddc63d240c..7492dc4a00dd 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.6.1-r1
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57ba842df03f78a5848c4eb3565b2d7b
diff --git a/metadata/md5-cache/dev-python/numpy-1.6.2 b/metadata/md5-cache/dev-python/numpy-1.6.2
index e9dc20208293..5c5e9fa74fe3 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.2
+++ b/metadata/md5-cache/dev-python/numpy-1.6.2
@@ -9,5 +9,5 @@ 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.2.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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7dbb33256f3c75f1a01e74122320b52e
diff --git a/metadata/md5-cache/dev-python/pycairo-1.8.10 b/metadata/md5-cache/dev-python/pycairo-1.8.10
index ec20f131fd32..28fff559e622 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.8.10
+++ b/metadata/md5-cache/dev-python/pycairo-1.8.10
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.8.10[svg?] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://cairographics.org/releases/py2cairo-1.8.10.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1fd270bee2e68cab3ed5df51cbbbf15
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.49 b/metadata/md5-cache/dev-python/pycups-1.9.49
index dfd5cecbf8cd..be69ad7cbfd0 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.49
+++ b/metadata/md5-cache/dev-python/pycups-1.9.49
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.49.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2c00550b6ee57b93fc365abdeb2a442
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.57 b/metadata/md5-cache/dev-python/pycups-1.9.57
index 92195148ede8..419503c4e59d 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.57
+++ b/metadata/md5-cache/dev-python/pycups-1.9.57
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.57.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3a240877dbec5597ca956960288d94f
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.60 b/metadata/md5-cache/dev-python/pycups-1.9.60
index 14e9ce3e8a62..dbbdcfca8ce6 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.60
+++ b/metadata/md5-cache/dev-python/pycups-1.9.60
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.60.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8dda87cb491d8f8a70aedbf3449eabaf
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.61 b/metadata/md5-cache/dev-python/pycups-1.9.61
index 18baa7e1d857..7ace231e498d 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.61
+++ b/metadata/md5-cache/dev-python/pycups-1.9.61
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.61.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=439318a5714e5b965a95bd7d7c5e50d8
diff --git a/metadata/md5-cache/dev-python/pydns-2.3.5 b/metadata/md5-cache/dev-python/pydns-2.3.6
similarity index 64%
rename from metadata/md5-cache/dev-python/pydns-2.3.5
rename to metadata/md5-cache/dev-python/pydns-2.3.6
index 6e86916e37d6..ed37e25e81bb 100644
--- a/metadata/md5-cache/dev-python/pydns-2.3.5
+++ b/metadata/md5-cache/dev-python/pydns-2.3.6
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/libiconv dev-lang/python
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=!dev-python/pydns:0 virtual/libiconv =dev-lang/python-2*
 DESCRIPTION=Python module for DNS (Domain Name Service)
-EAPI=2
+EAPI=4
 HOMEPAGE=http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=CNRI
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.5/pydns-2.3.5.tar.gz
+RDEPEND==dev-lang/python-2*
+SLOT=2
+SRC_URI=http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.6/pydns-2.3.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=f3d13f11f31d9d6497ad4e2f3ccd3b33
+_md5_=59e658efae39c6c17285f915085c069d
diff --git a/metadata/md5-cache/dev-python/pydns-3.0.2 b/metadata/md5-cache/dev-python/pydns-3.0.2
new file mode 100644
index 000000000000..967e914c2351
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydns-3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=!dev-python/py3dns virtual/libiconv =dev-lang/python-3*
+DESCRIPTION=Python module for DNS (Domain Name Service)
+EAPI=4
+HOMEPAGE=http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=CNRI
+RDEPEND==dev-lang/python-3*
+SLOT=3
+SRC_URI=http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.2.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=41e24c428409e5fd407bccbcc9bd422e
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r1 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r1
index 06e9186cf9c8..40676c98a75e 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8de1d59277eaf46bcb064ecf6eeb1021
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r2 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
index bc98ded72282..41d003d461a3 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e32a62af3a92e69c111822151c9772c
diff --git a/metadata/md5-cache/dev-python/pyqwt-5.2.0 b/metadata/md5-cache/dev-python/pyqwt-5.2.0
index a247635ec85c..5826392efec1 100644
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0
+++ b/metadata/md5-cache/dev-python/pyqwt-5.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qwt:5[svg?] >=dev-python/PyQt4-4.6.1 dev-python/numpy =dev-lang/python-2*
 SLOT=5
 SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=109096a5975bf950e04b9741bf69d78b
diff --git a/metadata/md5-cache/dev-python/pyside-1.1.1 b/metadata/md5-cache/dev-python/pyside-1.1.1
index d22d61706f14..2d2bcd504b78 100644
--- a/metadata/md5-cache/dev-python/pyside-1.1.1
+++ b/metadata/md5-cache/dev-python/pyside-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/shiboken-1.1.1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/q
 REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X )
 SLOT=0
 SRC_URI=http://www.pyside.org/files/pyside-qt4.8+1.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aa84a8844937aafde5322730e5a7369c
diff --git a/metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2 b/metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2
index cd618a52a5c6..8296e3e38b15 100644
--- a/metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2
+++ b/metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.pyside.org/files/pyside-tools-0.2.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3b995b6a8d593b16674fb7574aa461fc
diff --git a/metadata/md5-cache/dev-python/pyside-tools-0.2.14 b/metadata/md5-cache/dev-python/pyside-tools-0.2.14
index b6e8a6084326..4eebefd5cff4 100644
--- a/metadata/md5-cache/dev-python/pyside-tools-0.2.14
+++ b/metadata/md5-cache/dev-python/pyside-tools-0.2.14
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.pyside.org/files/pyside-tools-0.2.14.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f025f40d099c1accb949640ff930ead0
diff --git a/metadata/md5-cache/dev-python/pyusb-0.4.2 b/metadata/md5-cache/dev-python/pyusb-0.4.2
index 8afa565859e2..30ec398d8e14 100644
--- a/metadata/md5-cache/dev-python/pyusb-0.4.2
+++ b/metadata/md5-cache/dev-python/pyusb-0.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:0 dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/pyusb/pyusb-0.4.2.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=301d89487b222e52da17d9fb8e74af25
diff --git a/metadata/md5-cache/dev-python/pyusb-0.4.3 b/metadata/md5-cache/dev-python/pyusb-0.4.3
index 215a7b0bbc39..beba260cb834 100644
--- a/metadata/md5-cache/dev-python/pyusb-0.4.3
+++ b/metadata/md5-cache/dev-python/pyusb-0.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:0 dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/pyusb/pyusb-0.4.3.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eff452d6814c8be932279aae0c74d506
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.20_rc1_p20120624 b/metadata/md5-cache/dev-python/pyxdg-0.20_rc1_p20120624
new file mode 100644
index 000000000000..d4c88504c553
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyxdg-0.20_rc1_p20120624
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=A Python module to deal with freedesktop.org specifications
+EAPI=4
+HOMEPAGE=http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~ssuominen/pyxdg-0.20_rc1_p20120624.tar.xz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=be6af72917a37b4c5f6999eefbabd2bb
diff --git a/metadata/md5-cache/dev-python/shiboken-1.1.1 b/metadata/md5-cache/dev-python/shiboken-1.1.1
index 33b32b5b3d3d..63634540b480 100644
--- a/metadata/md5-cache/dev-python/shiboken-1.1.1
+++ b/metadata/md5-cache/dev-python/shiboken-1.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 !dev-python/apiextractor !dev-python/generatorrunner || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.pyside.org/files/shiboken-1.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d056e765d3d913a481de739d5449f9b
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.8 b/metadata/md5-cache/dev-python/subunit-0.0.8
index 27369a901bdb..7491d59fd449 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.8
+++ b/metadata/md5-cache/dev-python/subunit-0.0.8
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/testtools-0.9.15
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.8/+download/subunit-0.0.8.tar.gz http://dev.gentoo.org/~floppym/distfiles/subunit-0.0.8-missing.tar.gz
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=3bfb545b0a8898981c442d5b93e4477d
+_md5_=3273f8b43e62072d8d670190679ad54e
diff --git a/metadata/md5-cache/dev-python/visual-5.4 b/metadata/md5-cache/dev-python/visual-5.4
index bc54096d1aef..99b2ecfdbaa1 100644
--- a/metadata/md5-cache/dev-python/visual-5.4
+++ b/metadata/md5-cache/dev-python/visual-5.4
@@ -9,5 +9,5 @@ LICENSE=visual
 RDEPEND=<dev-libs/boost-1.48[python] dev-cpp/libglademm >=dev-cpp/gtkglextmm-1.2 dev-python/numpy =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.vpython.org/contents/download/visual-5.4_release.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0da1eea383836ed4ddbc9a81a8841d12
diff --git a/metadata/md5-cache/dev-python/visual-5.72-r2 b/metadata/md5-cache/dev-python/visual-5.72-r2
index ba5ff429db02..4c72484a045e 100644
--- a/metadata/md5-cache/dev-python/visual-5.72-r2
+++ b/metadata/md5-cache/dev-python/visual-5.72-r2
@@ -9,5 +9,5 @@ LICENSE=visual
 RDEPEND=>=dev-cpp/gtkglextmm-1.2 dev-cpp/libglademm >=dev-libs/boost-1.48[python] dev-python/numpy dev-python/polygon:2 dev-python/ttfquery
 SLOT=0
 SRC_URI=http://www.vpython.org/contents/download/visual-5.72_release.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48b6e4aa259336ab178e3bd3bdb4bf53
diff --git a/metadata/md5-cache/dev-python/visual-5.74 b/metadata/md5-cache/dev-python/visual-5.74
index 0267a669025f..af6d7c4cf089 100644
--- a/metadata/md5-cache/dev-python/visual-5.74
+++ b/metadata/md5-cache/dev-python/visual-5.74
@@ -9,5 +9,5 @@ LICENSE=visual
 RDEPEND=>=dev-cpp/gtkglextmm-1.2 dev-cpp/libglademm >=dev-libs/boost-1.48[python] dev-python/numpy dev-python/polygon:2 dev-python/ttfquery
 SLOT=0
 SRC_URI=http://www.vpython.org/contents/download/visual-5.74_release.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68077daf0605fa04978d86f7280ef199
diff --git a/metadata/md5-cache/dev-python/wxpython-2.8.11.0 b/metadata/md5-cache/dev-python/wxpython-2.8.11.0
index 09406710d0cf..d5924ef59c68 100644
--- a/metadata/md5-cache/dev-python/wxpython-2.8.11.0
+++ b/metadata/md5-cache/dev-python/wxpython-2.8.11.0
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3
 RDEPEND=dev-python/setuptools >=x11-libs/wxGTK-2.8.11.0:2.8[opengl?,tiff,X] >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2 dev-libs/glib:2 media-libs/libpng virtual/jpeg media-libs/tiff cairo? ( >=dev-python/pycairo-1.8.4 ) opengl? ( >=dev-python/pyopengl-2.0.0.44 ) =dev-lang/python-2*
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.11.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.8.11.0.tar.bz2 mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.8.11.0.tar.bz2 )
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=c79cc2f3a81b427df1eacbfc79e1c1e4
diff --git a/metadata/md5-cache/dev-python/wxpython-2.8.12.0 b/metadata/md5-cache/dev-python/wxpython-2.8.12.0
index 99187b3d1c35..4d6cd370b001 100644
--- a/metadata/md5-cache/dev-python/wxpython-2.8.12.0
+++ b/metadata/md5-cache/dev-python/wxpython-2.8.12.0
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3
 RDEPEND=dev-python/setuptools >=x11-libs/wxGTK-2.8.12.0:2.8[opengl?,tiff,X] >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2 dev-libs/glib:2 media-libs/libpng virtual/jpeg media-libs/tiff cairo? ( >=dev-python/pycairo-1.8.4 ) opengl? ( >=dev-python/pyopengl-2.0.0.44 ) =dev-lang/python-2*
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.8.12.0.tar.bz2 mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.8.12.0.tar.bz2 )
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=9cfd77f8772efb6f020d74d2bec9d3f4
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
index d470305659ea..1a58ebdf6098 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=as-is
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d51e999fa6e670a0985cb3f88e794034
+_md5_=8667b93591b5e053686824d46035a13b
diff --git a/metadata/md5-cache/dev-ruby/rqr-0.2.2 b/metadata/md5-cache/dev-ruby/rqr-0.2.2
index c2038baaca3c..570779932554 100644
--- a/metadata/md5-cache/dev-ruby/rqr-0.2.2
+++ b/metadata/md5-cache/dev-ruby/rqr-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tif
 REQUIRED_USE=test? ( jpeg png tiff ) || ( ruby_targets_ruby18 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqr-0.2.2.gem
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20e87abb1425026c8bad8b3b7ac1d762
diff --git a/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3 b/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
index fc5b65f11159..568941074dd8 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
+++ b/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boehm-gc-7.1[threads?] emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) java? ( >=virtual/jdk-1.5 app-arch/zip ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/members/Cyprien.Nicolas/mirror/bigloo-3.4a-patchset-1.tbz2 ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo3.4a-3.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5eb11f0aefb7e9fcb2c12d9474980df8
diff --git a/metadata/md5-cache/dev-scheme/bigloo-3.6a b/metadata/md5-cache/dev-scheme/bigloo-3.6a
index 1221b47e9b31..ab423a89ea32 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-3.6a
+++ b/metadata/md5-cache/dev-scheme/bigloo-3.6a
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boehm-gc-7.1[threads?] emacs? ( virtual/emacs ) gmp? ( dev-li
 REQUIRED_USE=bglpkg? ( web ) openpgp? ( crypto ) packrat? ( srfi1 ) srfi27? ( x86? ( gmp ) )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo3.6a.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62702a0da3b418fe44d84c936001fe5e
diff --git a/metadata/md5-cache/dev-scheme/gauche-gtk-0.4.1 b/metadata/md5-cache/dev-scheme/gauche-gtk-0.4.1
index 8871ff123e5e..2c37e29059db 100644
--- a/metadata/md5-cache/dev-scheme/gauche-gtk-0.4.1
+++ b/metadata/md5-cache/dev-scheme/gauche-gtk-0.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/gtk+:2 >=dev-scheme/gauche-0.7.4.1 opengl? ( >=x11-libs/gtkglext-0.6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gauche/Gauche-gtk-0.4.1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a7db439d3ddf8eb1d02670cd9bc4696
diff --git a/metadata/md5-cache/dev-scheme/guile-1.6.8 b/metadata/md5-cache/dev-scheme/guile-1.6.8
index 9af53a137846..b4752547cc63 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.6.8
+++ b/metadata/md5-cache/dev-scheme/guile-1.6.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.6.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6979964d43b20929950c9b63e9edbfdb
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.4 b/metadata/md5-cache/dev-scheme/guile-1.8.4
index 2f8e666500fa..31410cb28f60 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.4
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94e72ae35d180e67f4fd2a7865b840b9
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.4-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.4-r1
index 6c3c952fc754..8498a8bc8823 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.4-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8172deb8a326226109998bc77900c1bc
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.5 b/metadata/md5-cache/dev-scheme/guile-1.8.5
index 9cdcec35c2bf..063d2bae1f08 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.5
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e8bffd33385095d049a298992169989
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.5-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.5-r1
index 0745427c3994..b7edf411cef0 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.5-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46f7d2826ddb71e46da9c610ac67b76c
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.6 b/metadata/md5-cache/dev-scheme/guile-1.8.6
index 05e4c50989a4..0f6c9908cc93 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.6
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.6.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6880bec1d4296f2adb07bf51d4d49e42
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.7 b/metadata/md5-cache/dev-scheme/guile-1.8.7
index e51bb411d7eb..655c91915157 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.7
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c5f395ddb95cd741d7384abb0c1659b
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.7-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.7-r1
index e9114a6f200d..e75f2e593ab4 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.7-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27c58081d8bcf90fb1ecfd2aac86aa64
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.7-r2 b/metadata/md5-cache/dev-scheme/guile-1.8.7-r2
index c2a8d7cfd4f3..8bc666f0288d 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.7-r2
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.7-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74266cbf19c4ad086d733710bfbc8e65
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8 b/metadata/md5-cache/dev-scheme/guile-1.8.8
index 49e5e1946bf6..0d9e59ef0d04 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=703eee2ce67f0b573d68464fcfdd0f12
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
index 37a783e825d8..01db73dadfbf 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? (
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d5f913c0f0a85cd109106f58f65a102
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.0 b/metadata/md5-cache/dev-scheme/guile-2.0.0
index ca3f39df8f87..19adef749a9a 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.0
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/gmp >=sys-devel/libtool-1.5.6 sys-devel/gettext virtual/pkgconfig dev-libs/libunistring >=dev-libs/boehm-gc-7.0[threads?] virtual/libffi emacs? ( virtual/emacs )
 SLOT=2
 SRC_URI=mirror://gnu/guile/guile-2.0.0.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb1ee7743aa39db6d08243863c90ee4d
diff --git a/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870 b/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
index 0fdfd38eea8a..d5c7eb36eb81 100644
--- a/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
+++ b/metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-4.2.2
 SLOT=0
 SRC_URI=http://ikarus-scheme.org/ikarus.dev/ikarus-scheme-r1870.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe6a4ca13dc5da7fed33c6cd478ce177
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.8-r1 b/metadata/md5-cache/dev-scheme/scheme48-1.8-r1
index a73231d011b6..239d7a63b62f 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.8-r1
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.8-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.s48.org/1.8/scheme48-1.8.tgz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d612c29d40c95a35bd1c80519cb231b1
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.8-r2 b/metadata/md5-cache/dev-scheme/scheme48-1.8-r2
index dbb7d73ecb54..04affd7e0f36 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.8-r2
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.8-r2
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.s48.org/1.8/scheme48-1.8.tgz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18606657ece44dcc3de1914551f17670
diff --git a/metadata/md5-cache/dev-scheme/scm-5.5.6 b/metadata/md5-cache/dev-scheme/scm-5.5.6
index b0e50d6a6b52..76fe12141672 100644
--- a/metadata/md5-cache/dev-scheme/scm-5.5.6
+++ b/metadata/md5-cache/dev-scheme/scm-5.5.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=app-arch/unzip >=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/libtermcap-compat )
 SLOT=0
 SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19cd20f31c17173b1e5f49ff0f161b14
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1 b/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1
index 72705d32999c..979ce4fcc070 100644
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1
+++ b/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme1.39.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93d9097b7ffd8182ff730a2079cb0c85
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.40 b/metadata/md5-cache/dev-scheme/tinyscheme-1.40
index 54c6644529cb..39d0353fe532 100644
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.40
+++ b/metadata/md5-cache/dev-scheme/tinyscheme-1.40
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme-1.40.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05796c1dd8ddab44baab5a5407196050
diff --git a/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3 b/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
index 2602cf7b15d3..f34c33502bda 100644
--- a/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
+++ b/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://ypsilon.googlecode.com/files/ypsilon-0.9.6.update3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6365bdc28b612a378263c0ddc244b67
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.4z-r10 b/metadata/md5-cache/dev-tcltk/blt-2.4z-r10
index 125d6f151b8c..46e093fc1949 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.4z-r10
+++ b/metadata/md5-cache/dev-tcltk/blt-2.4z-r10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fe507e97ad39992c3285ba161faa090
diff --git a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0 b/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
index af0f4320e4d3..8cd80d8f0394 100644
--- a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
+++ b/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/opengl dev-lang/tk dev-lang/tcl media-libs/libsdl media-libs/ftgl dev-games/ode
 SLOT=0
 SRC_URI=http://www.tcl3d.org/download/tcl3d-0.4.0.distrib/tcl3d-src-0.4.0.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7f1947fdd97079c1c6484f78bac080b
diff --git a/metadata/md5-cache/dev-tcltk/tclperl-3.2 b/metadata/md5-cache/dev-tcltk/tclperl-3.2
index 3948ee83aaad..8c5d874d549e 100644
--- a/metadata/md5-cache/dev-tcltk/tclperl-3.2
+++ b/metadata/md5-cache/dev-tcltk/tclperl-3.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/tcl-8.3.3 >=dev-lang/perl-5.6.0
 SLOT=0
 SRC_URI=http://jfontain.free.fr/tclperl-3.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b16b3da111c4597728dd629aad0cf87d
diff --git a/metadata/md5-cache/dev-tcltk/tclx-8.3.5 b/metadata/md5-cache/dev-tcltk/tclx-8.3.5
index 4082b883ee7d..16c7ab9500b7 100644
--- a/metadata/md5-cache/dev-tcltk/tclx-8.3.5
+++ b/metadata/md5-cache/dev-tcltk/tclx-8.3.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.6 X? ( >=dev-lang/tk-8.4.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tclx/tclx8.3.5-src.tar.gz ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl8.4.6-src.tar.gz ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tk8.4.6-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02161107b2e482f79f97d1414093c1a5
diff --git a/metadata/md5-cache/dev-util/anjuta-2.32.1.1 b/metadata/md5-cache/dev-util/anjuta-2.32.1.1
index d086c7b158c5..ea6faf9ed546 100644
--- a/metadata/md5-cache/dev-util/anjuta-2.32.1.1
+++ b/metadata/md5-cache/dev-util/anjuta-2.32.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.25.15:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/dbus-glib-0.70 >=gnome-base/gconf-2.12:2 >=x11-libs/vte-0.13.1:0 >=dev-libs/libxml2-2.4.23:2 >=dev-libs/gdl-2.27.1:1 >=dev-libs/libunique-1:1 dev-libs/libxslt >=dev-lang/perl-5 dev-perl/Locale-gettext sys-devel/autogen >=gnome-extra/libgda-4.1.6:4 dev-util/ctags x11-libs/libXft x11-libs/libXrender devhelp? ( >=dev-util/devhelp-0.22 net-libs/webkit-gtk:2 ) glade? ( >=dev-util/glade-3.6.7:3 ) graphviz? ( >=media-gfx/graphviz-2.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.6 ) subversion? ( >=dev-vcs/subversion-1.5.0 >=net-libs/neon-0.28.2 >=dev-libs/apr-1 >=dev-libs/apr-util-1 ) sourceview? ( >=x11-libs/gtksourceview-2.9.7:2.0 ) vala? ( >=dev-lang/vala-0.9.5:0.10 ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/2.32/anjuta-2.32.1.1.tar.bz2 mirror://gentoo/introspection.m4.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ac6f1b303cc84f82a309ae43e4b0063
diff --git a/metadata/md5-cache/dev-util/anjuta-3.2.2 b/metadata/md5-cache/dev-util/anjuta-3.2.2
index b598b3cb502c..539237662fe9 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.2.2
+++ b/metadata/md5-cache/dev-util/anjuta-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.29.2:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0.0:3 >
 REQUIRED_USE=test? ( !doc )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.2/anjuta-3.2.2.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13595086c9167a6a4a5da37178a5c9a4
diff --git a/metadata/md5-cache/dev-util/anjuta-3.4.1 b/metadata/md5-cache/dev-util/anjuta-3.4.1
index b6f71f6fec19..265f8791a526 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.4.1
+++ b/metadata/md5-cache/dev-util/anjuta-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.29.2:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0.0:3 >
 REQUIRED_USE=test? ( !doc )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.4/anjuta-3.4.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0ce448c33d45917e57c042c752d67ff
diff --git a/metadata/md5-cache/dev-util/anjuta-3.4.3 b/metadata/md5-cache/dev-util/anjuta-3.4.3
index 3d37f186af60..049a3f2a8c15 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.4.3
+++ b/metadata/md5-cache/dev-util/anjuta-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.29.2:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0.0:3 >
 REQUIRED_USE=test? ( !doc )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.4/anjuta-3.4.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a50b107b77f6679b40079c95cba1c5e
diff --git a/metadata/md5-cache/dev-util/apitrace-2.0-r1 b/metadata/md5-cache/dev-util/apitrace-2.0-r1
index 5a4272bf2b03..75852ddce60e 100644
--- a/metadata/md5-cache/dev-util/apitrace-2.0-r1
+++ b/metadata/md5-cache/dev-util/apitrace-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-arch/snappy media-libs/libpng sys-libs/zlib virtual/opengl x11-libs/libX11 multilib? ( app-emulation/emul-linux-x86-baselibs ) qt4? ( >=x11-libs/qt-core-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-webkit-4.7:4 >=dev-libs/qjson-0.5 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/tarball/2.0 -> apitrace-2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=234aca2769f27ac5b8724a295a1bd87b
diff --git a/metadata/md5-cache/dev-util/apitrace-3.0-r1 b/metadata/md5-cache/dev-util/apitrace-3.0-r1
index f6c7770e5809..e1596b99555f 100644
--- a/metadata/md5-cache/dev-util/apitrace-3.0-r1
+++ b/metadata/md5-cache/dev-util/apitrace-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-arch/snappy media-libs/libpng sys-libs/zlib media-libs/mesa[egl?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) x11-libs/libX11 multilib? ( app-emulation/emul-linux-x86-baselibs ) qt4? ( >=x11-libs/qt-core-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-webkit-4.7:4 >=dev-libs/qjson-0.5 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/tarball/3.0 -> apitrace-3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ecba38aa92bb19109d5a938e81f2a7a
diff --git a/metadata/md5-cache/dev-util/automoc-0.9.88 b/metadata/md5-cache/dev-util/automoc-0.9.88
index befc0d82da7e..49cd083776d4 100644
--- a/metadata/md5-cache/dev-util/automoc-0.9.88
+++ b/metadata/md5-cache/dev-util/automoc-0.9.88
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/qt-core:4
 SLOT=0
 SRC_URI=mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2086d5c001a789a8602380f65020d7ae
diff --git a/metadata/md5-cache/dev-util/biew-5.6.2 b/metadata/md5-cache/dev-util/biew-5.6.2
index e773f5969414..9f4ac2fcf4c6 100644
--- a/metadata/md5-cache/dev-util/biew-5.6.2
+++ b/metadata/md5-cache/dev-util/biew-5.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.3 ) slang? ( >=sys-libs/slang-1.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/biew/biew562.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18c55c20628b89931040ee1974969b45
diff --git a/metadata/md5-cache/dev-util/biew-6.1.0-r2 b/metadata/md5-cache/dev-util/biew-6.1.0-r2
index 62940ac5c85b..608ccd0f9787 100644
--- a/metadata/md5-cache/dev-util/biew-6.1.0-r2
+++ b/metadata/md5-cache/dev-util/biew-6.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=gpm? ( sys-libs/gpm )
 REQUIRED_USE=mmx sse
 SLOT=0
 SRC_URI=mirror://sourceforge/beye/6.1.0/biew-610-src.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4372524345f943ef8521104bf2c55e6e
diff --git a/metadata/md5-cache/dev-util/boost-build-1.34.1 b/metadata/md5-cache/dev-util/boost-build-1.34.1
index 40e31e81447e..a5d753e42c9f 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.34.1
+++ b/metadata/md5-cache/dev-util/boost-build-1.34.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/boost/boost_1_34_1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d10d5f561ddd9910406489351efbe594
diff --git a/metadata/md5-cache/dev-util/boost-build-1.35.0-r1 b/metadata/md5-cache/dev-util/boost-build-1.35.0-r1
index 035e4f9150c9..2c1e6ae53192 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.35.0-r1
+++ b/metadata/md5-cache/dev-util/boost-build-1.35.0-r1
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=!<dev-libs/boost-1.34.0 python? ( dev-lang/python )
 SLOT=0
 SRC_URI=mirror://sourceforge/boost/boost_1_35_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=23f24d3a5e9c917d140ce28756986924
diff --git a/metadata/md5-cache/dev-util/boost-build-1.35.0-r2 b/metadata/md5-cache/dev-util/boost-build-1.35.0-r2
index 187112460c35..60f831261d8e 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.35.0-r2
+++ b/metadata/md5-cache/dev-util/boost-build-1.35.0-r2
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=!<dev-libs/boost-1.34.0 python? ( dev-lang/python )
 SLOT=0
 SRC_URI=mirror://sourceforge/boost/boost_1_35_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f49eac80597171188c30b3062eb4514a
diff --git a/metadata/md5-cache/dev-util/boost-build-1.37.0 b/metadata/md5-cache/dev-util/boost-build-1.37.0
index 7d4cd64fc5fa..84762aeba861 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.37.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.37.0
@@ -9,5 +9,5 @@ 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.37
 SRC_URI=mirror://sourceforge/boost/boost_1_37_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db081a5b041ce0b8a3c6c0359e6f436e
diff --git a/metadata/md5-cache/dev-util/boost-build-1.39.0 b/metadata/md5-cache/dev-util/boost-build-1.39.0
index dafc2c325eac..de4bed97369b 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.39.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.39.0
@@ -9,5 +9,5 @@ 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.39
 SRC_URI=mirror://sourceforge/boost/boost_1_39_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=424ed4016803d83b372d88ef01d263ed
diff --git a/metadata/md5-cache/dev-util/boost-build-1.40.0 b/metadata/md5-cache/dev-util/boost-build-1.40.0
index 9c5d56b64ac6..4b4c433776f2 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.40.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.40.0
@@ -9,5 +9,5 @@ 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.40
 SRC_URI=mirror://sourceforge/boost/boost_1_40_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38987cf23369c1b4cc2274e790178b81
diff --git a/metadata/md5-cache/dev-util/boost-build-1.41.0 b/metadata/md5-cache/dev-util/boost-build-1.41.0
index 950f85e2d36a..da3d5d54eb23 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.41.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.41.0
@@ -9,5 +9,5 @@ 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.41
 SRC_URI=mirror://sourceforge/boost/boost_1_41_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df690bf773d6fe87ad66ac439f1cd924
diff --git a/metadata/md5-cache/dev-util/boost-build-1.42.0 b/metadata/md5-cache/dev-util/boost-build-1.42.0
index 0fbdeaa93c12..20899141075c 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.42.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.42.0
@@ -9,5 +9,5 @@ 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.42
 SRC_URI=mirror://sourceforge/boost/boost_1_42_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a3e60217a2f2572ddf24c0d16704a40
diff --git a/metadata/md5-cache/dev-util/boost-build-1.45.0 b/metadata/md5-cache/dev-util/boost-build-1.45.0
index be57fe738499..fe02460275fd 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.45.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.45.0
@@ -9,5 +9,5 @@ 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.45
 SRC_URI=mirror://sourceforge/boost/boost_1_45_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db7b334605bb1783ab5d0debcd945c0d
diff --git a/metadata/md5-cache/dev-util/boost-build-1.46.1 b/metadata/md5-cache/dev-util/boost-build-1.46.1
index 1ec2519f2542..dedc03bcd851 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.46.1
+++ b/metadata/md5-cache/dev-util/boost-build-1.46.1
@@ -9,5 +9,5 @@ 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.46
 SRC_URI=mirror://sourceforge/boost/boost_1_46_1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=affaa897765527b568b5c608b5b81386
diff --git a/metadata/md5-cache/dev-util/boost-build-1.47.0 b/metadata/md5-cache/dev-util/boost-build-1.47.0
index 10fd16c4c793..58e70171f18d 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.47.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.47.0
@@ -9,5 +9,5 @@ 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.47
 SRC_URI=mirror://sourceforge/boost/boost_1_47_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e33d04568c2243ba3ff064cd8f68792
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 608a68448cb5..f37a1ea21a38 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
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73dc1abe11afc99dce2f0c4dfd0ca770
diff --git a/metadata/md5-cache/dev-util/boost-build-1.49.0 b/metadata/md5-cache/dev-util/boost-build-1.49.0
index 872ce8aaeb98..b013798f0450 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.49.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.49.0
@@ -9,5 +9,5 @@ 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.49
 SRC_URI=mirror://sourceforge/boost/boost_1_49_0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b42b369f0c0a28e58f120bdd93f9f226
diff --git a/metadata/md5-cache/dev-util/bsdiff-4.3-r1 b/metadata/md5-cache/dev-util/bsdiff-4.3-r1
index 0f88f85c0b2b..c5c3633fb136 100644
--- a/metadata/md5-cache/dev-util/bsdiff-4.3-r1
+++ b/metadata/md5-cache/dev-util/bsdiff-4.3-r1
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecf9ccceced37ffb5f0f2ee129d46575
diff --git a/metadata/md5-cache/dev-util/bsdiff-4.3-r2 b/metadata/md5-cache/dev-util/bsdiff-4.3-r2
index 7446d9c362c7..63f690a6ff9f 100644
--- a/metadata/md5-cache/dev-util/bsdiff-4.3-r2
+++ b/metadata/md5-cache/dev-util/bsdiff-4.3-r2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce9d7095a5fe3bb73b0d4a04c62b5f37
diff --git a/metadata/md5-cache/dev-util/ccache-3.1.7 b/metadata/md5-cache/dev-util/ccache-3.1.7
index b13680a4ce3e..0c8b37c41e0d 100644
--- a/metadata/md5-cache/dev-util/ccache-3.1.7
+++ b/metadata/md5-cache/dev-util/ccache-3.1.7
@@ -1,11 +1,12 @@
-DEFINED_PHASES=install postinst unpack
+DEFINED_PHASES=install postinst prepare
 DEPEND=sys-libs/zlib
 DESCRIPTION=fast compiler cache
+EAPI=4
 HOMEPAGE=http://ccache.samba.org/
 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	e575dd4d4682fc3539829c52d8382856
-_md5_=ef30ebfeff4e90d4b14fb7acf68e1dc8
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=001c80acd55847f6251717c109288159
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.6-r4 b/metadata/md5-cache/dev-util/cmake-2.8.6-r4
index fdb147890c22..f1bc3ff0d55b 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.6-r4
+++ b/metadata/md5-cache/dev-util/cmake-2.8.6-r4
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8379c68ef7391910ceb222940007dca5
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.7-r4 b/metadata/md5-cache/dev-util/cmake-2.8.7-r4
index be152c6ade77..7c422084fd4e 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.7-r4
+++ b/metadata/md5-cache/dev-util/cmake-2.8.7-r4
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6cac16ef352ca4364ea230ecd0519020
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.7-r5 b/metadata/md5-cache/dev-util/cmake-2.8.7-r5
index ca6ac8213ef0..62334484cfc7 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.7-r5
+++ b/metadata/md5-cache/dev-util/cmake-2.8.7-r5
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6752edd7ac558f3a34dd396a2abc8654
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.8-r2 b/metadata/md5-cache/dev-util/cmake-2.8.8-r2
index 12b4cbb93178..35d163bb4f09 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.8-r2
+++ b/metadata/md5-cache/dev-util/cmake-2.8.8-r2
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=069b330deb663101ed6a3e05df5ed5b3
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.8-r3 b/metadata/md5-cache/dev-util/cmake-2.8.8-r3
index 996076ba68ab..64fb90030bd8 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.8-r3
+++ b/metadata/md5-cache/dev-util/cmake-2.8.8-r3
@@ -9,5 +9,5 @@ LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1c845565991ea470bd2fa0d3fdd68cae
diff --git a/metadata/md5-cache/dev-util/cmake-fedora-0.8.1 b/metadata/md5-cache/dev-util/cmake-fedora-0.8.1
index d6ae0bee5509..fbf253b594b0 100644
--- a/metadata/md5-cache/dev-util/cmake-fedora-0.8.1
+++ b/metadata/md5-cache/dev-util/cmake-fedora-0.8.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-0.8.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3acedbf1d0e768f6902a3a642347dbf
diff --git a/metadata/md5-cache/dev-util/codeblocks-10.05 b/metadata/md5-cache/dev-util/codeblocks-10.05
index a474af81b103..139a3b9cb182 100644
--- a/metadata/md5-cache/dev-util/codeblocks-10.05
+++ b/metadata/md5-cache/dev-util/codeblocks-10.05
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://berlios/codeblocks/codeblocks-10.05-src.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=ba683c97900aa94ef9f11b33f48c67e0
diff --git a/metadata/md5-cache/dev-util/codeblocks-9999 b/metadata/md5-cache/dev-util/codeblocks-9999
index cb4d2caa0b4a..38ee79f05e9f 100644
--- a/metadata/md5-cache/dev-util/codeblocks-9999
+++ b/metadata/md5-cache/dev-util/codeblocks-9999
@@ -7,5 +7,5 @@ IUSE=contrib debug pch static-libs
 LICENSE=GPL-3
 RDEPEND=x11-libs/wxGTK:2.8[X]
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=60774245ebbd97ec06edfe477b2ec162
diff --git a/metadata/md5-cache/dev-util/duma-2.5.13 b/metadata/md5-cache/dev-util/duma-2.5.13
index dfc17039d247..4cda486073e6 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.13
+++ b/metadata/md5-cache/dev-util/duma-2.5.13
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1f4f4521bbda947fd87584a9edc2067
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r1 b/metadata/md5-cache/dev-util/duma-2.5.15-r1
index 414aa9f04677..cf55f59cfddc 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r1
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b6c830b23bb52cbc02ad05bc7842bef
diff --git a/metadata/md5-cache/dev-util/dwarves-1.8 b/metadata/md5-cache/dev-util/dwarves-1.8
index bd96aba2a719..43fd22dd1de1 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.8
+++ b/metadata/md5-cache/dev-util/dwarves-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.131 sys-libs/zlib
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be55a2af0bc48befbfb03e7ca455139a
diff --git a/metadata/md5-cache/dev-util/dwarves-1.9 b/metadata/md5-cache/dev-util/dwarves-1.9
index 1eb150b812c2..dc5746cae2c5 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.9
+++ b/metadata/md5-cache/dev-util/dwarves-1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.131 sys-libs/zlib
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82f78194627b78320d73dc2b1ec7de3e
diff --git a/metadata/md5-cache/dev-util/dwarves-9999 b/metadata/md5-cache/dev-util/dwarves-9999
index 527bf9901c98..56c06d0b9735 100644
--- a/metadata/md5-cache/dev-util/dwarves-9999
+++ b/metadata/md5-cache/dev-util/dwarves-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.131 sys-libs/zlib
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a854b750bf756d36db0ca20d0110cf58
diff --git a/metadata/md5-cache/dev-util/gdbserver-7.0 b/metadata/md5-cache/dev-util/gdbserver-7.0
index 0c89804abaa0..67941e5e6567 100644
--- a/metadata/md5-cache/dev-util/gdbserver-7.0
+++ b/metadata/md5-cache/dev-util/gdbserver-7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!>=sys-devel/gdb-7.2
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.0.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.tar.bz2 !vanilla? ( mirror://gentoo/gdb-7.0-patches-1.tar.lzma )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84391e9aebb1f283c41cb086267cc985
diff --git a/metadata/md5-cache/dev-util/gdbserver-7.2 b/metadata/md5-cache/dev-util/gdbserver-7.2
index 89ed5a692a30..1273cdd0343c 100644
--- a/metadata/md5-cache/dev-util/gdbserver-7.2
+++ b/metadata/md5-cache/dev-util/gdbserver-7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!>=sys-devel/gdb-7.2
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 !vanilla? ( mirror://gentoo/gdb-7.2-patches-1.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29e6a6839b9aefa02f70eb58fe8500bd
diff --git a/metadata/md5-cache/dev-util/gdbserver-7.3.1 b/metadata/md5-cache/dev-util/gdbserver-7.3.1
index 8d8190569dc5..1e00a0263e21 100644
--- a/metadata/md5-cache/dev-util/gdbserver-7.3.1
+++ b/metadata/md5-cache/dev-util/gdbserver-7.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!>=sys-devel/gdb-7.2
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 !vanilla? ( mirror://gentoo/gdb-7.3.1-patches-1.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e03757fc6f22bac9bb9058b7b140f0af
diff --git a/metadata/md5-cache/dev-util/google-perftools-1.6 b/metadata/md5-cache/dev-util/google-perftools-1.6
index d36134c685f2..0a652141c9ba 100644
--- a/metadata/md5-cache/dev-util/google-perftools-1.6
+++ b/metadata/md5-cache/dev-util/google-perftools-1.6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libunwind
 RESTRICT=test
 SLOT=0
 SRC_URI=http://google-perftools.googlecode.com/files/google-perftools-1.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1db325c8e8d5c502a9e4648478fff358
diff --git a/metadata/md5-cache/dev-util/google-perftools-1.7 b/metadata/md5-cache/dev-util/google-perftools-1.7
index e456f4526bc2..930e6c10ba7d 100644
--- a/metadata/md5-cache/dev-util/google-perftools-1.7
+++ b/metadata/md5-cache/dev-util/google-perftools-1.7
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libunwind
 RESTRICT=test
 SLOT=0
 SRC_URI=http://google-perftools.googlecode.com/files/google-perftools-1.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a82a81253a8b0757b4bbc55484504f4e
diff --git a/metadata/md5-cache/dev-util/google-perftools-1.8.3 b/metadata/md5-cache/dev-util/google-perftools-1.8.3
index 0d07e7a79b89..ae3fa3cf9d24 100644
--- a/metadata/md5-cache/dev-util/google-perftools-1.8.3
+++ b/metadata/md5-cache/dev-util/google-perftools-1.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, multi-threaded malloc() and nifty performance analysis tools
 EAPI=4
 HOMEPAGE=http://code.google.com/p/google-perftools/
 IUSE=largepages +debug minimal
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 RESTRICT=test
 SLOT=0
 SRC_URI=http://google-perftools.googlecode.com/files/google-perftools-1.8.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8100a687a2dd8f7e14eafc18b437fc5
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ac6d3547adf273c827ac154da0d09cc6
diff --git a/metadata/md5-cache/dev-util/google-perftools-1.9 b/metadata/md5-cache/dev-util/google-perftools-1.9
index cbfa910b7803..3bd63dc0f6c3 100644
--- a/metadata/md5-cache/dev-util/google-perftools-1.9
+++ b/metadata/md5-cache/dev-util/google-perftools-1.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 SLOT=0
 SRC_URI=http://google-perftools.googlecode.com/files/google-perftools-1.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7343b76d03d6f02320b8ff0b6df62f9c
diff --git a/metadata/md5-cache/dev-util/gource-0.38 b/metadata/md5-cache/dev-util/gource-0.38
index 2cea7a2c2954..299939844434 100644
--- a/metadata/md5-cache/dev-util/gource-0.38
+++ b/metadata/md5-cache/dev-util/gource-0.38
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libsdl-1.2.10[video,opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml >=dev-libs/boost-1.46
 SLOT=0
 SRC_URI=http://gource.googlecode.com/files/gource-0.38.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a6acc23f40481137e12630ba1f141e4
diff --git a/metadata/md5-cache/dev-util/insight-6.7.1-r1 b/metadata/md5-cache/dev-util/insight-6.7.1-r1
index b69518a88d72..5ee4e41a7ec7 100644
--- a/metadata/md5-cache/dev-util/insight-6.7.1-r1
+++ b/metadata/md5-cache/dev-util/insight-6.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/insight/releases/insight-6.7.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=649efc50d5999d4af76beb03dc5799bf
diff --git a/metadata/md5-cache/dev-util/kdbg-2.5.1 b/metadata/md5-cache/dev-util/kdbg-2.5.1
index b541cb98d5f4..4ffdd83c1f13 100644
--- a/metadata/md5-cache/dev-util/kdbg-2.5.1
+++ b/metadata/md5-cache/dev-util/kdbg-2.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gdb >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kdbg/kdbg-2.5.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ec34e629356069661d710ee491add573
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.2.2 b/metadata/md5-cache/dev-util/kdevelop-4.2.2
index 2fe62ac6c52c..062bd2040c93 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.2.2
+++ b/metadata/md5-cache/dev-util/kdevelop-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/kdevplatform[subversion] >=kde-base/ksysguard-4.4:4[aqua=] >=kd
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.2.2/src/kdevelop-4.2.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e8d8427f788da06cbaf7ff4bbbc4b2ba
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1 b/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1
index 4f9c95fdbe04..e85ba0ff31db 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-4.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-4.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7471d146f093caadf8584cf8e1e6a4c0
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0
index 32b27d387416..eec6fc056070 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/1.0.0/src/kdevelop-pg-qt-1.0.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f72ba9cc2d2b7d01de9c67d315971437
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.3.1 b/metadata/md5-cache/dev-util/kdevelop-php-1.3.1
index 86cdfd66e455..20fd40fcf502 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.3.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-util/kdevelop doc? ( >=dev-util/kdevelop-php-docs-1.3.1:4 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.3.1
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-php-1.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2e7643f30fa041e47ed013481e0da1df
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1
index 57b0ac8f9a1c..b87de7c81ce6 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.3.1
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevelop-php-docs-1.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=634dbb05f995a722fe8fd146ee6897b4
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.2.2 b/metadata/md5-cache/dev-util/kdevplatform-1.2.2
index dc2ad4c685e0..96aa86dfcd47 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.2.2
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost reviewboard? ( dev-libs/qjson ) subversion? ( <dev-vcs/su
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.2.2/src/kdevplatform-1.2.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96b35e2291f01fa9ed7cebd9c4c4947e
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.3.1 b/metadata/md5-cache/dev-util/kdevplatform-1.3.1
index 476a8abc995e..ab482cc8b54d 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.3.1
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/boost !<dev-util/kdevelop-4.3.1:4 >=kde-base/konsole-4.7:4[aqua=] cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) reviewboard? ( dev-libs/qjson ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.3.1/src/kdevplatform-1.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ffb5a59aded95100865d9db03c1f1b5
diff --git a/metadata/md5-cache/dev-util/kelbt-0.15 b/metadata/md5-cache/dev-util/kelbt-0.15
index d2828ffd75a1..f12328d56e98 100644
--- a/metadata/md5-cache/dev-util/kelbt-0.15
+++ b/metadata/md5-cache/dev-util/kelbt-0.15
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.complang.org/kelbt/kelbt-0.15.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=85b5e64478242e1b015a6869873f03e9
+_md5_=823e8264e7cba8da7965dcd6a9d3920e
diff --git a/metadata/md5-cache/dev-util/min-cscope-16.1.0 b/metadata/md5-cache/dev-util/min-cscope-16.1.0
index c2e192e3cc0b..239fe26a9fc9 100644
--- a/metadata/md5-cache/dev-util/min-cscope-16.1.0
+++ b/metadata/md5-cache/dev-util/min-cscope-16.1.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/kscope/min-cscope-16.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3023c9135479b4d061edd5ba165a1fb
diff --git a/metadata/md5-cache/dev-util/mingw-runtime-3.16 b/metadata/md5-cache/dev-util/mingw-runtime-3.16
index feb684a14f49..dad107fecd13 100644
--- a/metadata/md5-cache/dev-util/mingw-runtime-3.16
+++ b/metadata/md5-cache/dev-util/mingw-runtime-3.16
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/mingwrt-3.16-mingw32-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d09b26b33d37925ebf62351f7c4a82f6
diff --git a/metadata/md5-cache/dev-util/mingw-runtime-3.18 b/metadata/md5-cache/dev-util/mingw-runtime-3.18
index 1ac7af94ad3c..476e912b25c8 100644
--- a/metadata/md5-cache/dev-util/mingw-runtime-3.18
+++ b/metadata/md5-cache/dev-util/mingw-runtime-3.18
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/mingwrt-3.18-mingw32-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f81f7a7c0ddb0bb425b09cba4cc62652
diff --git a/metadata/md5-cache/dev-util/mingw-runtime-3.20 b/metadata/md5-cache/dev-util/mingw-runtime-3.20
index 12192af69150..99e87a900277 100644
--- a/metadata/md5-cache/dev-util/mingw-runtime-3.20
+++ b/metadata/md5-cache/dev-util/mingw-runtime-3.20
@@ -6,5 +6,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/mingwrt-3.20-mingw32-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f857b0d8d6518f3618f8180fa8aa0b77
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-2.0.1 b/metadata/md5-cache/dev-util/mingw64-runtime-2.0.1
index 273a6da00f91..5b4cd40ce0f6 100644
--- a/metadata/md5-cache/dev-util/mingw64-runtime-2.0.1
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-2.0.1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64-v2.0.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f0746c05077771811647f9bf094c1ea
diff --git a/metadata/md5-cache/dev-util/mono-debugger-2.10 b/metadata/md5-cache/dev-util/mono-debugger-2.10
index f6ad518f3cb5..5a92f243d444 100644
--- a/metadata/md5-cache/dev-util/mono-debugger-2.10
+++ b/metadata/md5-cache/dev-util/mono-debugger-2.10
@@ -9,5 +9,5 @@ RDEPEND=!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 =dev-lang/mono-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono-debugger/mono-debugger-2.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	go-mono	062f25a198b23a53e074c32c867cc97e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73f4fa41818326fed410a7497731b670
diff --git a/metadata/md5-cache/dev-util/piklab-0.15.10 b/metadata/md5-cache/dev-util/piklab-0.15.10
index ec48edf6bde9..1f45a319fd17 100644
--- a/metadata/md5-cache/dev-util/piklab-0.15.10
+++ b/metadata/md5-cache/dev-util/piklab-0.15.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 sys-libs/ncurses sys-libs/readline virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/piklab/piklab-0.15.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21c13b49c2bcbec61b6a619cd0912f6c
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.26 b/metadata/md5-cache/dev-util/pkgconfig-0.26
index 9bd6b37e736a..985e1831fec6 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.26
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=dev-libs/popt-1.16 !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=baa09b708cb8b6211b9aedd538d2f335
diff --git a/metadata/md5-cache/dev-util/pkgconfig-9999 b/metadata/md5-cache/dev-util/pkgconfig-9999
index beea4df2d55c..044a7855431f 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-9999
+++ b/metadata/md5-cache/dev-util/pkgconfig-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD hardened internal-glib
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.28 ) >=dev-libs/popt-1.16 !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80fdd008a9d48d93d99592da0433722f
diff --git a/metadata/md5-cache/dev-util/qdevelop-0.28 b/metadata/md5-cache/dev-util/qdevelop-0.28
index 8b4dd011f83a..6889f9a86284 100644
--- a/metadata/md5-cache/dev-util/qdevelop-0.28
+++ b/metadata/md5-cache/dev-util/qdevelop-0.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite]
 SLOT=0
 SRC_URI=http://biord-software.org/downloads/qdevelop-v0.28.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3633c16c6a30d6750f5fe80b7fec771
diff --git a/metadata/md5-cache/dev-util/qt-creator-2.4.1 b/metadata/md5-cache/dev-util/qt-creator-2.4.1
index 7f116158df32..333f6570979e 100644
--- a/metadata/md5-cache/dev-util/qt-creator-2.4.1
+++ b/metadata/md5-cache/dev-util/qt-creator-2.4.1
@@ -10,5 +10,5 @@ PDEPEND=bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) g
 RDEPEND=>=x11-libs/qt-assistant-4.7.4:4[doc?] >=x11-libs/qt-core-4.7.4:4[private-headers(+)] >=x11-libs/qt-declarative-4.7.4:4[private-headers(+)] >=x11-libs/qt-gui-4.7.4:4[private-headers(+)] >=x11-libs/qt-script-4.7.4:4[private-headers(+)] >=x11-libs/qt-sql-4.7.4:4 >=x11-libs/qt-svg-4.7.4:4 debug? ( >=x11-libs/qt-test-4.7.4:4 ) !botan-bundled? ( =dev-libs/botan-1.8* ) sys-devel/gdb[python] examples? ( >=x11-libs/qt-demo-4.7.4:4 )
 SLOT=0
 SRC_URI=http://get.qt.nokia.com/qtcreator/qt-creator-2.4.1-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c31f86022fea02a085b861d992320df8
diff --git a/metadata/md5-cache/dev-util/qt-creator-2.5.0 b/metadata/md5-cache/dev-util/qt-creator-2.5.0
index 23b128e51090..322ebf207215 100644
--- a/metadata/md5-cache/dev-util/qt-creator-2.5.0
+++ b/metadata/md5-cache/dev-util/qt-creator-2.5.0
@@ -10,5 +10,5 @@ PDEPEND=autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-u
 RDEPEND=>=x11-libs/qt-assistant-4.7.4:4[doc?] >=x11-libs/qt-core-4.7.4:4[private-headers(+),ssl] >=x11-libs/qt-declarative-4.7.4:4[private-headers(+)] >=x11-libs/qt-gui-4.7.4:4[private-headers(+)] >=x11-libs/qt-script-4.7.4:4[private-headers(+)] >=x11-libs/qt-sql-4.7.4:4 >=x11-libs/qt-svg-4.7.4:4 debug? ( >=x11-libs/qt-test-4.7.4:4 ) !botan-bundled? ( =dev-libs/botan-1.8* ) >=sys-devel/gdb-7.2[python] examples? ( >=x11-libs/qt-demo-4.7.4:4 )
 SLOT=0
 SRC_URI=http://get.qt.nokia.com/qtcreator/qt-creator-2.5.0-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87da1fef01987c8536ccb9433000d9c6
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.23 b/metadata/md5-cache/dev-util/schroot-1.4.23
index 2d517185d0df..ebe6199de546 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.23
+++ b/metadata/md5-cache/dev-util/schroot-1.4.23
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9077010a8b85bc5182da4a8f55dbd2f4
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.23-r1 b/metadata/md5-cache/dev-util/schroot-1.4.23-r1
index 96e4505edbaf..2a229f1e0cf1 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.23-r1
+++ b/metadata/md5-cache/dev-util/schroot-1.4.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8214aedf95f279ae740287974c4f7ba
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.25 b/metadata/md5-cache/dev-util/schroot-1.4.25
index e538ec3a1f65..c3724d8c1e3e 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.25
+++ b/metadata/md5-cache/dev-util/schroot-1.4.25
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.25.orig.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f7a7f978475f1dd5d50304886dd84bb
diff --git a/metadata/md5-cache/dev-util/schroot-1.4.26 b/metadata/md5-cache/dev-util/schroot-1.4.26
index 84f8a2689d62..8c5c7cca6c18 100644
--- a/metadata/md5-cache/dev-util/schroot-1.4.26
+++ b/metadata/md5-cache/dev-util/schroot-1.4.26
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.4.26.orig.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e39e7cd80292feb212cd1eb9e4d24f96
diff --git a/metadata/md5-cache/dev-util/skelgen-1.2 b/metadata/md5-cache/dev-util/skelgen-1.2
index 77895ea623b0..ea9dbc8ab3d4 100644
--- a/metadata/md5-cache/dev-util/skelgen-1.2
+++ b/metadata/md5-cache/dev-util/skelgen-1.2
@@ -6,5 +6,5 @@ KEYWORDS=x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://www.fluidstudios.com/pub/FluidStudios/Tools/Fluid_Studios_Skeleton_Source_File_Generator-1.2.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e25a71de9885d02001401d6dd4f5b7b3
diff --git a/metadata/md5-cache/dev-util/sourcenav-5.1.4 b/metadata/md5-cache/dev-util/sourcenav-5.1.4
index 9866d1452c04..b722fe1e5e3d 100644
--- a/metadata/md5-cache/dev-util/sourcenav-5.1.4
+++ b/metadata/md5-cache/dev-util/sourcenav-5.1.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXaw sys-libs/glibc
 SLOT=0
 SRC_URI=mirror://sourceforge/sourcenav/sourcenav-5.1.4.tar.gz mirror://gentoo/sourcenav-5.1.4-gentoo.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e8a327cb42f1a9931958a79418bee61
diff --git a/metadata/md5-cache/dev-util/sourcenav-5.2_beta2 b/metadata/md5-cache/dev-util/sourcenav-5.2_beta2
index 03c2be44855d..b26a2e959cd0 100644
--- a/metadata/md5-cache/dev-util/sourcenav-5.2_beta2
+++ b/metadata/md5-cache/dev-util/sourcenav-5.2_beta2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXaw sys-libs/glibc
 SLOT=0
 SRC_URI=mirror://sourceforge/sourcenav/sourcenav-5.2b2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4e8e85f77503eef25b0c7e5a85adb4c
diff --git a/metadata/md5-cache/dev-util/strace-4.5.19 b/metadata/md5-cache/dev-util/strace-4.5.19
index 0ab9eecf3131..ad9a712e6644 100644
--- a/metadata/md5-cache/dev-util/strace-4.5.19
+++ b/metadata/md5-cache/dev-util/strace-4.5.19
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.5.19.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69e39ae1d5ff7ad596aa02bc2f9f426e
diff --git a/metadata/md5-cache/dev-util/strace-4.5.20 b/metadata/md5-cache/dev-util/strace-4.5.20
index 4f8455f73af0..76be3e958b6b 100644
--- a/metadata/md5-cache/dev-util/strace-4.5.20
+++ b/metadata/md5-cache/dev-util/strace-4.5.20
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.5.20.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23f4019d602404449f15866ccfc75aab
diff --git a/metadata/md5-cache/dev-util/strace-4.5.20-r2 b/metadata/md5-cache/dev-util/strace-4.5.20-r2
index 991a1740b496..5053b59d850c 100644
--- a/metadata/md5-cache/dev-util/strace-4.5.20-r2
+++ b/metadata/md5-cache/dev-util/strace-4.5.20-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.5.20.tar.bz2 http://dev.gentoo.org/~flameeyes/patches/strace/strace-4.5.20-ioctls.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8146f0de08a8efd15ced8167763f5e3
diff --git a/metadata/md5-cache/dev-util/strace-4.6 b/metadata/md5-cache/dev-util/strace-4.6
index b8b487e854bb..ddf3f41d6089 100644
--- a/metadata/md5-cache/dev-util/strace-4.6
+++ b/metadata/md5-cache/dev-util/strace-4.6
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.6.tar.xz mirror://gentoo/strace-4.6-x32.patch.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a14b1243fa958997a4eb093b464ff40
diff --git a/metadata/md5-cache/dev-util/strace-4.7 b/metadata/md5-cache/dev-util/strace-4.7
index 663256263ecd..99deab490de6 100644
--- a/metadata/md5-cache/dev-util/strace-4.7
+++ b/metadata/md5-cache/dev-util/strace-4.7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.7.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf77439e5f1ef25bb842595b2ce3e87b
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index 4c3e0920c178..cb327eac487a 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/strace/
 IUSE=static aio
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec7ed4de965fdda5875d8dfaf78575cb
diff --git a/metadata/md5-cache/dev-util/telepathy-inspector-0.5.3 b/metadata/md5-cache/dev-util/telepathy-inspector-0.5.3
index b15449790cc1..236d77a597a6 100644
--- a/metadata/md5-cache/dev-util/telepathy-inspector-0.5.3
+++ b/metadata/md5-cache/dev-util/telepathy-inspector-0.5.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 >=net-libs/telepathy-glib-0.7.14 gnome-base/libglade dev-libs/dbus-glib
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-inspector/telepathy-inspector-0.5.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fe2f9f9fbff360803c0b6d992f83ece
diff --git a/metadata/md5-cache/dev-util/valgrind-3.4.0 b/metadata/md5-cache/dev-util/valgrind-3.4.0
index fca2388cce32..2206d89af272 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.4.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.4.0
@@ -7,5 +7,5 @@ KEYWORDS=-* amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1e647bac808289f429e3206b6f032b4
diff --git a/metadata/md5-cache/dev-util/valgrind-3.4.1 b/metadata/md5-cache/dev-util/valgrind-3.4.1
index cfa1c021746e..a5bd8539724b 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.4.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.4.1
@@ -6,5 +6,5 @@ KEYWORDS=-* amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=296f1a7cd3ee7a26c4113d85eaaa6094
diff --git a/metadata/md5-cache/dev-util/valgrind-3.4.1-r1 b/metadata/md5-cache/dev-util/valgrind-3.4.1-r1
index ffe5bc0c5069..b860fb15e6bd 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.4.1-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13f014546c2c86e03eb4e8caff111d5e
diff --git a/metadata/md5-cache/dev-util/valgrind-3.5.0 b/metadata/md5-cache/dev-util/valgrind-3.5.0
index aadf3539253e..a2197c205b12 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.5.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ef0934170cb0f743276eb4e6481d7b0
diff --git a/metadata/md5-cache/dev-util/valgrind-3.5.0-r1 b/metadata/md5-cache/dev-util/valgrind-3.5.0-r1
index 9b10b58a4238..7414f6f1e4bd 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.5.0-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3e33b76378d81e6fa718113df2b8f46
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.0 b/metadata/md5-cache/dev-util/valgrind-3.6.0
index 46ca46f68662..3d45a6d230a9 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db94e9000fd0f952719f5545ac36eed9
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1 b/metadata/md5-cache/dev-util/valgrind-3.6.1
index fb60c343debb..ed3745588cb9 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ddb263dda992cde54ae58d3a527107b
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r1 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
index 1ebb21c90c28..100f7f908379 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=146bcb073cf691ff2562362484b18547
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r2 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r2
index fe59976e8101..0c9201cff6ff 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r2
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebdec5bfe5bd594a300376d86a1e135c
diff --git a/metadata/md5-cache/dev-util/valgrind-3.6.1-r3 b/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
index 11ccd455b1b9..d7b9fada9f3a 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
+++ b/metadata/md5-cache/dev-util/valgrind-3.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6c5e154fea24e73ec98a2e980e46600
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r1 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r1
index fa01d32f2791..6290908545a7 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.7.0-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b86e63c55d29a4af36aef1ddc84a0a83
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r2 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r2
index 96e54e023207..d77a6359b5f1 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.7.0-r2
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64c3a051ed146d2a8e72fe44f08b8666
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r3 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r3
index df64e8c876aa..5fadf9b0448b 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.7.0-r3
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c97679ceb4858ebf7b06a2cf16f83862
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r4 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
index 4052523c6748..90fdfcc3856d 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f877175e75459a4585fdaf8e2becb8c
diff --git a/metadata/md5-cache/dev-util/w32api-3.14 b/metadata/md5-cache/dev-util/w32api-3.14
index ff0ca3f5af1e..94589add3da9 100644
--- a/metadata/md5-cache/dev-util/w32api-3.14
+++ b/metadata/md5-cache/dev-util/w32api-3.14
@@ -7,5 +7,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/w32api-3.14-mingw32-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f724a6fe71364f8638e39751406a811b
diff --git a/metadata/md5-cache/dev-util/w32api-3.17.2 b/metadata/md5-cache/dev-util/w32api-3.17.2
index 947ee45e7890..3f007019089b 100644
--- a/metadata/md5-cache/dev-util/w32api-3.17.2
+++ b/metadata/md5-cache/dev-util/w32api-3.17.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw/w32api-3.17-2-mingw32-src.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea9f1c8b5ea7f93099b95cc2a06dac3f
diff --git a/metadata/md5-cache/dev-util/wiggle-0.9 b/metadata/md5-cache/dev-util/wiggle-0.9
index 15a430816bde..aedaf84eebc9 100644
--- a/metadata/md5-cache/dev-util/wiggle-0.9
+++ b/metadata/md5-cache/dev-util/wiggle-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch
 SLOT=0
 SRC_URI=http://neil.brown.name/wiggle/wiggle-0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b747381e5c2d38398b04a95bfa931f0f
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
index 261301734346..76d2dfc460fb 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9adbdb18eed3f3aa0925e2c34adea18b
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
index c0aab0a79f2c..33e032ce1082 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=088198f03630d9bb9453b3b45fdfc217
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8
index 705460d1e2ca..3720c0c61c17 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae6b96b362542d2cb433df818b6de394
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9
index 05095efec075..9218cb2a8a04 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a74f27da7b061cff32a3005d9bb9200
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1 b/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1
index 41c402604b14..837dfb73774d 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.13/cederqvist-1.12.13.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.13/cederqvist-1.12.13.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.13/cederqvist-1.12.13.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d46cd708e48984beb34e939fc7f3b6fc
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1 b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1
index 990d27185790..c6e6f4641b54 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.13.1//cvs-1.12.13.1.tar.bz2 mirror://gnu/non-gnu/cvs/source/nightly-snapshots/feature//cvs-1.12.13.1.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.13//cederqvist-1.12.13.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.13//cederqvist-1.12.13.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.13//cederqvist-1.12.13.ps )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f82c11502fa43b3c27abde13b1b8e9d5
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r1 b/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r1
index ccbaac754d45..5149da78a720 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r1
+++ b/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3 dev-libs/apr:1 >=dev-vcs/subversion-1.4 sys-devel/gettext !<kde-base/kdesdk-kioslaves-4.3.5 !>=kde-base/kdesdk-kioslaves-4.3.5[subversion] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5f9bbf6675fcb4b6f11b6d9430ec2ef4
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r2 b/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r2
index 12b6e6db119d..6d042892ddba 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r2
+++ b/metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 >=dev-vcs/subversion-1.4 sys-devel/gettext x11-libs/qt-sql:4[sqlite] !kde-base/kdesdk-kioslaves:4[subversion(+)] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b126793b7706fbc7fab1df321829b381
diff --git a/metadata/md5-cache/dev-vcs/qsvn-0.8.3 b/metadata/md5-cache/dev-vcs/qsvn-0.8.3
index 055084b93c83..a96778080938 100644
--- a/metadata/md5-cache/dev-vcs/qsvn-0.8.3
+++ b/metadata/md5-cache/dev-vcs/qsvn-0.8.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4[qt3support] x11-libs/qt-sql:4[sqlite] dev-vcs/subversion
 SLOT=0
 SRC_URI=http://www.anrichter.net/projects/qsvn/chrome/site/qsvn-0.8.3-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e70a4f9939da1f03d3e1072cfa7d90e4
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
index baddb1eb2302..0ec32623dd98 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=dev-libs/apr dev-libs/apr-util <dev-vcs/subversion-1.7 x11-libs/wxGTK:2.8[X] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=193bf3c499d93ce89c7654fff426c6ab
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1_pre8247 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1_pre8247
index bde00e2d6cb4..8661c88ca59f 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1_pre8247
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1_pre8247
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:2.8[X] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rapidsvn-0.12.1_pre8247.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=47b70b57fbca0650480098fe9f9aae09
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7 b/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
index aaf81e7f8a71..afeb0895581d 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
+++ b/metadata/md5-cache/dev-vcs/subversion-1.6.17-r7
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) emacs? ( virtual/emacs ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2402ce7dedc316ba1ffceb74d0cacff2
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.0 b/metadata/md5-cache/dev-vcs/subversion-1.7.0
index ff07e4707f48..0e3e5dd2f7e5 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.0
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.0
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3100991a3eb0937cf0a9ecdcfb403d8e
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.1 b/metadata/md5-cache/dev-vcs/subversion-1.7.1
index 1b3bb2b95697..e7b6e5c1213c 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.1
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion	003731da0df19d26955927bd534f3058	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=889ef78876e59e3e405571aed3615acb
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.2 b/metadata/md5-cache/dev-vcs/subversion-1.7.2
index 43fd674620a1..636632760960 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.2
@@ -9,5 +9,5 @@ LICENSE=Subversion
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4d39e3b316e59052c4597b6512b4690
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.4 b/metadata/md5-cache/dev-vcs/subversion-1.7.4
index 2b9b18af0ca2..5540861f02f0 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.4
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.4
@@ -9,5 +9,5 @@ LICENSE=Subversion
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=80d79150e6679a343bceecab3a4a08ed
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.5 b/metadata/md5-cache/dev-vcs/subversion-1.7.5
index 0255b45c9e31..8dd45bab66e8 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.5
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.5
@@ -9,5 +9,5 @@ LICENSE=Subversion
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d414fd91cbe643d9324e442b6f6082f
diff --git a/metadata/md5-cache/dev-vcs/veracity-1.0.0.10517 b/metadata/md5-cache/dev-vcs/veracity-1.0.0.10517
index 48a4ebb998e2..0c842e89c6a5 100644
--- a/metadata/md5-cache/dev-vcs/veracity-1.0.0.10517
+++ b/metadata/md5-cache/dev-vcs/veracity-1.0.0.10517
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu net-misc/curl dev-libs/nspr sys-apps/util-linux dev-db/sqli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da71cc44f49f09a8bf477d1051016ffd
diff --git a/metadata/md5-cache/dev-vcs/veracity-1.1.0.10565 b/metadata/md5-cache/dev-vcs/veracity-1.1.0.10565
index a2fdb3c0ebeb..dd612ff46244 100644
--- a/metadata/md5-cache/dev-vcs/veracity-1.1.0.10565
+++ b/metadata/md5-cache/dev-vcs/veracity-1.1.0.10565
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu net-misc/curl dev-libs/nspr sys-apps/util-linux dev-db/sqli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=527943340705e0a22e9cd64c233ab691
diff --git a/metadata/md5-cache/games-action/bzflag-2.0.16 b/metadata/md5-cache/games-action/bzflag-2.0.16
index 683edd8270c5..4f6c045ef463 100644
--- a/metadata/md5-cache/games-action/bzflag-2.0.16
+++ b/metadata/md5-cache/games-action/bzflag-2.0.16
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses net-dns/c-ares sdl? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) !sdl? ( !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ce981acdd3874738b65e8522bda9eed
diff --git a/metadata/md5-cache/games-action/bzflag-2.4.0 b/metadata/md5-cache/games-action/bzflag-2.4.0
index d39c12d2605f..5c94ef6fef0a 100644
--- a/metadata/md5-cache/games-action/bzflag-2.4.0
+++ b/metadata/md5-cache/games-action/bzflag-2.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses net-dns/c-ares sdl? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) !sdl? ( !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[audio,joystick,video] media-libs/glew x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bzflag/bzflag-2.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfe54ef302434877a2f47b6740c1ca8c
diff --git a/metadata/md5-cache/games-action/clanbomber-2.1.1 b/metadata/md5-cache/games-action/clanbomber-2.1.1
index 42bf0c9020da..1042464bb986 100644
--- a/metadata/md5-cache/games-action/clanbomber-2.1.1
+++ b/metadata/md5-cache/games-action/clanbomber-2.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-gfx >dev-libs/boost-1.36 <dev-libs/boost-1.46 media-fonts/dejavu
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/clanbomber/clanbomber-2.1.1.tar.lzma
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d25505a43561c75ddbf1bf7920f04116
diff --git a/metadata/md5-cache/games-action/d2x-0.2.5-r3 b/metadata/md5-cache/games-action/d2x-0.2.5-r3
index 30604bde9da7..02f5a64be580 100644
--- a/metadata/md5-cache/games-action/d2x-0.2.5-r3
+++ b/metadata/md5-cache/games-action/d2x-0.2.5-r3
@@ -9,5 +9,5 @@ LICENSE=D1X
 RDEPEND=media-libs/libsdl[audio,joystick,video] media-libs/sdl-image opengl? ( virtual/opengl ) ggi? ( media-libs/libggi ) svga? ( media-libs/svgalib ) cdinstall? ( games-action/descent2-data ) !cdinstall? ( games-action/descent2-demodata )
 SLOT=0
 SRC_URI=http://icculus.org/d2x/src/d2x-0.2.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fd494e47ba0c127f3cc877fc9b1afd5
diff --git a/metadata/md5-cache/games-action/openastromenace-1.2.0 b/metadata/md5-cache/games-action/openastromenace-1.2.0
index 831183404a72..38ad484a4ff8 100644
--- a/metadata/md5-cache/games-action/openastromenace-1.2.0
+++ b/metadata/md5-cache/games-action/openastromenace-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,video,X] media-libs/openal media-libs/freealut media-libs/libogg media-libs/libvorbis virtual/jpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/openastromenace/openamenace-src-1.2.0.tar.bz2 mirror://sourceforge/openastromenace/oamenace-data-1.2.0.tar.bz2 linguas_en? ( mirror://sourceforge/openastromenace/oamenace-lang-en-1.2.0.tar.bz2 ) linguas_de? ( mirror://sourceforge/openastromenace/oamenace-lang-de-1.2.0.tar.bz2 ) linguas_ru? ( mirror://sourceforge/openastromenace/oamenace-lang-ru-1.2.0.tar.bz2 ) !linguas_en? ( !linguas_de? ( !linguas_ru? ( mirror://sourceforge/openastromenace/oamenace-lang-en-1.2.0.tar.bz2 ) ) ) mirror://gentoo/openastromenace.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8624a6dd681ca6a2cb6b84c3fda660e
diff --git a/metadata/md5-cache/games-action/openclonk-5.2.2 b/metadata/md5-cache/games-action/openclonk-5.2.2
index e1595d89f489..7017664aa91e 100644
--- a/metadata/md5-cache/games-action/openclonk-5.2.2
+++ b/metadata/md5-cache/games-action/openclonk-5.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
 RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libX11 sound? ( media-libs/libsdl[audio] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 )
 SLOT=0
 SRC_URI=http://hg.openclonk.org/openclonk/archive/openclonk-release-5.2.2-src.tar.gz http://openclonk.org/homepage/icon.png -> openclonk.png
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbe11578e661fa9a48d5b688fc09f85c
diff --git a/metadata/md5-cache/games-action/openlierox-0.58_beta9-r1 b/metadata/md5-cache/games-action/openlierox-0.58_beta9-r1
index 50e0bb389fd6..effa5d6ce064 100644
--- a/metadata/md5-cache/games-action/openlierox-0.58_beta9-r1
+++ b/metadata/md5-cache/games-action/openlierox-0.58_beta9-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/gd[jpeg,png] dev-libs/libxml2 dev-libs/libzip net-misc/curl joystick? ( media-libs/libsdl[joystick] ) !joystick? ( media-libs/libsdl ) X? ( x11-libs/libX11 media-libs/libsdl[X] ) !X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/openlierox/OpenLieroX_0.58_beta9.src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=307ec91b56ae1b479be2825c0435b886
diff --git a/metadata/md5-cache/games-action/openlierox-0.58_rc1 b/metadata/md5-cache/games-action/openlierox-0.58_rc1
index cf8037c7fa0f..65e198ed8748 100644
--- a/metadata/md5-cache/games-action/openlierox-0.58_rc1
+++ b/metadata/md5-cache/games-action/openlierox-0.58_rc1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/gd[jpeg,png] dev-libs/libxml2 dev-libs/libzip net-misc/curl joystick? ( media-libs/libsdl[joystick] ) !joystick? ( media-libs/libsdl ) X? ( x11-libs/libX11 media-libs/libsdl[X] ) !X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/openlierox/OpenLieroX_0.58_rc1.src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db7e1ca62bab7ccfd0f1aaeb6ce06864
diff --git a/metadata/md5-cache/games-action/openlierox-0.58_rc1-r1 b/metadata/md5-cache/games-action/openlierox-0.58_rc1-r1
index ccb1a8343981..d6a113e2068d 100644
--- a/metadata/md5-cache/games-action/openlierox-0.58_rc1-r1
+++ b/metadata/md5-cache/games-action/openlierox-0.58_rc1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/gd[jpeg,png] dev-libs/libxml2 dev-libs/libzip net-misc/curl joystick? ( media-libs/libsdl[joystick] ) !joystick? ( media-libs/libsdl ) X? ( x11-libs/libX11 media-libs/libsdl[X] ) !X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/openlierox/OpenLieroX_0.58_rc1.src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f98535fa8c90929d3c03b374c34ae44c
diff --git a/metadata/md5-cache/games-action/openlierox-0.58_rc3 b/metadata/md5-cache/games-action/openlierox-0.58_rc3
index e9fc203c483d..3808b2a8f997 100644
--- a/metadata/md5-cache/games-action/openlierox-0.58_rc3
+++ b/metadata/md5-cache/games-action/openlierox-0.58_rc3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/gd[jpeg,png] dev-libs/libxml2 dev-libs/libzip net-misc/curl joystick? ( media-libs/libsdl[joystick] ) !joystick? ( media-libs/libsdl ) X? ( x11-libs/libX11 media-libs/libsdl[X] ) !X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=022c4b3b775a4d6c34f1673c6d12c8ec
diff --git a/metadata/md5-cache/games-action/supertuxkart-0.7 b/metadata/md5-cache/games-action/supertuxkart-0.7
index 6d8fc0b36712..e3c87424ec52 100644
--- a/metadata/md5-cache/games-action/supertuxkart-0.7
+++ b/metadata/md5-cache/games-action/supertuxkart-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-2.0 CCPL-Sampling
 RDEPEND=>=dev-games/irrlicht-1.7.2 virtual/opengl media-libs/freeglut virtual/glu net-libs/enet:0 media-libs/libvorbis media-libs/openal nls? ( dev-libs/fribidi ) virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/supertuxkart/SuperTuxKart/0.7/supertuxkart-0.7-src.tar.bz2 mirror://gentoo/supertuxkart.png
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b29b75e219e09e1a77397e589a06b3a9
diff --git a/metadata/md5-cache/games-action/violetland-0.4.2 b/metadata/md5-cache/games-action/violetland-0.4.2
index 001c197a02a9..c3b713d8cafc 100644
--- a/metadata/md5-cache/games-action/violetland-0.4.2
+++ b/metadata/md5-cache/games-action/violetland-0.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3 CCPL-Attribution-ShareAlike-3.0
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf dev-libs/boost virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=http://violetland.googlecode.com/files/violetland-v0.4.2-src.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0c1ccf28e38e689e511018069a3bb19
diff --git a/metadata/md5-cache/games-action/violetland-0.4.3 b/metadata/md5-cache/games-action/violetland-0.4.3
index 40367e5f4786..f7917f70ed7d 100644
--- a/metadata/md5-cache/games-action/violetland-0.4.3
+++ b/metadata/md5-cache/games-action/violetland-0.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3 CCPL-Attribution-ShareAlike-3.0
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf dev-libs/boost virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=http://violetland.googlecode.com/files/violetland-v0.4.3-src.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2bb5adbb7fd70b29306ad442c8fc2f7
diff --git a/metadata/md5-cache/games-arcade/blobby-0.9c b/metadata/md5-cache/games-arcade/blobby-0.9c
index b60d0946e28d..0cde4ad8c676 100644
--- a/metadata/md5-cache/games-arcade/blobby-0.9c
+++ b/metadata/md5-cache/games-arcade/blobby-0.9c
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-2[zip] media-libs/libsdl[audio,joystick,opengl,video,X] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/blobby/blobby2-linux-0.9c.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc6d4a5c4673ba427ecba3c8db9c342f
diff --git a/metadata/md5-cache/games-arcade/bomns-0.99.2 b/metadata/md5-cache/games-arcade/bomns-0.99.2
index 26f283e4a883..746ec1d41b27 100644
--- a/metadata/md5-cache/games-arcade/bomns-0.99.2
+++ b/metadata/md5-cache/games-arcade/bomns-0.99.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/greenridge/bomns-0.99.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c1a01c5cd294ab328a106ae752ae2a4
diff --git a/metadata/md5-cache/games-arcade/epiar-0.5-r1 b/metadata/md5-cache/games-arcade/epiar-0.5-r1
index 8c7666f4ba1a..7619aaad4cf4 100644
--- a/metadata/md5-cache/games-arcade/epiar-0.5-r1
+++ b/metadata/md5-cache/games-arcade/epiar-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/epiar/epiar-0.5.0-src.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=862c31144d7724107e331b703c9efdda
diff --git a/metadata/md5-cache/games-arcade/jvgs-0.5 b/metadata/md5-cache/games-arcade/jvgs-0.5
index b0129bf228ba..846a158a8ff7 100644
--- a/metadata/md5-cache/games-arcade/jvgs-0.5
+++ b/metadata/md5-cache/games-arcade/jvgs-0.5
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=virtual/opengl dev-lang/lua sys-libs/zlib media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] media-libs/freetype:2
 SLOT=0
 SRC_URI=mirror://sourceforge/jvgs/jvgs-0.5-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=540f5e0e46c57697f1702aa6b9876e5a
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.2 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.2
index b810cab87c8e..116827f10f72 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.2
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.2.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20100920.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20070514.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1bc6d9c883db8d60ec46aebbf7021c8
diff --git a/metadata/md5-cache/games-arcade/lbreakout2-2.6.3 b/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
index f0c8b2e7892b..4f17a95b5d89 100644
--- a/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
+++ b/metadata/md5-cache/games-arcade/lbreakout2-2.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.3.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20110610.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20070514.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=799e18320eff089d6d73dbfa37b045b5
diff --git a/metadata/md5-cache/games-arcade/njam-1.25 b/metadata/md5-cache/games-arcade/njam-1.25
index b4dd53804b33..c64df03315b5 100644
--- a/metadata/md5-cache/games-arcade/njam-1.25
+++ b/metadata/md5-cache/games-arcade/njam-1.25
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/libsdl media-libs/sdl-net
 SLOT=0
 SRC_URI=mirror://sourceforge/njam/njam-1.25-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c8ce556c2247811b9f92a2c0d571f3e
diff --git a/metadata/md5-cache/games-arcade/opensonic-0.1.4-r1 b/metadata/md5-cache/games-arcade/opensonic-0.1.4-r1
index 7229f904b436..af38f9d11e82 100644
--- a/metadata/md5-cache/games-arcade/opensonic-0.1.4-r1
+++ b/metadata/md5-cache/games-arcade/opensonic-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=fetch
 SLOT=0
 SRC_URI=opensnc-src-0.1.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74bc7e0cef9d64f274e0ad48c29af921
diff --git a/metadata/md5-cache/games-arcade/performous-0.6.1 b/metadata/md5-cache/games-arcade/performous-0.6.1
index 60cab4be5f66..a6b9c557af28 100644
--- a/metadata/md5-cache/games-arcade/performous-0.6.1
+++ b/metadata/md5-cache/games-arcade/performous-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 songs? ( CCPL-Attribution-ShareAlike-NonCommercial-2.5 CCPL-Attrib
 RDEPEND=dev-cpp/glibmm dev-cpp/libxmlpp media-libs/portaudio >=dev-libs/boost-1.36 dev-libs/glib dev-libs/libxml2 gnome-base/librsvg media-gfx/imagemagick virtual/jpeg media-libs/libpng media-libs/libsdl virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/performous/Performous-0.6.1-Source.tar.bz2 songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96f7c409fce648ba49c60382082f103d
diff --git a/metadata/md5-cache/games-arcade/rocksndiamonds-3.3.0.1-r1 b/metadata/md5-cache/games-arcade/rocksndiamonds-3.3.0.1-r1
index 71ce8f5cd2c3..a7c9e9f23081 100644
--- a/metadata/md5-cache/games-arcade/rocksndiamonds-3.3.0.1-r1
+++ b/metadata/md5-cache/games-arcade/rocksndiamonds-3.3.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 ) !sdl? ( x11-libs/libX11 ) sdl? ( >=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-mixer-1.2.4[mikmod,mp3,timidity] media-libs/sdl-net >=media-libs/sdl-image-1.2.2[gif] media-libs/smpeg )
 SLOT=0
 SRC_URI=http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.0.1.tar.gz http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz mirror://gentoo/rnd_jue-v8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d32c2462be2dc6d95f5395c321dfb17a
diff --git a/metadata/md5-cache/games-arcade/slimevolley-2.4.2 b/metadata/md5-cache/games-arcade/slimevolley-2.4.2
index cb6d80344172..26229959bbc0 100644
--- a/metadata/md5-cache/games-arcade/slimevolley-2.4.2
+++ b/metadata/md5-cache/games-arcade/slimevolley-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[X,audio,video] media-libs/sdl-ttf media-libs/sdl-image[png] net? ( media-libs/sdl-net ) virtual/libintl
 SLOT=0
 SRC_URI=http://downloads.tuxfamily.org/slime/v242/slimevolley_2.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ed98166c8b79d56f6f7e5b0e4d15308
diff --git a/metadata/md5-cache/games-arcade/smc-1.9 b/metadata/md5-cache/games-arcade/smc-1.9
index 263b6c8e3bd5..21a9b666b1c3 100644
--- a/metadata/md5-cache/games-arcade/smc-1.9
+++ b/metadata/md5-cache/games-arcade/smc-1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=<dev-games/cegui-0.7[opengl,devil] dev-libs/boost virtual/opengl virtual/glu dev-libs/libpcre[unicode] media-libs/libpng media-libs/libsdl[X,joystick,opengl] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://sourceforge/smclone/smc-1.9.tar.bz2 music? ( mirror://sourceforge/smclone/SMC_Music_4.1_high.zip )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=791cfd014023f36671e321e82c057aa8
diff --git a/metadata/md5-cache/games-arcade/tuxanci-20110429 b/metadata/md5-cache/games-arcade/tuxanci-20110429
index 84c9449211c9..b8e2f816caa4 100644
--- a/metadata/md5-cache/games-arcade/tuxanci-20110429
+++ b/metadata/md5-cache/games-arcade/tuxanci-20110429
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/tuxanci-20110429.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc3232ce2d9ef526ed6d8dc7512e6447
diff --git a/metadata/md5-cache/games-arcade/tuxanci-99999999 b/metadata/md5-cache/games-arcade/tuxanci-99999999
index 62f9dad78f79..b66fc14a5550 100644
--- a/metadata/md5-cache/games-arcade/tuxanci-99999999
+++ b/metadata/md5-cache/games-arcade/tuxanci-99999999
@@ -7,5 +7,5 @@ IUSE=debug dedicated +ipv6 nls opengl physfs +sound
 LICENSE=GPL-2
 RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf942f2796c6f2aed6d7a192abff622a
diff --git a/metadata/md5-cache/games-board/crafty-23.3 b/metadata/md5-cache/games-board/crafty-23.3
index e3b1d545fad3..937452deb7ec 100644
--- a/metadata/md5-cache/games-board/crafty-23.3
+++ b/metadata/md5-cache/games-board/crafty-23.3
@@ -9,5 +9,5 @@ LICENSE=crafty
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.craftychess.com/crafty-23.3.zip ftp://ftp.cis.uab.edu/pub/hyatt/source/crafty-23.3.zip ftp://ftp.cis.uab.edu/pub/hyatt/documentation/crafty.doc.ascii
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d8f382d17f83e37b4c57098665b4d95
diff --git a/metadata/md5-cache/games-board/crafty-23.4 b/metadata/md5-cache/games-board/crafty-23.4
index d049809f0b13..dadcdfabf43c 100644
--- a/metadata/md5-cache/games-board/crafty-23.4
+++ b/metadata/md5-cache/games-board/crafty-23.4
@@ -9,5 +9,5 @@ LICENSE=crafty
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.craftychess.com/crafty-23.4.zip ftp://ftp.cis.uab.edu/pub/hyatt/source/crafty-23.4.zip ftp://ftp.cis.uab.edu/pub/hyatt/documentation/crafty.doc.ascii
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73d7e1e729e6e4e240cb81a4278a1509
diff --git a/metadata/md5-cache/games-board/gnuchess-5.08 b/metadata/md5-cache/games-board/gnuchess-5.08
index 572141708739..bcc40bbe9fff 100644
--- a/metadata/md5-cache/games-board/gnuchess-5.08
+++ b/metadata/md5-cache/games-board/gnuchess-5.08
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-5.08.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1005b24d861a2aec2ee042c7578043a
diff --git a/metadata/md5-cache/games-board/gnuchess-6.0.2 b/metadata/md5-cache/games-board/gnuchess-6.0.2
index 586f7e7b4268..b6962c8911ea 100644
--- a/metadata/md5-cache/games-board/gnuchess-6.0.2
+++ b/metadata/md5-cache/games-board/gnuchess-6.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f76ca7b10f015d070bfa63b862a66e10
diff --git a/metadata/md5-cache/games-board/holdingnuts-0.0.5-r1 b/metadata/md5-cache/games-board/holdingnuts-0.0.5-r1
index 8283435322f6..c4872612e598 100644
--- a/metadata/md5-cache/games-board/holdingnuts-0.0.5-r1
+++ b/metadata/md5-cache/games-board/holdingnuts-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!dedicated? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 alsa? ( >=media-libs/libsdl-1.2.10[alsa] ) )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/holdingnuts/holdingnuts-0.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62a410622b150e39031e2cabb07339a7
diff --git a/metadata/md5-cache/games-board/kaya-0.4 b/metadata/md5-cache/games-board/kaya-0.4
index 083e35cb58cb..ea7cd234417c 100644
--- a/metadata/md5-cache/games-board/kaya-0.4
+++ b/metadata/md5-cache/games-board/kaya-0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby18? ( || ( kde-base/korundum[ruby_targets_ruby18] kde-b
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=0
 SRC_URI=mirror://github/pcapriotti/kaya/kaya-0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=754a96b7deba39d8903ee67e00236fca
diff --git a/metadata/md5-cache/games-board/knights-2.4.2 b/metadata/md5-cache/games-board/knights-2.4.2
index c45cb026e601..f7d4647f30e3 100644
--- a/metadata/md5-cache/games-board/knights-2.4.2
+++ b/metadata/md5-cache/games-board/knights-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/libkdegames-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dl.dropbox.com/u/2888238/Knights/knights-2.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=288c35429bad1a487ac93550d3474a3a
diff --git a/metadata/md5-cache/games-board/pokerth-0.8.3 b/metadata/md5-cache/games-board/pokerth-0.8.3
index 91827bbb4cf9..098807db218c 100644
--- a/metadata/md5-cache/games-board/pokerth-0.8.3
+++ b/metadata/md5-cache/games-board/pokerth-0.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
 RDEPEND=>=dev-libs/boost-1.41 >=net-libs/gnutls-2.2.2 >=net-misc/curl-7.16 x11-libs/qt-core:4 virtual/gsasl !dedicated? ( media-libs/libsdl media-libs/sdl-mixer[mikmod,vorbis] >=sys-libs/zlib-1.2.3 x11-libs/qt-gui:4 x11-libs/qt-sql:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-0.8.3-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07753e4a4a966a5780633574b512b3ba
diff --git a/metadata/md5-cache/games-board/pokerth-0.9.1 b/metadata/md5-cache/games-board/pokerth-0.9.1
index 54d11d812628..18edcfda2f08 100644
--- a/metadata/md5-cache/games-board/pokerth-0.9.1
+++ b/metadata/md5-cache/games-board/pokerth-0.9.1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
 RDEPEND=dev-db/sqlite >=dev-libs/boost-1.41 dev-libs/libgcrypt dev-libs/tinyxml[stl] net-libs/libircclient >=net-misc/curl-7.16 x11-libs/qt-core:4 virtual/gsasl !dedicated? ( media-libs/libsdl media-libs/sdl-mixer[mikmod,vorbis] x11-libs/qt-gui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-0.9.1-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9918ba671954b0163a862372dd9e365
diff --git a/metadata/md5-cache/games-board/pokerth-0.9.4 b/metadata/md5-cache/games-board/pokerth-0.9.4
index 9342d6f470e1..037745e685e4 100644
--- a/metadata/md5-cache/games-board/pokerth-0.9.4
+++ b/metadata/md5-cache/games-board/pokerth-0.9.4
@@ -9,5 +9,5 @@ LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
 RDEPEND=dev-db/sqlite:3 >=dev-libs/boost-1.44 dev-libs/libgcrypt dev-libs/tinyxml[stl] net-libs/libircclient >=net-misc/curl-7.16 x11-libs/qt-core:4 virtual/gsasl !dedicated? ( media-libs/libsdl media-libs/sdl-mixer[mikmod,vorbis] x11-libs/qt-gui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-0.9.4-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dad7fd0e2b46f41e283763dc18a001ac
diff --git a/metadata/md5-cache/games-emulation/advancemame-0.106.1 b/metadata/md5-cache/games-emulation/advancemame-0.106.1
index 88dde731e064..fa39cb4f1561 100644
--- a/metadata/md5-cache/games-emulation/advancemame-0.106.1
+++ b/metadata/md5-cache/games-emulation/advancemame-0.106.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 XMAME
 RDEPEND=app-arch/unzip app-arch/zip media-libs/libsdl dev-libs/expat alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype ) svga? ( >=media-libs/svgalib-1.9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/advancemame/advancemame-0.106.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6af761410cdce1e4404b92569ee87221
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.8 b/metadata/md5-cache/games-emulation/desmume-0.9.8
new file mode 100644
index 000000000000..8e026769806d
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/opengl sys-libs/zlib dev-libs/zziplib media-libs/libsdl[joystick] x11-libs/agg
+DESCRIPTION=Nintendo DS emulator
+EAPI=2
+HOMEPAGE=http://desmume.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/opengl sys-libs/zlib dev-libs/zziplib media-libs/libsdl[joystick] x11-libs/agg
+SLOT=0
+SRC_URI=mirror://sourceforge/desmume/desmume-0.9.8.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=94971bd1c1e9bcab937dc06878c1f4eb
diff --git a/metadata/md5-cache/games-emulation/fakenes-0.5.8-r1 b/metadata/md5-cache/games-emulation/fakenes-0.5.8-r1
index e279ed727c78..5011e6bb8239 100644
--- a/metadata/md5-cache/games-emulation/fakenes-0.5.8-r1
+++ b/metadata/md5-cache/games-emulation/fakenes-0.5.8-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/allegro-4.4.1.1:0[opengl?] dev-games/hawknl openal? ( media-libs/openal media-libs/freealut ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/fakenes/fakenes-0.5.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3bdb2af76f7f4a6e7c6f041a2707717e
diff --git a/metadata/md5-cache/games-emulation/gens-2.15.5 b/metadata/md5-cache/games-emulation/gens-2.15.5
index 707d4a96f411..84cbd6db1330 100644
--- a/metadata/md5-cache/games-emulation/gens-2.15.5
+++ b/metadata/md5-cache/games-emulation/gens-2.15.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl >=media-libs/libsdl-1.2[joystick,video] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gens/gens-2.15.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df4ad19c8fb46099f3380f8e72e70034
diff --git a/metadata/md5-cache/games-emulation/hatari-1.5.0 b/metadata/md5-cache/games-emulation/hatari-1.5.0
index e8775900cc1a..6b1e69335117 100644
--- a/metadata/md5-cache/games-emulation/hatari-1.5.0
+++ b/metadata/md5-cache/games-emulation/hatari-1.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,audio,video] sys-libs/readline media-libs/libpng sys-libs/zlib games-emulation/emutos
 SLOT=0
 SRC_URI=mirror://berlios/hatari/hatari-1.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6e0d60f8793715d0d5e6d6a9118346e
diff --git a/metadata/md5-cache/games-emulation/hatari-1.6.1 b/metadata/md5-cache/games-emulation/hatari-1.6.1
index 2744bcd98f98..c661663a7df5 100644
--- a/metadata/md5-cache/games-emulation/hatari-1.6.1
+++ b/metadata/md5-cache/games-emulation/hatari-1.6.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,audio,video] sys-libs/readline media-libs/libpng sys-libs/zlib games-emulation/emutos
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/hatari/1.6.1/hatari-1.6.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b1aaaba2b7080b5b6555649fa62016b
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1 b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1
index 02440796d07d..e90cba4444e3 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1
+++ b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf sys-libs/zlib x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) app-arch/xz-utils
 SLOT=0
 SRC_URI=http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz mirror://gentoo/mupen64plus-1.5-patches-20091123.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f59243168c9af39969873a962407ce5
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2 b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2
index d7db3dce7dbb..61ffde0ce16e 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-1.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/freetype:2 media-libs/libpng media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu sys-libs/zlib[minizip] x11-libs/gtk+:2 libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) app-arch/xz-utils
 SLOT=0
 SRC_URI=http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz mirror://gentoo/mupen64plus-1.5-patches-20100507.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2f250c11ee4a1e30690bbd7f86d899a
diff --git a/metadata/md5-cache/games-emulation/nestopia-1.40 b/metadata/md5-cache/games-emulation/nestopia-1.40
index 8842c927ba9f..f6fac2476570 100644
--- a/metadata/md5-cache/games-emulation/nestopia-1.40
+++ b/metadata/md5-cache/games-emulation/nestopia-1.40
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4:2 media-libs/alsa-lib >=media-libs/libsdl-1.2.12[audio,joystick,video] sys-libs/zlib virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/nestopia/Nestopia140src.zip http://rbelmont.mameworld.info/nst140_lnx_release_h.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=712812da997af170dbc34d443792c89a
diff --git a/metadata/md5-cache/games-emulation/nestra-0.66-r2 b/metadata/md5-cache/games-emulation/nestra-0.66-r2
index 667f2201647a..cf0557923b67 100644
--- a/metadata/md5-cache/games-emulation/nestra-0.66-r2
+++ b/metadata/md5-cache/games-emulation/nestra-0.66-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=amd64? ( app-emulation/emul-linux-x86-xlibs ) x11-libs/libX11
 SLOT=0
 SRC_URI=http://nestra.linuxgames.com/nestra-0.66.tar.gz mirror://debian/pool/contrib/n/nestra/nestra_0.66-10.diff.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eaf0804ffcaeed5316c55cccac9ce6c3
diff --git a/metadata/md5-cache/games-emulation/raine-0.51.9 b/metadata/md5-cache/games-emulation/raine-0.51.9
index 77f6082e3591..f8946e3dbb63 100644
--- a/metadata/md5-cache/games-emulation/raine-0.51.9
+++ b/metadata/md5-cache/games-emulation/raine-0.51.9
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-cpp/muParser media-libs/libsdl[audio,joystick,video] sys-libs/zlib media-libs/sdl-image[png] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://rainemu.swishparty.co.uk/html/archive/raines-0.51.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe154d571c88c7a2bf9488aff40224cb
diff --git a/metadata/md5-cache/games-emulation/sdlmame-0.142_p5 b/metadata/md5-cache/games-emulation/sdlmame-0.142_p5
index 36644edae739..81328d9b2f8f 100644
--- a/metadata/md5-cache/games-emulation/sdlmame-0.142_p5
+++ b/metadata/md5-cache/games-emulation/sdlmame-0.142_p5
@@ -9,5 +9,5 @@ LICENSE=XMAME
 RDEPEND=>=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://gentoo/mame0142s.zip mirror://gentoo/sdlmame0142u1_diff.zip mirror://gentoo/sdlmame0142u2_diff.zip mirror://gentoo/sdlmame0142u3_diff.zip mirror://gentoo/sdlmame0142u4_diff.zip mirror://gentoo/sdlmame0142u5_diff.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b23b2ae95bbdfb486df1772c90497e8
diff --git a/metadata/md5-cache/games-emulation/sdlmame-0.144 b/metadata/md5-cache/games-emulation/sdlmame-0.144
index a39d35fd8bb0..ba48faa22d92 100644
--- a/metadata/md5-cache/games-emulation/sdlmame-0.144
+++ b/metadata/md5-cache/games-emulation/sdlmame-0.144
@@ -9,5 +9,5 @@ LICENSE=XMAME
 RDEPEND=>=media-libs/libsdl-1.2.10[audio,joystick,opengl?,video] media-libs/sdl-ttf dev-libs/expat debug? ( x11-libs/gtk+:2 gnome-base/gconf x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://gentoo/mame0144s.zip http://www.netswarm.net/misc/sdlmame-ui.bdf.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a003535ba54770fe831de909c03ab3d
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.52-r1 b/metadata/md5-cache/games-emulation/snes9x-1.52-r1
index 1fa0f56f53e5..0df0e99e1584 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.52-r1
+++ b/metadata/md5-cache/games-emulation/snes9x-1.52-r1
@@ -9,5 +9,5 @@ LICENSE=as-is GPL-2 LGPL-2.1
 RDEPEND=x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43 ) amd64? ( png? ( >=media-libs/libpng-1.4.2 ) multilib? ( >=app-emulation/emul-linux-x86-xlibs-20100611 gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100611 alsa? ( app-emulation/emul-linux-x86-soundlibs ) joystick? ( >=app-emulation/emul-linux-x86-sdl-20100611 ) ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.0 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
 SLOT=0
 SRC_URI=http://snes9x-gtk.googlecode.com/files/snes9x-1.52-src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=356bacae843f5a7997a7a7821af6180a
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.53 b/metadata/md5-cache/games-emulation/snes9x-1.53
index aaee2dcce2a0..5013b914e4bb 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.53
+++ b/metadata/md5-cache/games-emulation/snes9x-1.53
@@ -9,5 +9,5 @@ LICENSE=as-is GPL-2 LGPL-2.1
 RDEPEND=x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
 SLOT=0
 SRC_URI=http://snes9x-gtk.googlecode.com/files/snes9x-1.53-src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=130b0c81bbe84bf595cfe6146d709454
diff --git a/metadata/md5-cache/games-emulation/vbam-1.8.0.1009-r1 b/metadata/md5-cache/games-emulation/vbam-1.8.0.1009-r1
index b66e6be22b4e..93a5b9251c08 100644
--- a/metadata/md5-cache/games-emulation/vbam-1.8.0.1009-r1
+++ b/metadata/md5-cache/games-emulation/vbam-1.8.0.1009-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4 media-libs/libsdl[joystick] link? ( media-libs/libsfml ) sys-libs/zlib virtual/opengl gtk? ( >=dev-cpp/glibmm-2.4.0:2 >=dev-cpp/gtkmm-2.4.0:2.4 >=dev-cpp/gtkglextmm-1.2.0 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/vbam-1.8.0.1009.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1ae3cffc5c1097f1cffd86ef65b9537
diff --git a/metadata/md5-cache/games-emulation/vbam-1.8.0.1090 b/metadata/md5-cache/games-emulation/vbam-1.8.0.1090
index 2aa6a6e39502..e9afc43dcfc8 100644
--- a/metadata/md5-cache/games-emulation/vbam-1.8.0.1090
+++ b/metadata/md5-cache/games-emulation/vbam-1.8.0.1090
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4 media-libs/libsdl[joystick] link? ( media-libs/libsfml ) sys-libs/zlib virtual/opengl ffmpeg? ( virtual/ffmpeg ) gtk? ( >=dev-cpp/glibmm-2.4.0:2 >=dev-cpp/gtkmm-2.4.0:2.4 >=dev-cpp/gtkglextmm-1.2.0 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/vbam-1.8.0.1090.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60b9ee9a00a0681ce7f1ba8011bdc851
diff --git a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r2 b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r2
index f8044733667c..083ee8f74203 100644
--- a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r2
+++ b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng media-libs/libsdl gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz mirror://gentoo/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d1eee3436130eede8ae0114c3e6706e
diff --git a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3 b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
index 4ff06fc484db..a140c9370302 100644
--- a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
+++ b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng media-libs/libsdl sys-libs/zlib[minizip] gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz mirror://gentoo/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=552bdd4361705011a90c5d16042e10a8
diff --git a/metadata/md5-cache/games-emulation/xmess-0.106 b/metadata/md5-cache/games-emulation/xmess-0.106
index 9fc41b9194bc..1f5d5be629b7 100644
--- a/metadata/md5-cache/games-emulation/xmess-0.106
+++ b/metadata/md5-cache/games-emulation/xmess-0.106
@@ -9,5 +9,5 @@ LICENSE=XMAME
 RDEPEND=sys-libs/zlib alsa? ( media-libs/alsa-lib ) dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) expat? ( dev-libs/expat ) ggi? ( media-libs/libggi ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl virtual/glu ) sdl? ( >=media-libs/libsdl-1.2.0 ) svga? ( media-libs/svgalib ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) X? ( x11-libs/libXext )
 SLOT=0
 SRC_URI=http://x.mame.net/download/xmame-0.106.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b60b9738feba73501d581aebb8f36d94
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3de02e4905cff91068eb6a2791c90ca2
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r2 b/metadata/md5-cache/games-emulation/zsnes-1.51-r2
index 2e724b68cfeb..10ca1deac4d5 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r2
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] >=sys-libs/zlib-1.2.3-r1 amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) ao? ( media-libs/libao ) opengl? ( virtual/opengl ) png? ( media-libs/libpng )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5160ff0ed705235fa32b339e9f2516b
diff --git a/metadata/md5-cache/games-engines/frobtads-0.13 b/metadata/md5-cache/games-engines/frobtads-0.13
index a037e6e87ab2..b70abdf46d4a 100644
--- a/metadata/md5-cache/games-engines/frobtads-0.13
+++ b/metadata/md5-cache/games-engines/frobtads-0.13
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses
 RESTRICT=!tads3compiler? ( test )
 SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-0.13.tar.gz tads2compiler? ( http://www.tads.org/frobtads/frobtads-t2compiler-0.13.tar.gz ) tads3compiler? ( http://www.tads.org/frobtads/frobtads-t3compiler-0.13.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79e598b31e2d425a9ae0bc9d8b927998
diff --git a/metadata/md5-cache/games-engines/frobtads-1.0 b/metadata/md5-cache/games-engines/frobtads-1.0
index 6f992bbbe437..ca885010ba29 100644
--- a/metadata/md5-cache/games-engines/frobtads-1.0
+++ b/metadata/md5-cache/games-engines/frobtads-1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses
 RESTRICT=!tads3compiler? ( test )
 SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-1.0.tar.gz tads2compiler? ( http://www.tads.org/frobtads/frobtads-t2compiler-1.0.tar.gz ) tads3compiler? ( http://www.tads.org/frobtads/frobtads-t3compiler-1.0.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9835d6f742379727fce048b086712e3
diff --git a/metadata/md5-cache/games-engines/gemrb-0.7.0 b/metadata/md5-cache/games-engines/gemrb-0.7.0
index c3c3abc835ef..af6eb341d8c4 100644
--- a/metadata/md5-cache/games-engines/gemrb-0.7.0
+++ b/metadata/md5-cache/games-engines/gemrb-0.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/libpng >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer media-libs/sdl-ttf sys-libs/zlib =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/gemrb/gemrb-0.7.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3fa17fa327da9bfd6448aebf79bc82c
diff --git a/metadata/md5-cache/games-engines/scummvm-1.4.0 b/metadata/md5-cache/games-engines/scummvm-1.4.0
index 179fbf497088..06e9a11d4ee2 100644
--- a/metadata/md5-cache/games-engines/scummvm-1.4.0
+++ b/metadata/md5-cache/games-engines/scummvm-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.2[audio,joystick,video] >media-libs/libmpeg2-0.3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scummvm/scummvm-1.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=33c1060d0d23983ceab65da7dae759ca
diff --git a/metadata/md5-cache/games-engines/scummvm-1.4.1 b/metadata/md5-cache/games-engines/scummvm-1.4.1
index ef20cf109797..4749c5ede36d 100644
--- a/metadata/md5-cache/games-engines/scummvm-1.4.1
+++ b/metadata/md5-cache/games-engines/scummvm-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.2[audio,joystick,video] >media-libs/libmpeg2-0.3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scummvm/scummvm-1.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5276eb7402007f6ff640e05db923b80b
diff --git a/metadata/md5-cache/games-engines/stratagus-2.2.6-r1 b/metadata/md5-cache/games-engines/stratagus-2.2.6-r1
index 5b283a8b2237..ff47e21b581e 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.2.6-r1
+++ b/metadata/md5-cache/games-engines/stratagus-2.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 vir
 REQUIRED_USE=theora? ( vorbis )
 SLOT=0
 SRC_URI=http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1b7662396f4b45b02587924c1624b7e
diff --git a/metadata/md5-cache/games-fps/darkplaces-20100408 b/metadata/md5-cache/games-fps/darkplaces-20100408
index c3fec4ac9b2e..1cbf5713908b 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20100408
+++ b/metadata/md5-cache/games-fps/darkplaces-20100408
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20100408.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=822ccf164a6fe3a768ee9fbbbb6914fc
diff --git a/metadata/md5-cache/games-fps/darkplaces-20110628 b/metadata/md5-cache/games-fps/darkplaces-20110628
index b9ef3164e584..57def43e8119 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20110628
+++ b/metadata/md5-cache/games-fps/darkplaces-20110628
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20110628.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25744c61b16c87eb51073d3b7395c8ea
diff --git a/metadata/md5-cache/games-fps/doomsday-1.9.0_beta69 b/metadata/md5-cache/games-fps/doomsday-1.9.0_beta69
index 70c138f2e5d3..1e9a44d58f04 100644
--- a/metadata/md5-cache/games-fps/doomsday-1.9.0_beta69
+++ b/metadata/md5-cache/games-fps/doomsday-1.9.0_beta69
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-net media-libs/libpng net-misc/curl openal? ( media-libs/openal )
 SLOT=0
 SRC_URI=mirror://sourceforge/deng/deng-1.9.0-beta6.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9114c72d9614af25803c9941c659a86
diff --git a/metadata/md5-cache/games-fps/duke3d-20040817-r2 b/metadata/md5-cache/games-fps/duke3d-20040817-r2
index c3cd8ed3476e..3c2a76142f88 100644
--- a/metadata/md5-cache/games-fps/duke3d-20040817-r2
+++ b/metadata/md5-cache/games-fps/duke3d-20040817-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-sound/timidity++ media-sound/timidity-eawpatches perl? ( dev-lang/perl[-ithreads] ) opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://gentoo/duke3d-20040817.tar.bz2 demo? ( ftp://ftp.3drealms.com/share/3dduke13.zip ftp://ftp.planetmirror.com/pub/gameworld/downloads/3dduke13.zip )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c93e717a0a8dab682c54e198ac21259
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.5 b/metadata/md5-cache/games-fps/openarena-0.8.5
index 0e66f2601f15..4ae6f417bfe6 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.5
+++ b/metadata/md5-cache/games-fps/openarena-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/openarena/rel/081/oa081.zip http://download.tuxfamily.org/openarena/rel/085/oa085p.zip http://openarena.ws/svn/source/081/openarena-engine-0.8.1-1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=70ef9586efb1196d37f614d08ee3d14b
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8 b/metadata/md5-cache/games-fps/openarena-0.8.8
index 46bf5c8acefe..78fe9ee67b5b 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff95bea76835abc7c9772a0e88fea2d8
diff --git a/metadata/md5-cache/games-fps/quake3-1.34_rc3 b/metadata/md5-cache/games-fps/quake3-1.34_rc3
index 1e9fd9f15011..0f4b8a658559 100644
--- a/metadata/md5-cache/games-fps/quake3-1.34_rc3
+++ b/metadata/md5-cache/games-fps/quake3-1.34_rc3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=opengl? ( virtual/opengl media-libs/openal media-libs/libsdl[joystick,opengl] ) !dedicated? ( virtual/opengl media-libs/openal media-libs/libsdl[joystick,opengl] ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena )
 SLOT=0
 SRC_URI=http://icculus.org/quake3/files/ioquake3_1.34-rc3.tar.bz2 http://ioquake3.org/files/ioquake3_1.34-rc3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d14584756e4971cb695c0e528198d1d1
diff --git a/metadata/md5-cache/games-fps/quake3-1.36 b/metadata/md5-cache/games-fps/quake3-1.36
index 1e3681387dd7..edaad28dcd4f 100644
--- a/metadata/md5-cache/games-fps/quake3-1.36
+++ b/metadata/md5-cache/games-fps/quake3-1.36
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena )
 SLOT=0
 SRC_URI=http://ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c37e8171c14706dbd738eacef393ca4
diff --git a/metadata/md5-cache/games-fps/quake3-9999 b/metadata/md5-cache/games-fps/quake3-9999
index 2445b798ee16..184a2f891cdd 100644
--- a/metadata/md5-cache/games-fps/quake3-9999
+++ b/metadata/md5-cache/games-fps/quake3-9999
@@ -7,5 +7,5 @@ IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
 LICENSE=GPL-2
 RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=959be3239380671203b5edc3567dec27
diff --git a/metadata/md5-cache/games-fps/sauerbraten-2010.07.28 b/metadata/md5-cache/games-fps/sauerbraten-2010.07.28
index d29841811012..a67699fb3a1a 100644
--- a/metadata/md5-cache/games-fps/sauerbraten-2010.07.28
+++ b/metadata/md5-cache/games-fps/sauerbraten-2010.07.28
@@ -9,5 +9,5 @@ LICENSE=ZLIB freedist
 RDEPEND=sys-libs/zlib net-libs/enet:1.3 !dedicated? ( media-libs/libsdl[X,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] virtual/opengl virtual/glu )
 SLOT=0
 SRC_URI=mirror://sourceforge/sauerbraten/2010_07_19/sauerbraten_2010_07_28_justice_edition_linux.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=454adcbfe5b9af21107c14748b74dd94
diff --git a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r1 b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r1
index 5296113fdc67..2ecc41270e72 100644
--- a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r1
+++ b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kmuddy.com/releases/stable/kmuddy-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a007bf9aa0c71c0b368fd9449236892d
diff --git a/metadata/md5-cache/games-mud/wxmud-9999 b/metadata/md5-cache/games-mud/wxmud-9999
index 6b8f7434375c..02e0d74d5d06 100644
--- a/metadata/md5-cache/games-mud/wxmud-9999
+++ b/metadata/md5-cache/games-mud/wxmud-9999
@@ -7,5 +7,5 @@ IUSE=python
 LICENSE=GPL-2
 RDEPEND==x11-libs/wxGTK-2.8* >=x11-libs/gtk+-2.4:2 python? ( >=dev-lang/python-2.4 )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=fa64744cfe64b4df7830d90c81561f33
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.7 b/metadata/md5-cache/games-puzzle/gweled-0.7
index fb2f64b69c38..85f622003237 100644
--- a/metadata/md5-cache/games-puzzle/gweled-0.7
+++ b/metadata/md5-cache/games-puzzle/gweled-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2 >=gnome-base/libgnomeui-2
 SLOT=0
 SRC_URI=http://sebdelestaing.free.fr/gweled/Release/gweled-0.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d315ad245bb1df68881f3282fcb2900a
diff --git a/metadata/md5-cache/games-puzzle/kmagnet-0.10 b/metadata/md5-cache/games-puzzle/kmagnet-0.10
index d990bff11c84..6fb17ff9e97a 100644
--- a/metadata/md5-cache/games-puzzle/kmagnet-0.10
+++ b/metadata/md5-cache/games-puzzle/kmagnet-0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/libkdegames-4.4:4[aqua=] >=kde-base/knewstuff-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/109111-kmagnet-0.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=469924543ff68989e752c9816ccb0f85
diff --git a/metadata/md5-cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326 b/metadata/md5-cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
index d4bf210406d0..af8c35a75c2b 100644
--- a/metadata/md5-cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
+++ b/metadata/md5-cache/games-puzzle/krosswordpuzzle-0.15.6.2.1259326
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/krosswordpuzzle-0.15.6.2.1259326.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1bd37618c1bdb796cd35369aae6b1815
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.3 b/metadata/md5-cache/games-puzzle/meandmyshadow-0.3
index 8e2f56948fda..5c21682a8b22 100644
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.3
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3 OFL-1.1 CCPL-Attribution-ShareAlike-2.5
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-gfx media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-libs/openssl net-misc/curl app-arch/libarchive
 SLOT=0
 SRC_URI=mirror://sourceforge/meandmyshadow/0.3/meandmyshadow-0.3-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=411346f2baa01cd9ea54edc291a43ecd
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6 b/metadata/md5-cache/games-puzzle/pingus-0.7.6
index a9b658104f64..48f59e3a4bde 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer opengl? ( virtual/opengl ) media-libs/libpng dev-libs/boost
 SLOT=0
 SRC_URI=http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24780968ef2175b962a69d59bb62ee77
diff --git a/metadata/md5-cache/games-puzzle/pipewalker-0.9.1 b/metadata/md5-cache/games-puzzle/pipewalker-0.9.1
index 0011cdffd0f1..6e41df22e926 100644
--- a/metadata/md5-cache/games-puzzle/pipewalker-0.9.1
+++ b/metadata/md5-cache/games-puzzle/pipewalker-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.1-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bdd769c3b58129e1b67b90c1a535e3b
diff --git a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4 b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4
index 07136965d420..6db4c51a84f5 100644
--- a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4
+++ b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=690408539dc22bcf092dc4cbeb7b6166
diff --git a/metadata/md5-cache/games-puzzle/tetrinet-0.11 b/metadata/md5-cache/games-puzzle/tetrinet-0.11
index fd5e8ed1c52c..bd4922e2cb18 100644
--- a/metadata/md5-cache/games-puzzle/tetrinet-0.11
+++ b/metadata/md5-cache/games-puzzle/tetrinet-0.11
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=sys-libs/ncurses-5
 SLOT=0
 SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35c5d532607274cf545b42774081d6c4
diff --git a/metadata/md5-cache/games-puzzle/xblockout-1.1.5-r1 b/metadata/md5-cache/games-puzzle/xblockout-1.1.5-r1
index 10c9771bdb61..e6c8fcfa6273 100644
--- a/metadata/md5-cache/games-puzzle/xblockout-1.1.5-r1
+++ b/metadata/md5-cache/games-puzzle/xblockout-1.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=http://www710.univ-lyon1.fr/~exco/XBL/xbl-1.1.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=636fd278574096580037b4d92939f44d
diff --git a/metadata/md5-cache/games-roguelike/ivan-0.50 b/metadata/md5-cache/games-roguelike/ivan-0.50
index 87f1e70869ff..390382e82106 100644
--- a/metadata/md5-cache/games-roguelike/ivan-0.50
+++ b/metadata/md5-cache/games-roguelike/ivan-0.50
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl
 SLOT=0
 SRC_URI=mirror://sourceforge/ivan/ivan-0.50.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c8bf139a267ebd5209bef7e0cc4f477
diff --git a/metadata/md5-cache/games-roguelike/nethack-3.4.3-r1 b/metadata/md5-cache/games-roguelike/nethack-3.4.3-r1
index 848a2306c44a..93c171525cdd 100644
--- a/metadata/md5-cache/games-roguelike/nethack-3.4.3-r1
+++ b/metadata/md5-cache/games-roguelike/nethack-3.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=nethack
 RDEPEND=>=sys-libs/ncurses-5.2-r5 X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/nethack/nethack-343-src.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3da753e884eff2c501319d18ef049ea2
diff --git a/metadata/md5-cache/games-roguelike/powder-115 b/metadata/md5-cache/games-roguelike/powder-115
index a93eade9610b..06350be98aea 100644
--- a/metadata/md5-cache/games-roguelike/powder-115
+++ b/metadata/md5-cache/games-roguelike/powder-115
@@ -8,5 +8,5 @@ LICENSE=CCPL-Sampling-Plus-1.0
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.zincland.com/powder/release/powder115_src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5670eb2942c86d8dca3655ebfc13b1fb
diff --git a/metadata/md5-cache/games-roguelike/powder-116 b/metadata/md5-cache/games-roguelike/powder-116
index 4178da736ebb..dd9cd3caa9d9 100644
--- a/metadata/md5-cache/games-roguelike/powder-116
+++ b/metadata/md5-cache/games-roguelike/powder-116
@@ -8,5 +8,5 @@ LICENSE=CCPL-Sampling-Plus-1.0
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.zincland.com/powder/release/powder116_src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e952bf56ac496cad9e4c45fafb7881c1
diff --git a/metadata/md5-cache/games-roguelike/slashem-0.0.772 b/metadata/md5-cache/games-roguelike/slashem-0.0.772
index 245a11fe68e0..986d2fead7ad 100644
--- a/metadata/md5-cache/games-roguelike/slashem-0.0.772
+++ b/metadata/md5-cache/games-roguelike/slashem-0.0.772
@@ -8,5 +8,5 @@ LICENSE=nethack
 RDEPEND=>=sys-libs/ncurses-5.2-r5 X? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXext x11-libs/libXt x11-libs/libXpm x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp ) opengl? ( virtual/opengl media-libs/libsdl ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/slashem/se007e7f2.tar.gz http://www.juiblex.co.uk/nethack/config/conf12s.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c093542ccfdf0a86cc5fe7c0dc025b38
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.2 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.2
index b04d37212482..e4e4f77d4998 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.2
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.2
@@ -9,5 +9,5 @@ LICENSE=eternal_lands
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~rich0/distfiles/elc_1.9.2-20110618.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38e12165e70b45ea1ed24079832f2573
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.2-r1 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.2-r1
index 793f17e0aa74..840aa70726e3 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.2-r1
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=eternal_lands
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~rich0/distfiles/elc_1.9.2-20110618.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=abfd24ff6737731bd0603a581ffc57e5
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3
index fa5b0ae4eb51..1ee287997059 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3
@@ -9,5 +9,5 @@ LICENSE=eternal_lands
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.2
 SLOT=0
 SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=895ef8abd5b9c9a863f7cafa09dea2e9
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1
index 8a91da3f1820..1564d99c321d 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz ) >=sys-apps/sed-4
 DESCRIPTION=An online MMORPG written in C and SDL
 EAPI=2
 HOMEPAGE=http://www.eternal-lands.com
@@ -9,5 +9,5 @@ LICENSE=eternal_lands
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3
 SLOT=0
 SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc09b3cd4b9126bcf082c9e9522111ce
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cac8660bd48662a447d5ae3c919c5c8a
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
new file mode 100644
index 000000000000..f0f6b3dd240d
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3 >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip doc? ( app-doc/doxygen media-gfx/graphviz ) >=sys-apps/sed-4
+DESCRIPTION=An online MMORPG written in C and SDL
+EAPI=4
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=debug doc kernel_linux
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=eternal_lands
+RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext virtual/opengl virtual/glu media-libs/libsdl[X] media-libs/sdl-net media-libs/sdl-image media-libs/openal media-libs/freealut media-libs/libvorbis dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/libpng >=games-rpg/eternal-lands-data-1.9.3
+SLOT=0
+SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1aa62998a9ec004838506c8a7f6f92c9
diff --git a/metadata/md5-cache/games-rpg/mana-0.5.3 b/metadata/md5-cache/games-rpg/mana-0.5.3
index dc36d8b6228e..a12a1a78372b 100644
--- a/metadata/md5-cache/games-rpg/mana-0.5.3
+++ b/metadata/md5-cache/games-rpg/mana-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=games-rpg/tmw-0.5.2 >=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[opengl?,video] media-libs/sdl-gfx x11-libs/libX11 nls? ( virtual/libintl ) opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://manasource.org/files/mana-0.5.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b37ee48553322d85da8985bb9a32694a
diff --git a/metadata/md5-cache/games-rpg/mana-0.6.0 b/metadata/md5-cache/games-rpg/mana-0.6.0
index 1e8d1d570c11..23f3569d3522 100644
--- a/metadata/md5-cache/games-rpg/mana-0.6.0
+++ b/metadata/md5-cache/games-rpg/mana-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=games-rpg/tmw-0.5.2 >=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-libs/libX11 nls? ( virtual/libintl ) opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://manasource.org/files/mana-0.6.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e396ab81ba036bf1b21a5736a40cb963
diff --git a/metadata/md5-cache/games-rpg/sumwars-0.5.6-r2 b/metadata/md5-cache/games-rpg/sumwars-0.5.6-r2
index 46153414f354..8502805a4479 100644
--- a/metadata/md5-cache/games-rpg/sumwars-0.5.6-r2
+++ b/metadata/md5-cache/games-rpg/sumwars-0.5.6-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CCPL-Attribution-ShareAlike-3.0
 SLOT=0
 SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.6-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6304311527293396c354d61f300a1828
diff --git a/metadata/md5-cache/games-simulation/crashtest-1.1 b/metadata/md5-cache/games-simulation/crashtest-1.1
index 6e3da34620ad..61f4b5b669af 100644
--- a/metadata/md5-cache/games-simulation/crashtest-1.1
+++ b/metadata/md5-cache/games-simulation/crashtest-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/fltk:1[opengl] dev-games/ode media-libs/alsa-lib virtual/opengl virtual/glu media-libs/freeglut
 SLOT=0
 SRC_URI=http://bram.creative4vision.nl/crashtest/crashtest-1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d45c6a2385e97aebf46bcfa576aee52
diff --git a/metadata/md5-cache/games-simulation/searchandrescue-1.3.0 b/metadata/md5-cache/games-simulation/searchandrescue-1.3.0
index aed0ed790140..796e194e2aa3 100644
--- a/metadata/md5-cache/games-simulation/searchandrescue-1.3.0
+++ b/metadata/md5-cache/games-simulation/searchandrescue-1.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm x11-libs/libSM x11-libs/libICE x11-libs/libXmu x11-libs/libXi x11-libs/libXpm virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/searchandrescue/SearchAndRescue-1.3.0.tar.gz mirror://sourceforge/searchandrescue/SearchAndRescue-data-1.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9eca82749c417f6cf6e834d18873ad2
diff --git a/metadata/md5-cache/games-simulation/searchandrescue-1.4.0 b/metadata/md5-cache/games-simulation/searchandrescue-1.4.0
index 4bc380dfdb13..7f40e82f10bd 100644
--- a/metadata/md5-cache/games-simulation/searchandrescue-1.4.0
+++ b/metadata/md5-cache/games-simulation/searchandrescue-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm x11-libs/libSM x11-libs/libICE x11-libs/libXmu x11-libs/libXi x11-libs/libXpm virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/searchandrescue/SearchAndRescue-1.4.0.tar.gz mirror://sourceforge/searchandrescue/SearchAndRescue-data-1.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=672d7c58f5c66b73ea4365097a1c2fef
diff --git a/metadata/md5-cache/games-simulation/simutrans-0.102.2.2 b/metadata/md5-cache/games-simulation/simutrans-0.102.2.2
index 50777f9c6852..624e06d838f4 100644
--- a/metadata/md5-cache/games-simulation/simutrans-0.102.2.2
+++ b/metadata/md5-cache/games-simulation/simutrans-0.102.2.2
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=media-libs/libsdl[audio,video] sys-libs/zlib media-libs/libpng media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/simutrans/simutrans-src-102-2-2.zip mirror://sourceforge/simutrans/simulinux-complete-102-2-2.zip mirror://sourceforge/simutrans/simupak64-addon-food-102-2-1.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54d41fbb8f2604ff887668096345ab2d
diff --git a/metadata/md5-cache/games-sports/toycars-0.3.10 b/metadata/md5-cache/games-sports/toycars-0.3.10
index 0309c93784f3..0ec8a62cc4f6 100644
--- a/metadata/md5-cache/games-sports/toycars-0.3.10
+++ b/metadata/md5-cache/games-sports/toycars-0.3.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video,joystick] media-libs/sdl-image[png] x11-libs/fltk:1[opengl] >=media-libs/fmod-4.25.07-r1:1 virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/toycars/toycars-0.3.10.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=baf7b0faf0234f33f74747611307110b
diff --git a/metadata/md5-cache/games-sports/xmoto-0.5.9 b/metadata/md5-cache/games-sports/xmoto-0.5.9
index 7dbc07e1e3cf..6a7ac5e99fbc 100644
--- a/metadata/md5-cache/games-sports/xmoto-0.5.9
+++ b/metadata/md5-cache/games-sports/xmoto-0.5.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxdg-basedir dev-db/sqlite:3 dev-games/ode dev-lang/lua[deprecated] virtual/jpeg media-libs/libpng dev-libs/libxml2 media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net net-misc/curl app-arch/bzip2 virtual/opengl virtual/glu media-fonts/dejavu nls? ( virtual/libintl ) editor? ( media-gfx/inkscape )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/0.7.0/inksmoto-0.7.0.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1aecd9d06be04e72d521f5f941062fd1
diff --git a/metadata/md5-cache/games-strategy/asc-2.4.0.0 b/metadata/md5-cache/games-strategy/asc-2.4.0.0
index 0e1070930c5f..c9bf8213b4ed 100644
--- a/metadata/md5-cache/games-strategy/asc-2.4.0.0
+++ b/metadata/md5-cache/games-strategy/asc-2.4.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 virtual/jpeg media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/libvorbis media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/asc-hq/asc-2.4.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=b4c38b68391ca25395ec7ceef656364e
diff --git a/metadata/md5-cache/games-strategy/asc-2.5.0.0 b/metadata/md5-cache/games-strategy/asc-2.5.0.0
index d8d1704fe1ea..223252b6feb7 100644
--- a/metadata/md5-cache/games-strategy/asc-2.5.0.0
+++ b/metadata/md5-cache/games-strategy/asc-2.5.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 virtual/jpeg media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/libvorbis media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/asc-hq/asc-2.5.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=fec0f9e3d0585f1202fa670585f57a4f
diff --git a/metadata/md5-cache/games-strategy/freecnc-0.2.1.31072003 b/metadata/md5-cache/games-strategy/freecnc-0.2.1.31072003
index 8714a6a4f8ca..82ff7e6f836b 100644
--- a/metadata/md5-cache/games-strategy/freecnc-0.2.1.31072003
+++ b/metadata/md5-cache/games-strategy/freecnc-0.2.1.31072003
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-net
 SLOT=0
 SRC_URI=mirror://gentoo/freecnc++-0.2.1.31072003-src.tar.bz2 nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo1.zip ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo2.zip )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=315be95859fb208984c29254615ecc2d
diff --git a/metadata/md5-cache/games-strategy/galaxyhack-1.74 b/metadata/md5-cache/games-strategy/galaxyhack-1.74
index 24351dfc16ff..e4b58700169e 100644
--- a/metadata/md5-cache/games-strategy/galaxyhack-1.74
+++ b/metadata/md5-cache/games-strategy/galaxyhack-1.74
@@ -8,5 +8,5 @@ LICENSE=GPL-2 galaxyhack
 RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer >=dev-libs/boost-1.34
 SLOT=0
 SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0785be10076deefd28186de762888f92
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.15 b/metadata/md5-cache/games-strategy/hedgewars-0.9.15
index 8fa1b3eb9b60..f4cbb67d1fba 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.15
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=x11-libs/qt-gui:4 media-libs/libsdl[audio,opengl,video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net dev-lang/lua >=media-fonts/dejavu-2.28
 SLOT=0
 SRC_URI=http://hedgewars.org/download/hedgewars-src-0.9.15.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61b6ab84b8608287edcbb3141e06d449
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.16 b/metadata/md5-cache/games-strategy/hedgewars-0.9.16
index c1330f30a77e..bc7d0dc76ceb 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.16
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=x11-libs/qt-gui:4 media-libs/libsdl[audio,opengl,video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net dev-lang/lua >=media-fonts/dejavu-2.28
 SLOT=0
 SRC_URI=http://download.gna.org/hedgewars/hedgewars-src-0.9.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=851f47632b0f9ae5c556f41b5979cfdc
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.17 b/metadata/md5-cache/games-strategy/hedgewars-0.9.17
index 3746bb1ea288..a9515457ca24 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.17
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=x11-libs/qt-gui:4 media-libs/libsdl[audio,opengl,video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net dev-lang/lua >=media-fonts/dejavu-2.28
 SLOT=0
 SRC_URI=http://download.gna.org/hedgewars/hedgewars-src-0.9.17.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73c34e09beb5bfa935855329430f1af6
diff --git a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072 b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
index 8a0c6e4f783e..702a82d24eb0 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=A port of Jagged Alliance 2 to SDL
 EAPI=4
 HOMEPAGE=http://tron.homeunix.org/ja2/
-IUSE=cdinstall editor zlib linguas_en linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold
+IUSE=cdinstall editor zlib linguas_de +linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold
 KEYWORDS=~amd64 ~x86
 LICENSE=SFI-SCLA
 RDEPEND=media-libs/libsdl[X,audio,video] cdinstall? ( games-strategy/ja2-stracciatella-data ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=^^ ( linguas_de linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/ja2-stracciatella-0.12.1_p7072.tar.xz http://tron.homeunix.org/ja2/editor.slf.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c6b7764ae44c05a4aec933e2f25948b
+_md5_=fdd8961bbfd95a8eb53bd1cd9a6f8d5e
diff --git a/metadata/md5-cache/games-strategy/ufo-ai-2.3.1-r1 b/metadata/md5-cache/games-strategy/ufo-ai-2.3.1-r1
index 0b5fa6cdd277..4cf551e5c9ba 100644
--- a/metadata/md5-cache/games-strategy/ufo-ai-2.3.1-r1
+++ b/metadata/md5-cache/games-strategy/ufo-ai-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufoai/ufoai-2.3.1-source.tar.bz2 mirror://sourceforge/ufoai/ufoai-2.3.1-data.tar http://mattn.ninex.info/1maps.pk3
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03ddcf78d812060f067f6bf7528846dd
diff --git a/metadata/md5-cache/games-strategy/ufo-ai-2.4 b/metadata/md5-cache/games-strategy/ufo-ai-2.4
index 3488a3055d51..be3dd7d91998 100644
--- a/metadata/md5-cache/games-strategy/ufo-ai-2.4
+++ b/metadata/md5-cache/games-strategy/ufo-ai-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufoai/ufoai-2.4-source.tar.bz2 mirror://sourceforge/ufoai/ufoai-2.4-data.tar http://mattn.ninex.info/1maps.pk3
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a4b844164b683842800880d02943294
diff --git a/metadata/md5-cache/games-strategy/wargus-2.2.6-r2 b/metadata/md5-cache/games-strategy/wargus-2.2.6-r2
index a0538cb2c63e..fc8e0de3c88a 100644
--- a/metadata/md5-cache/games-strategy/wargus-2.2.6-r2
+++ b/metadata/md5-cache/games-strategy/wargus-2.2.6-r2
@@ -9,5 +9,5 @@ PDEPEND=games-strategy/wargus-data
 RDEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://launchpad.net/wargus/trunk/2.2.6/+download/wargus_2.2.6.orig.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5007079368b05c3d10c39635551682ef
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.10 b/metadata/md5-cache/games-strategy/wesnoth-1.10
index 4d9eb87537e8..647ac959075a 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.10
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf10483ecb40ec3c0dc067d1cf2a0338
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.10.3 b/metadata/md5-cache/games-strategy/wesnoth-1.10.3
index bebdf84dda88..2df3abe43409 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.10.3
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.10.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.10.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b014a26b3ce456b5257008afa1733ec5
diff --git a/metadata/md5-cache/games-strategy/widelands-0.16 b/metadata/md5-cache/games-strategy/widelands-0.16
index cd6690741a97..f7f4c104ba4a 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.16
+++ b/metadata/md5-cache/games-strategy/widelands-0.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/ggz-client-libs dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://launchpad.net/widelands/build16/build16/+download/widelands-build16-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37ef51a20e65565d97e95d1778a6a674
diff --git a/metadata/md5-cache/games-strategy/widelands-0.17 b/metadata/md5-cache/games-strategy/widelands-0.17
index 3e229c68c8a4..66b5e69f501d 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.17
+++ b/metadata/md5-cache/games-strategy/widelands-0.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://launchpad.net/widelands/build17/build-17/+download/widelands-build17-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e54687e1646de8faff1a49690b18773
diff --git a/metadata/md5-cache/games-util/fteqcc-2501 b/metadata/md5-cache/games-util/fteqcc-2501
index dd18076fde1c..da6152b52886 100644
--- a/metadata/md5-cache/games-util/fteqcc-2501
+++ b/metadata/md5-cache/games-util/fteqcc-2501
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/fteqw/qclibsrc2501.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfb624ec16deab5acf21bd0a116f36ed
diff --git a/metadata/md5-cache/gnome-base/gdm-2.20.11 b/metadata/md5-cache/gnome-base/gdm-2.20.11
index 7fbf260fda54..0dce7a661b4c 100644
--- a/metadata/md5-cache/gnome-base/gdm-2.20.11
+++ b/metadata/md5-cache/gnome-base/gdm-2.20.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.6:2 >=x11-libs/pango-1.3 >=gnome-base/libglade-2:2.0 >=gnome-base/libgnomecanvas-2 >=gnome-base/librsvg-1.1.1:2 >=dev-libs/libxml2-2.4.12:2 >=media-libs/libart_lgpl-2.3.11 x11-libs/gksu x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXext x11-apps/sessreg x11-libs/libXdmcp xinerama? ( x11-libs/libXinerama ) consolekit? ( sys-auth/consolekit dev-libs/dbus-glib ) accessibility? ( x11-libs/libXevie ) afs? ( net-fs/openafs sys-libs/lwp ) dmx? ( x11-libs/libdmx ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) pam? ( virtual/pam ) !pam? ( elibc_glibc? ( sys-apps/shadow ) ) remote? ( gnome-extra/zenity ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=x11-misc/xdg-utils-1.0.2-r3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/2.20/gdm-2.20.11.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e22e8147c54cb959752e215544d597d9
diff --git a/metadata/md5-cache/gnome-base/gdm-2.20.11-r1 b/metadata/md5-cache/gnome-base/gdm-2.20.11-r1
index 47ad12c8e2ed..25d04264fd9b 100644
--- a/metadata/md5-cache/gnome-base/gdm-2.20.11-r1
+++ b/metadata/md5-cache/gnome-base/gdm-2.20.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12:2 >=x11-libs/gtk+-2.6:2 >=x11-libs/pango-1.3 >=gnome-base/libglade-2:2.0 >=gnome-base/libgnomecanvas-2 >=gnome-base/librsvg-1.1.1:2 >=dev-libs/libxml2-2.4.12:2 >=media-libs/libart_lgpl-2.3.11 x11-libs/gksu x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXext x11-apps/sessreg x11-libs/libXdmcp xinerama? ( x11-libs/libXinerama ) consolekit? ( sys-auth/consolekit dev-libs/dbus-glib ) accessibility? ( x11-libs/libXevie ) afs? ( net-fs/openafs sys-libs/lwp ) dmx? ( x11-libs/libdmx ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) pam? ( virtual/pam ) !pam? ( elibc_glibc? ( sys-apps/shadow ) ) remote? ( gnome-extra/zenity ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=x11-misc/xdg-utils-1.0.2-r3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/2.20/gdm-2.20.11.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ee5aefa0f69e20182986765e754c488
diff --git a/metadata/md5-cache/gnome-base/gdm-2.32.1 b/metadata/md5-cache/gnome-base/gdm-2.32.1
index 1a73b5b97134..ee6aa8a9a1bd 100644
--- a/metadata/md5-cache/gnome-base/gdm-2.32.1
+++ b/metadata/md5-cache/gnome-base/gdm-2.32.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/2.32/gdm-2.32.1.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9c782681a2b5175acf8d54795ca467a
diff --git a/metadata/md5-cache/gnome-base/gdm-2.32.1-r1 b/metadata/md5-cache/gnome-base/gdm-2.32.1-r1
index 92dfc21e32fc..bc59b072dadc 100644
--- a/metadata/md5-cache/gnome-base/gdm-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gdm-2.32.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/2.32/gdm-2.32.1.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=70a622e687edac6dddf4386180bd6503
diff --git a/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r1 b/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r1
index 13ba0a724928..738e2ec38326 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) >=gnome-base/gnome-session-2.91.92 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.2/gdm-3.2.1.1.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-3.2.1.1-gentoo-files.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f8a74af1bcaca6e378bbd76589c757d
diff --git a/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r2 b/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r2
index ba039943ce2b..d58419ed1a1a 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r2
+++ b/metadata/md5-cache/gnome-base/gdm-3.2.1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) >=gnome-base/gnome-session-2.91.92 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.2/gdm-3.2.1.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fafb8f7fa62577d2c537daa1f4a70d8b
diff --git a/metadata/md5-cache/gnome-base/gdm-3.4.1 b/metadata/md5-cache/gnome-base/gdm-3.4.1
index bbe21c70a4b2..3fb7698edb0f 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.4.1
+++ b/metadata/md5-cache/gnome-base/gdm-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-39 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) >=gnome-base/gnome-session-2.91.92 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.4/gdm-3.4.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4854bb53479a6b558164521594ae0f30
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1 b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1
index 5169c37d08e6..78efd5f01ca4 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b4f98f847fc69d22cae19e8223ec10b8
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
index 5758a65c93b7..38bfc142665c 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.20:2 gnome-base/gconf:2 >=sys-a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=47a63e683e1d692206fc6ea046dd297b
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.2.2 b/metadata/md5-cache/gnome-base/gnome-keyring-3.2.2
index 2cfdf94489de..e36faeea5a0d 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.2.2
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.25:2 >=x11-libs/gtk+-2.90.0:3 >=app-crypt/p11-kit-0.6
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.2/gnome-keyring-3.2.2.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=48ac6ff8a761fe56c5c82c574abeb0f3
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.4.1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.4.1
index c3e90974b235..8265ced99f16 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gcr-3.3.4 >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 app-m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.4/gnome-keyring-3.4.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=97b16b4ffeb72e8bde4465e3d5331e3d
diff --git a/metadata/md5-cache/gnome-extra/drwright-0.17 b/metadata/md5-cache/gnome-extra/drwright-0.17
index 373ae77d8bf7..408e06eb7632 100644
--- a/metadata/md5-cache/gnome-extra/drwright-0.17
+++ b/metadata/md5-cache/gnome-extra/drwright-0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.0.4:2 >=x11-libs/pango-1.2 >=dev-libs/glib-2.0.3:2 >=gnome-base/gconf-1.2:2 >=gnome-base/libgnomeui-2 >=gnome-base/libglade-2:2.0 x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=mirror://gnome/sources/drwright/0.17/drwright-0.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=06bbc375c3b9ae96383f1c1de31e017f
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r1 b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r1
index 2ddb415f8707..cd2d21942de9 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 BSD DB
 RDEPEND=>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-data-server-2.32.3-patches.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a5fe8be9adbc4eb23ffcc8ea145b3903
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r2 b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r2
index b5c00bd63985..942355171c1f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r2
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 BSD DB
 RDEPEND=>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-data-server-2.32.3-patches.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=00975e5c0b18be8bddb4b8cc8f88b6b7
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r1
index e603dd13c784..bdf9c7ad133a 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.2/evolution-data-server-3.2.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=16b4c9146ea95bce0891478cec6ef82f
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r2
index cfbe1c40c78c..c9dcc447bd32 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r2
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.2.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.2/evolution-data-server-3.2.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fba681daf278bc4291b99ce31dbcc3d6
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.1
index d831ec26804e..4ff9040101e5 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.4/evolution-data-server-3.4.1.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=778f39bc75a21cf5265636a191f088a0
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.2
index e7d9688026ea..df43cb5219aa 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.2
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.4/evolution-data-server-3.4.2.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e7ea9bb65ebba2c29d2b1d2883f5401
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.3 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.3
new file mode 100644
index 000000000000..e8596aa81c1c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.4.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.2:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.10 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/dbus-glib-0.6 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Evolution groupware backend
+EAPI=4
+HOMEPAGE=http://www.gnome.org/projects/evolution/
+IUSE=doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2 BSD DB
+RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.2:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.10 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/dbus-glib-0.6 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.4/evolution-data-server-3.4.3.tar.xz
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=b19634a83b3cafe58df33391c29357e3
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.4.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.4.1
index 060dd9780035..a777ae9b336c 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.4.1
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.4.1
@@ -9,5 +9,5 @@ RDEPEND=>=mail-client/evolution-3.4.1:2.0 >=gnome-extra/evolution-data-server-3.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.4/evolution-ews-3.4.1.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f29af68c95e534ee33b4719fdd7e4a7
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.4.3 b/metadata/md5-cache/gnome-extra/evolution-ews-3.4.3
new file mode 100644
index 000000000000..642251a55ea7
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3 >=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 >=net-libs/libsoup-2.30:2.4 >=x11-libs/gtk+-2.90.4:3 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=4
+HOMEPAGE=http://www.gnome.org/projects/evolution/
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3 >=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 >=net-libs/libsoup-2.30:2.4 >=x11-libs/gtk+-2.90.4:3
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.4/evolution-ews-3.4.3.tar.xz
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=02eeb1ec58f39473243043bcfd1d2a73
diff --git a/metadata/md5-cache/gnome-extra/evolution-exchange-3.4.3 b/metadata/md5-cache/gnome-extra/evolution-exchange-3.4.3
new file mode 100644
index 000000000000..07576e33e68b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-exchange-3.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3[ldap,kerberos] >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2:2 >=dev-libs/libical-0.43 dev-libs/libxml2:2 net-libs/libsoup:2.4 >=net-nds/openldap-2.1.30-r2 virtual/krb5 >=dev-util/intltool-0.40 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange
+EAPI=4
+HOMEPAGE=http://projects.gnome.org/evolution/
+IUSE=debug doc static debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=mail-client/evolution-3.4.3:2.0 >=gnome-extra/evolution-data-server-3.4.3[ldap,kerberos] >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2:2 >=dev-libs/libical-0.43 dev-libs/libxml2:2 net-libs/libsoup:2.4 >=net-nds/openldap-2.1.30-r2 virtual/krb5
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution-exchange/3.4/evolution-exchange-3.4.3.tar.xz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b549eedfae3117408600f1e67e536622
diff --git a/metadata/md5-cache/gnome-extra/evolution-groupwise-3.2.3 b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.2.3
index 1c6c5716ead4..7c720ddb0611 100644
--- a/metadata/md5-cache/gnome-extra/evolution-groupwise-3.2.3
+++ b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.2.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=mail-client/evolution-3.2.3:2.0 >=gnome-extra/evolution-data-server-3.2.3 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-groupwise/3.2/evolution-groupwise-3.2.3.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee428425694d567873f7bec137f27d44
diff --git a/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.0 b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.0
index d39627994cba..4c7a3e2dcb68 100644
--- a/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.0
+++ b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=mail-client/evolution-3.4.0:2.0 >=gnome-extra/evolution-data-server-3.4.0 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-groupwise/3.4/evolution-groupwise-3.4.0.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bdfb2653b575a793e31a7b1e453a038
diff --git a/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.2 b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.2
new file mode 100644
index 000000000000..c22cfc7ade36
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-groupwise-3.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=mail-client/evolution-3.4.2:2.0 >=gnome-extra/evolution-data-server-3.4.2 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Evolution module for connecting to Novell Groupwise
+EAPI=4
+HOMEPAGE=http://www.gnome.org/projects/evolution/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=mail-client/evolution-3.4.2:2.0 >=gnome-extra/evolution-data-server-3.4.2 >=dev-libs/glib-2.16 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 gnome-extra/gtkhtml:4.0 >=net-libs/libsoup-2.3:2.4 sys-libs/db x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.4:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-groupwise/3.4/evolution-groupwise-3.4.2.tar.xz
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=921df1007e4b328a0cd958d633059655
diff --git a/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.6 b/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.6
index e664333bd954..683797ffad8b 100644
--- a/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.6
+++ b/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.14:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=dev-libs/glib-2.16 gtkhotkey? ( x11-libs/gtkhotkey )
 SLOT=0
 SRC_URI=http://gnome-menu-file-browser-applet.googlecode.com/files/file-browser-applet-0.6.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ac1d5021c5e5f5120e47a3cf88d636b
diff --git a/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.7 b/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.7
index 9117dc41a9da..b45996188b80 100644
--- a/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.7
+++ b/metadata/md5-cache/gnome-extra/file-browser-applet-0.6.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.14:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=dev-libs/glib-2.16 gtkhotkey? ( x11-libs/gtkhotkey )
 SLOT=0
 SRC_URI=http://gnome-menu-file-browser-applet.googlecode.com/files/file-browser-applet-0.6.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1343b1ff5bb33a1d812563be73e297e
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-chooser-0.2.5 b/metadata/md5-cache/gnome-extra/gnome-color-chooser-0.2.5
index f4a91e213d34..0eee3a5336b2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-chooser-0.2.5
+++ b/metadata/md5-cache/gnome-extra/gnome-color-chooser-0.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-cpp/libglademm-2.6.0:2.4 >=dev-cpp/gtkmm-2.8.0:2.4 >=gnome-base/libgnome-2.16.0 >=gnome-base/libgnomeui-2.14.0 >=dev-libs/libxml2-2.6.0
 SLOT=0
 SRC_URI=mirror://sourceforge/gnomecc/gnome-color-chooser-0.2.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a9b5ee5c2d32e1f2fd4eee45f145d4c
diff --git a/metadata/md5-cache/gnome-extra/libgda-4.2.11 b/metadata/md5-cache/gnome-extra/libgda-4.2.11
index 92f0050da3df..f8c57a122801 100644
--- a/metadata/md5-cache/gnome-extra/libgda-4.2.11
+++ b/metadata/md5-cache/gnome-extra/libgda-4.2.11
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-lib
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://gnome/sources/libgda/4.2/libgda-4.2.11.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=627450ea6f6ae7762b91bc16cd6843e4
diff --git a/metadata/md5-cache/gnome-extra/libgda-4.2.12 b/metadata/md5-cache/gnome-extra/libgda-4.2.12
index 9c81587495ed..acefd1b25728 100644
--- a/metadata/md5-cache/gnome-extra/libgda-4.2.12
+++ b/metadata/md5-cache/gnome-extra/libgda-4.2.12
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-lib
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://gnome/sources/libgda/4.2/libgda-4.2.12.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d03d9e9468754d2178d8cd441a113bf7
diff --git a/metadata/md5-cache/gnome-extra/libgda-4.2.13 b/metadata/md5-cache/gnome-extra/libgda-4.2.13
index 1f1db8567951..2240c6272a8d 100644
--- a/metadata/md5-cache/gnome-extra/libgda-4.2.13
+++ b/metadata/md5-cache/gnome-extra/libgda-4.2.13
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-lib
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://gnome/sources/libgda/4.2/libgda-4.2.13.tar.xz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=80de67a2b321074131f0f00a05d1324a
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1 b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
index 146bace93404..3b7a86dec240 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 SLOT=5
 SRC_URI=mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=170466c8965bfeaec0047912d9abd2fd
diff --git a/metadata/md5-cache/gnome-extra/wp_tray-0.5.5 b/metadata/md5-cache/gnome-extra/wp_tray-0.5.5
index 52fd2bf6d220..9e24eb2b5b4c 100644
--- a/metadata/md5-cache/gnome-extra/wp_tray-0.5.5
+++ b/metadata/md5-cache/gnome-extra/wp_tray-0.5.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 >=gnome-base/libglade-2 dev-cpp/libgnomeuimm dev-cpp/libxmlpp x11-libs/libnotify
 SLOT=0
 SRC_URI=http://planetearthworm.com/projects/wp_tray/files/wp_tray-0.5.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8387239f3209077e8f837b483e01bdcf
diff --git a/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200 b/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
index 1d350f394cd6..164373bf69d5 100644
--- a/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
+++ b/metadata/md5-cache/gnome-extra/yelp-2.30.2-r200
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linu
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=app-text/gnome-doc-utils-0.20.6 >=app-text/rarian-0.8.1 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/gconf-2 sys-libs/zlib >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/startup-notification net-libs/webkit-gtk:2 lzma? ( app-arch/xz-utils )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~ssuominen/yelp-2.30.2+webkit.tar.xz
+SRC_URI=mirror://gentoo/yelp-2.30.2+webkit.tar.xz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=577048f5ff18602ee5932bfe6c7b556c
+_md5_=a09e9f005d2f74f9fbb9e4065970fd97
diff --git a/metadata/md5-cache/gnustep-apps/aclock-0.2.3-r1 b/metadata/md5-cache/gnustep-apps/aclock-0.2.3-r1
index 9cf04878bda8..85e4f008d0c0 100644
--- a/metadata/md5-cache/gnustep-apps/aclock-0.2.3-r1
+++ b/metadata/md5-cache/gnustep-apps/aclock-0.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.linuks.mine.nu/aclock/aclock-0.2.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfc2ba567c75c2b3573bf3dca4b4f830
diff --git a/metadata/md5-cache/gnustep-apps/aclock-0.3 b/metadata/md5-cache/gnustep-apps/aclock-0.3
index 79b61122d512..c5e73b7e94c9 100644
--- a/metadata/md5-cache/gnustep-apps/aclock-0.3
+++ b/metadata/md5-cache/gnustep-apps/aclock-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://gnu.ethz.ch/linuks.mine.nu/aclock/aclock-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a6176f54d218b778ee7cd8c6b6669e6
diff --git a/metadata/md5-cache/gnustep-apps/aclock-0.4.0 b/metadata/md5-cache/gnustep-apps/aclock-0.4.0
index 03b46c818493..2ce26ff7292e 100644
--- a/metadata/md5-cache/gnustep-apps/aclock-0.4.0
+++ b/metadata/md5-cache/gnustep-apps/aclock-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/AClock-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59a1b37a2586a69fe373c0b13c16e182
diff --git a/metadata/md5-cache/gnustep-apps/addresses-0.4.7 b/metadata/md5-cache/gnustep-apps/addresses-0.4.7
index 294fe1dc088c..be28f9eb8a3d 100644
--- a/metadata/md5-cache/gnustep-apps/addresses-0.4.7
+++ b/metadata/md5-cache/gnustep-apps/addresses-0.4.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Addresses-0.4.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=649de8ab0e4b671d8e1c5a4fd2376af2
diff --git a/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r3 b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r3
index ee323cef3251..43dce18e1107 100644
--- a/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r3
+++ b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.collaboration-world.com/affiche.data/releases/Stable/Affiche-0.6.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6975f197f07622023bbe482293d4f6a2
diff --git a/metadata/md5-cache/gnustep-apps/batmon-0.6 b/metadata/md5-cache/gnustep-apps/batmon-0.6
index c38434ead343..025c3c1cd97d 100644
--- a/metadata/md5-cache/gnustep-apps/batmon-0.6
+++ b/metadata/md5-cache/gnustep-apps/batmon-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/batmon-0.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00400ddb980adb38dd645fd3903d55db
diff --git a/metadata/md5-cache/gnustep-apps/camera-0.8-r1 b/metadata/md5-cache/gnustep-apps/camera-0.8-r1
index 575fd583af88..1cdc3e34f45d 100644
--- a/metadata/md5-cache/gnustep-apps/camera-0.8-r1
+++ b/metadata/md5-cache/gnustep-apps/camera-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnustep-libs/camerakit >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gsimageapps/Camera-0.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=717144b58be225bca83818e1f48ddb09
diff --git a/metadata/md5-cache/gnustep-apps/cdplayer-0.5-r1 b/metadata/md5-cache/gnustep-apps/cdplayer-0.5-r1
index 783891196590..bd9b3882a5ee 100644
--- a/metadata/md5-cache/gnustep-apps/cdplayer-0.5-r1
+++ b/metadata/md5-cache/gnustep-apps/cdplayer-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libcdaudio-0.7 preferences? ( gnustep-apps/preferences ) systempreferences? ( gnustep-apps/systempreferences ) gnustep-libs/cddb >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsburn/cdplayer-0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b3716619e86dfc2633e43b5d47e2986
diff --git a/metadata/md5-cache/gnustep-apps/cdplayer-0.5.1 b/metadata/md5-cache/gnustep-apps/cdplayer-0.5.1
index 8ef39f0a9d51..eaeb5a2feb5d 100644
--- a/metadata/md5-cache/gnustep-apps/cdplayer-0.5.1
+++ b/metadata/md5-cache/gnustep-apps/cdplayer-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libcdaudio-0.7 preferences? ( gnustep-apps/preferences ) systempreferences? ( gnustep-apps/systempreferences ) gnustep-libs/cddb >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsburn/cdplayer-0.5.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60347682aa0899246efd5fa1567ab66e
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.8.2 b/metadata/md5-cache/gnustep-apps/cenon-3.8.2
index 2514d5235bfc..5a8ed903d3f5 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-3.8.2
+++ b/metadata/md5-cache/gnustep-apps/cenon-3.8.2
@@ -8,5 +8,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-3.8.2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhfInterservice/download/source/Cenon-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25ce12a68cea518e73aeb9942ad8ba37
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.9.4 b/metadata/md5-cache/gnustep-apps/cenon-3.9.4
index 66d5a576d275..8b777f301a37 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-3.9.4
+++ b/metadata/md5-cache/gnustep-apps/cenon-3.9.4
@@ -9,5 +9,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66b82d663b42073ad0f87f2314882b1a
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.9.5 b/metadata/md5-cache/gnustep-apps/cenon-3.9.5
index 52d1b8e8054d..1aa69c562b59 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-3.9.5
+++ b/metadata/md5-cache/gnustep-apps/cenon-3.9.5
@@ -9,5 +9,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccad71bc9669acef1d414a56dde688ce
diff --git a/metadata/md5-cache/gnustep-apps/clipbook-0.6.0.8.3-r1 b/metadata/md5-cache/gnustep-apps/clipbook-0.6.0.8.3-r1
index ff50408483ee..fbb26c4ec264 100644
--- a/metadata/md5-cache/gnustep-apps/clipbook-0.6.0.8.3-r1
+++ b/metadata/md5-cache/gnustep-apps/clipbook-0.6.0.8.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.gnustep.it/enrico/gworkspace/gworkspace-0.8.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12c3ce725bbec9772d30d2ced8f64c12
diff --git a/metadata/md5-cache/gnustep-apps/displaycalibrator-0.7 b/metadata/md5-cache/gnustep-apps/displaycalibrator-0.7
index baf599c353ad..f4bc92e15f84 100644
--- a/metadata/md5-cache/gnustep-apps/displaycalibrator-0.7
+++ b/metadata/md5-cache/gnustep-apps/displaycalibrator-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xgamma >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.linuks.mine.nu/displaycalibrator/displaycalibrator-0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae4a9d443b9db688147b70e4ac733649
diff --git a/metadata/md5-cache/gnustep-apps/easydiff-0.3.1_pre20061115 b/metadata/md5-cache/gnustep-apps/easydiff-0.3.1_pre20061115
index 2ffaaa7f3202..7764d920a3bd 100644
--- a/metadata/md5-cache/gnustep-apps/easydiff-0.3.1_pre20061115
+++ b/metadata/md5-cache/gnustep-apps/easydiff-0.3.1_pre20061115
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/subversion >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/easydiff-0.3.1_pre20061115.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcd7ecca75d2129d141f6693f2bce810
diff --git a/metadata/md5-cache/gnustep-apps/easydiff-0.4.0 b/metadata/md5-cache/gnustep-apps/easydiff-0.4.0
index 3ff486c4ccf0..e9968d179da7 100644
--- a/metadata/md5-cache/gnustep-apps/easydiff-0.4.0
+++ b/metadata/md5-cache/gnustep-apps/easydiff-0.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=cvs? ( dev-vcs/cvs ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/EasyDiff-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=91b0c73cd507ef1afbaeda07196eb451
diff --git a/metadata/md5-cache/gnustep-apps/fisicalab-0.2 b/metadata/md5-cache/gnustep-apps/fisicalab-0.2
index 34cb42b38419..6df4243d0daa 100644
--- a/metadata/md5-cache/gnustep-apps/fisicalab-0.2
+++ b/metadata/md5-cache/gnustep-apps/fisicalab-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://nongnu/fisicalab/FisicaLab-0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edeb3176675efed4346b73ebc298e98e
diff --git a/metadata/md5-cache/gnustep-apps/fisicalab-0.2.1 b/metadata/md5-cache/gnustep-apps/fisicalab-0.2.1
index b04319cab89e..7d5420a53ddf 100644
--- a/metadata/md5-cache/gnustep-apps/fisicalab-0.2.1
+++ b/metadata/md5-cache/gnustep-apps/fisicalab-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://nongnu/fisicalab/FisicaLab-0.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f91e43d9ea8e7ffcef80d3cd67d38347
diff --git a/metadata/md5-cache/gnustep-apps/gemas-0.3 b/metadata/md5-cache/gnustep-apps/gemas-0.3
index 60b6676755c8..ad9f7b7ca103 100644
--- a/metadata/md5-cache/gnustep-apps/gemas-0.3
+++ b/metadata/md5-cache/gnustep-apps/gemas-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/Gemas-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c74da9c7e4538d78034d9f052de33d08
diff --git a/metadata/md5-cache/gnustep-apps/gmines-0.1-r2 b/metadata/md5-cache/gnustep-apps/gmines-0.1-r2
index d0a7aa5f8426..bf4856f8e8e3 100644
--- a/metadata/md5-cache/gnustep-apps/gmines-0.1-r2
+++ b/metadata/md5-cache/gnustep-apps/gmines-0.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.gnustep.it/marko/GMines/GMines.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8cdfd7d2d59c7ab1f84082e7cfd7c8a
diff --git a/metadata/md5-cache/gnustep-apps/gmines-0.2 b/metadata/md5-cache/gnustep-apps/gmines-0.2
index ecec1f2dc198..bc232791e156 100644
--- a/metadata/md5-cache/gnustep-apps/gmines-0.2
+++ b/metadata/md5-cache/gnustep-apps/gmines-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=616be1c6951f70801173f0dceb2d56ed
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.2.0 b/metadata/md5-cache/gnustep-apps/gnumail-1.2.0
index 8c5d601692be..5a3bd317477d 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.2.0
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/GNUMail-1.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e604e17de9069af09bf2b1d8977016f
diff --git a/metadata/md5-cache/gnustep-apps/gnumail-1.2.0_pre3-r1 b/metadata/md5-cache/gnustep-apps/gnumail-1.2.0_pre3-r1
index 91c1539f5980..4719dec13946 100644
--- a/metadata/md5-cache/gnustep-apps/gnumail-1.2.0_pre3-r1
+++ b/metadata/md5-cache/gnustep-apps/gnumail-1.2.0_pre3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.collaboration-world.com/gnumail.data/releases/Stable/GNUMail-1.2.0pre3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f961486ca29ebb46d21e6dbad9a3c4ff
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.16 b/metadata/md5-cache/gnustep-apps/gorm-1.2.16
index 0d38c4168a98..e5246154588e 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.16
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.18.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebaf3f696f63df508dc603f023698c4a
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.18 b/metadata/md5-cache/gnustep-apps/gorm-1.2.18
index f61576c8ca39..e5bbb2365330 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.18
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.18.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=435330fb78c81d2a39e06afc25a8d8cd
diff --git a/metadata/md5-cache/gnustep-apps/graphos-0.2 b/metadata/md5-cache/gnustep-apps/graphos-0.2
index 9176f6ab6889..399c7ff38502 100644
--- a/metadata/md5-cache/gnustep-apps/graphos-0.2
+++ b/metadata/md5-cache/gnustep-apps/graphos-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Graphos-0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77650a75240e4d1b35ddfa65cb2d6ca2
diff --git a/metadata/md5-cache/gnustep-apps/graphos-0.3 b/metadata/md5-cache/gnustep-apps/graphos-0.3
index 11461c81fda4..855b5df0a05b 100644
--- a/metadata/md5-cache/gnustep-apps/graphos-0.3
+++ b/metadata/md5-cache/gnustep-apps/graphos-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Graphos-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2981d8c222be2ff83f34aba29b27c1df
diff --git a/metadata/md5-cache/gnustep-apps/gshisen-1.3.0 b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0
index a8b24255debb..d02be2ab7e87 100644
--- a/metadata/md5-cache/gnustep-apps/gshisen-1.3.0
+++ b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/GShisen-1.3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24f113a00c3013472f6ff485f0f1b6fe
diff --git a/metadata/md5-cache/gnustep-apps/gspdf-0.4 b/metadata/md5-cache/gnustep-apps/gspdf-0.4
index 1ac9b3eb31de..c2c0b368e53e 100644
--- a/metadata/md5-cache/gnustep-apps/gspdf-0.4
+++ b/metadata/md5-cache/gnustep-apps/gspdf-0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/GSPdf-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22768b599b5535abeb731587b0d12cfe
diff --git a/metadata/md5-cache/gnustep-apps/gspdf-0.5 b/metadata/md5-cache/gnustep-apps/gspdf-0.5
index 6176e972c82b..89e7c0d6e0c8 100644
--- a/metadata/md5-cache/gnustep-apps/gspdf-0.5
+++ b/metadata/md5-cache/gnustep-apps/gspdf-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/GSPdf-0.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a250c7e40e146637517bd9af3dc1075
diff --git a/metadata/md5-cache/gnustep-apps/gwnet-0.1.0.8.2 b/metadata/md5-cache/gnustep-apps/gwnet-0.1.0.8.2
index dd9d1d936807..a4d1670b7b9e 100644
--- a/metadata/md5-cache/gnustep-apps/gwnet-0.1.0.8.2
+++ b/metadata/md5-cache/gnustep-apps/gwnet-0.1.0.8.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnustep-libs/smbkit >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/gworkspace-0.8.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a943e7895c87562584af41cbe56d9dd
diff --git a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0 b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
index 09116c803c97..da261dba27d6 100644
--- a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
+++ b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed5117a5e8a719ccd1e6673dff6b9f19
diff --git a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.1 b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.1
index 6027605bb6c1..0519ca1b6c8f 100644
--- a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.1
+++ b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=137980712d84c040afc6c5c8b9596ee9
diff --git a/metadata/md5-cache/gnustep-apps/keyarcher-0.1 b/metadata/md5-cache/gnustep-apps/keyarcher-0.1
index 7208dda1b061..0be5cfe4f773 100644
--- a/metadata/md5-cache/gnustep-apps/keyarcher-0.1
+++ b/metadata/md5-cache/gnustep-apps/keyarcher-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/pmanager/0.2/KeyArcher-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef82a271d27cb94c98c4a2fc8fe767ce
diff --git a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2 b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
index 1a5ff83e2399..bde610e5d918 100644
--- a/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
+++ b/metadata/md5-cache/gnustep-apps/lapispuzzle-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/LapisPuzzle-1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3495db77c8442b136ecbe8173d7d55dd
diff --git a/metadata/md5-cache/gnustep-apps/laternamagica-0.4 b/metadata/md5-cache/gnustep-apps/laternamagica-0.4
index bc4926cad974..dfd38fbc79f7 100644
--- a/metadata/md5-cache/gnustep-apps/laternamagica-0.4
+++ b/metadata/md5-cache/gnustep-apps/laternamagica-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/LaternaMagica-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10dd48d4c87347c8a33d30f4ecb168c5
diff --git a/metadata/md5-cache/gnustep-apps/pictureframe-1.0.0 b/metadata/md5-cache/gnustep-apps/pictureframe-1.0.0
index 03f340142d2a..ee8022bd7973 100644
--- a/metadata/md5-cache/gnustep-apps/pictureframe-1.0.0
+++ b/metadata/md5-cache/gnustep-apps/pictureframe-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=060ae0810f42db647b376f15ecc25cf5
diff --git a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.2 b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.2
index 915fdb4603f8..bcecc856ac6e 100644
--- a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.2
+++ b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dd98a9816c80efd3d4f6e59ae8ed840
diff --git a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3 b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
index a786ab06ec29..cc6985ef89b9 100644
--- a/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
+++ b/metadata/md5-cache/gnustep-apps/pictureframe-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fb1aca1a1a51dcb4a5ff313b07b97fa
diff --git a/metadata/md5-cache/gnustep-apps/plconv-0.1 b/metadata/md5-cache/gnustep-apps/plconv-0.1
index cdd08c655c47..94e3002c439f 100644
--- a/metadata/md5-cache/gnustep-apps/plconv-0.1
+++ b/metadata/md5-cache/gnustep-apps/plconv-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/pmanager/0.2/plconv-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdbc74ff60efced6582450116edef7e5
diff --git a/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20061204-r1 b/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20061204-r1
index 9e4893c86ea8..c55d7011bfd3 100644
--- a/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20061204-r1
+++ b/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20061204-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=~gnustep-libs/prefsmodule-1.1.1_pre20061204 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/preferences-1.3.0_pre20061204.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5b193935cddb31c34099dcd0367262c
diff --git a/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20100523 b/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20100523
index 4ed0b38f7d70..146c58d12f50 100644
--- a/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20100523
+++ b/metadata/md5-cache/gnustep-apps/preferences-1.3.0_pre20100523
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/preferences-1.3.0_pre20100523.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fb2e87c75543ffa57464a88a2439e59
diff --git a/metadata/md5-cache/gnustep-apps/preview-0.8.5-r1 b/metadata/md5-cache/gnustep-apps/preview-0.8.5-r1
index e218692155de..9860d50e6ad0 100644
--- a/metadata/md5-cache/gnustep-apps/preview-0.8.5-r1
+++ b/metadata/md5-cache/gnustep-apps/preview-0.8.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gsimageapps/Preview-0.8.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c38e5f46090278981bbe034617f821f
diff --git a/metadata/md5-cache/gnustep-apps/preview-0.9 b/metadata/md5-cache/gnustep-apps/preview-0.9
index d090518be11f..f61edde9cb89 100644
--- a/metadata/md5-cache/gnustep-apps/preview-0.9
+++ b/metadata/md5-cache/gnustep-apps/preview-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.sonappart.net/softwares/preview/download/Preview-0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f0612d1eafc0b748c3f6e8d7c6c60d2
diff --git a/metadata/md5-cache/gnustep-apps/price-1.0.0 b/metadata/md5-cache/gnustep-apps/price-1.0.0
index bfba299e88aa..871208f72682 100644
--- a/metadata/md5-cache/gnustep-apps/price-1.0.0
+++ b/metadata/md5-cache/gnustep-apps/price-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/price/PRICE-1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e95e9f8ee65bee029c1dd1bc429bbc7a
diff --git a/metadata/md5-cache/gnustep-apps/price-1.1.0 b/metadata/md5-cache/gnustep-apps/price-1.1.0
index b0af94d29247..d7b52c45b396 100644
--- a/metadata/md5-cache/gnustep-apps/price-1.1.0
+++ b/metadata/md5-cache/gnustep-apps/price-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/price/PRICE-1.1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9e6c1ff2f22c2fcceadbcba6e205bc0
diff --git a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.0 b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.0
index 66eed8e193e9..71adf60f2b4f 100644
--- a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.0
+++ b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/gdb-6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://ftpmain.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-0.6.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f11cac6d99be937eeecbf81eb4ab337
diff --git a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.1 b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.1
index c9d6797a6dee..9e37a64a0798 100644
--- a/metadata/md5-cache/gnustep-apps/projectcenter-0.6.1
+++ b/metadata/md5-cache/gnustep-apps/projectcenter-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/gdb-6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://ftpmain.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-0.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77073c28294462eba9281748d2d4f369
diff --git a/metadata/md5-cache/gnustep-apps/projectmanager-0.2 b/metadata/md5-cache/gnustep-apps/projectmanager-0.2
index 351d241ccbf3..2dd12fee3c52 100644
--- a/metadata/md5-cache/gnustep-apps/projectmanager-0.2
+++ b/metadata/md5-cache/gnustep-apps/projectmanager-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnustep-apps/keyarcher gnustep-apps/plconv gnustep-libs/highlighterkit gnustep-libs/wizardkit >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/pmanager/0.2/ProjectManager-0.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ff0c580129ccb69d25a2a0ada112abf
diff --git a/metadata/md5-cache/gnustep-apps/remotedesk-0.1 b/metadata/md5-cache/gnustep-apps/remotedesk-0.1
index 1f0d435039f0..17a283a4a9e8 100644
--- a/metadata/md5-cache/gnustep-apps/remotedesk-0.1
+++ b/metadata/md5-cache/gnustep-apps/remotedesk-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/rdesktop >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/RemoteDesk-0.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=807470845317369b74482e383a899080
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.36 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.36
index f68d624e3a97..cb1cbcec9056 100644
--- a/metadata/md5-cache/gnustep-apps/simpleagenda-0.36
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.36
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libical >=virtual/gnustep-back-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.36.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34400a492061a9be743f47c2da313d49
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42
index 4a21e4fc73a0..744acb044272 100644
--- a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.42.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adf70d0fb463defdbbc51ee07881036f
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
index 24db027af931..e3cf4e2cc2d0 100644
--- a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.42.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50a0d50b9e955a89d52033db36631f22
diff --git a/metadata/md5-cache/gnustep-apps/stepulator-1.0-r2 b/metadata/md5-cache/gnustep-apps/stepulator-1.0-r2
index 2525c33d891e..9a364b955956 100644
--- a/metadata/md5-cache/gnustep-apps/stepulator-1.0-r2
+++ b/metadata/md5-cache/gnustep-apps/stepulator-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.linuks.mine.nu/stepulator/stepulator-gs-1.0.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0ae1f835aab75e142df9db2829fec39
diff --git a/metadata/md5-cache/gnustep-apps/sudoku-0.6 b/metadata/md5-cache/gnustep-apps/sudoku-0.6
index 2ba9793d538d..00cb12c8aebe 100644
--- a/metadata/md5-cache/gnustep-apps/sudoku-0.6
+++ b/metadata/md5-cache/gnustep-apps/sudoku-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/Sudoku6.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8dda4aebdeb55a4e2d56fdebc0451084
diff --git a/metadata/md5-cache/gnustep-apps/sudoku-0.7 b/metadata/md5-cache/gnustep-apps/sudoku-0.7
index 616c25752d83..adc618cae2b3 100644
--- a/metadata/md5-cache/gnustep-apps/sudoku-0.7
+++ b/metadata/md5-cache/gnustep-apps/sudoku-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Sudoku-0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0877522b38ee83cd6f1a374b9be59234
diff --git a/metadata/md5-cache/gnustep-apps/systempreferences-1.0.2 b/metadata/md5-cache/gnustep-apps/systempreferences-1.0.2
index 6d07c8686480..3d0ced06f890 100644
--- a/metadata/md5-cache/gnustep-apps/systempreferences-1.0.2
+++ b/metadata/md5-cache/gnustep-apps/systempreferences-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-1.0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4951035ba94b9e22485d85f9d4d68428
diff --git a/metadata/md5-cache/gnustep-apps/systempreferences-1.1.0 b/metadata/md5-cache/gnustep-apps/systempreferences-1.1.0
index 48a52db53aa0..5e42c99b19ee 100644
--- a/metadata/md5-cache/gnustep-apps/systempreferences-1.1.0
+++ b/metadata/md5-cache/gnustep-apps/systempreferences-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-1.1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69b60fb13f3648155f347ed10746ed9b
diff --git a/metadata/md5-cache/gnustep-apps/terminal-0.9.7 b/metadata/md5-cache/gnustep-apps/terminal-0.9.7
index adbf75b68ee1..d4322a825537 100644
--- a/metadata/md5-cache/gnustep-apps/terminal-0.9.7
+++ b/metadata/md5-cache/gnustep-apps/terminal-0.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-terms/terminal >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Terminal-0.9.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80a1a5bdca382277c05cdc5f7928775a
diff --git a/metadata/md5-cache/gnustep-apps/terminal-0.9.8 b/metadata/md5-cache/gnustep-apps/terminal-0.9.8
index 50f5aa803ae1..983529918785 100644
--- a/metadata/md5-cache/gnustep-apps/terminal-0.9.8
+++ b/metadata/md5-cache/gnustep-apps/terminal-0.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-terms/terminal >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Terminal-0.9.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c7f05afb668919d01f880ce02d38e9d
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20060928 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20060928
index 2c83cd18d005..fb4fed4f30ca 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20060928
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20060928
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/textedit-0.95_pre20060928.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9af55f1c999dcf0028c14d3b14013860
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427
index c8d331c77e05..848c8a88ae99 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8991d950cbf0a439de5da663a47a6d13
diff --git a/metadata/md5-cache/gnustep-apps/vindaloo-0.4.1 b/metadata/md5-cache/gnustep-apps/vindaloo-0.4.1
index 70351875ff6c..27e75cebca50 100644
--- a/metadata/md5-cache/gnustep-apps/vindaloo-0.4.1
+++ b/metadata/md5-cache/gnustep-apps/vindaloo-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-libs/popplerkit-0.4.1 >=gnustep-libs/iconkit-0.4.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/etoile/etoile-0.4.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=664df8cfef6de1513bac3ca4eefae000
diff --git a/metadata/md5-cache/gnustep-apps/zipper-1.3 b/metadata/md5-cache/gnustep-apps/zipper-1.3
index fa5d49ff8bea..16d29d7304fd 100644
--- a/metadata/md5-cache/gnustep-apps/zipper-1.3
+++ b/metadata/md5-cache/gnustep-apps/zipper-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnustep-libs/renaissance >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://xanthippe.dyndns.org/Zipper/Zipper-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=674b39cefc29c211f3f35bbd1479be6b
diff --git a/metadata/md5-cache/gnustep-apps/zipper-1.4 b/metadata/md5-cache/gnustep-apps/zipper-1.4
index 57f06f1fad49..2cbd63b29088 100644
--- a/metadata/md5-cache/gnustep-apps/zipper-1.4
+++ b/metadata/md5-cache/gnustep-apps/zipper-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Zipper-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c07b7b72b19b38b2973471a459e68ee
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.18.0 b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.18.0
index 86ab23f44667..120550eff0ba 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.18.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.18.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) ~gnustep-base/gnustep-gui-0.18.0 opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender dev-libs/expat media-libs/fontconfig >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.18.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dc21b98a7da6a6c01fad6dfde22243d
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
index bc6e66391bfb..7e5f544eef46 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5d7769e382b52b1223eb984fc44c479
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.18.0 b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.18.0
index 8024f16bd136..467baa08a4d8 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.18.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) ~gnustep-base/gnustep-gui-0.18.0 opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.18.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c91fc65b1b3dc97e1fd6587c0d3463aa
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
index 0ceba76012b7..c92fb363179e 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32f0bee605b3b5fa0237e0825b75241f
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.18.0 b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.18.0
index e78bc475a369..259a96b2c068 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.18.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.18.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) ~gnustep-base/gnustep-gui-0.18.0 opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender dev-libs/expat media-libs/fontconfig >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.18.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76ff021e89ea3bed6492d878ba1739c1
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
index 7975e84b2dc4..a59c311db060 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36d4c03896382913af6d5bc71e23d2e0
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.20.1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.20.1
index 67c2d930fca2..80e10bc8e2a6 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.20.1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.0.8 !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 >=dev-libs/openssl-0.9.7 >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.20.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26f55064f9d7677dc4e4bbf12402155c
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
index b92c2375f5f9..dcc07af734f4 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 icu? ( >=dev-libs/icu-4.0 ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 >=dev-libs/openssl-0.9.7 >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe5276eb2061bff09c1ac662f14226ed
diff --git a/metadata/md5-cache/gnustep-base/gnustep-gui-0.18.0 b/metadata/md5-cache/gnustep-base/gnustep-gui-0.18.0
index 87395cad74cd..fac3012681ef 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-gui-0.18.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-gui-0.18.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-base-1.20.0 x11-libs/libXt >=media-libs/tiff-3 jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1 ) png? ( >=media-libs/libpng-1.2 ) cups? ( >=net-print/cups-1.1 ) media-libs/audiofile app-text/aspell
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.18.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba619127d978c2af3949ff0e2271d99e
diff --git a/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
index 938460793a97..0b1b6cc59e66 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.0 media-libs/audiofile >=media-libs/tiff-3 x11-libs/libXt cups? ( >=net-print/cups-1.1 ) gif? ( >=media-libs/giflib-4.1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2 ) speech? ( app-accessibility/flite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.22.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4cdc5e5b7d82fcdce6521136a11e0c5
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.4.0 b/metadata/md5-cache/gnustep-base/gnustep-make-2.4.0
index 76c121d5981a..c71521cd071f 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.4.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea9adb11232c755971c7f6686487fff1
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0
index 46ff8cbb2ff6..04ddd168a028 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c7ee89988ce99d6849853df35e127bb
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1
index c28be4491cea..a542c2e2f8fc 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25210804882c6c7fa00a76a136412cd1
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
index a28038a5e341..4a00f6eb1c15 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2048639e88fca8caf1786d85b8f384b8
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1
index be6a6acefe59..350bf1488508 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77cb868d6b7d22ad8747a3d553f791b0
diff --git a/metadata/md5-cache/gnustep-base/mknfonts-0.5-r1 b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r1
index 9f38ccd8c874..ed464324ab5f 100644
--- a/metadata/md5-cache/gnustep-base/mknfonts-0.5-r1
+++ b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d71b3f6aca3c4dd395f892a52033ded3
diff --git a/metadata/md5-cache/gnustep-libs/camerakit-0.0.1.20041011-r1 b/metadata/md5-cache/gnustep-libs/camerakit-0.0.1.20041011-r1
index 34eecef2bf69..f043f5ee2928 100644
--- a/metadata/md5-cache/gnustep-libs/camerakit-0.0.1.20041011-r1
+++ b/metadata/md5-cache/gnustep-libs/camerakit-0.0.1.20041011-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libgphoto2-2.1.3-r1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gsimageapps/CameraKit-20041011.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a48bf195e0a62f996247bfb9ddbf2c9
diff --git a/metadata/md5-cache/gnustep-libs/cddb-0.2 b/metadata/md5-cache/gnustep-libs/cddb-0.2
index 60f020e52e32..757853c42eef 100644
--- a/metadata/md5-cache/gnustep-libs/cddb-0.2
+++ b/metadata/md5-cache/gnustep-libs/cddb-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsburn/cddb.bundle-0.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73ada247e2ca9daa96c37204d310971f
diff --git a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.8.2 b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.8.2
index 162be70753a8..dec4618ca972 100644
--- a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.8.2
+++ b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.8.2
@@ -8,5 +8,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhfInterservice/download/source/CenonLibrary-3.82-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ca0a3cc72b4d76658cc5b9d2b679c32
diff --git a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4 b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
index b8949ac9523e..755f35e9f8ad 100644
--- a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
+++ b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
@@ -9,5 +9,5 @@ LICENSE=Cenon
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-3.9.4-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f65fc62e9943cb53813ad5e4f701ef2
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
index 48eef5f53064..78f50a001f76 100644
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1
+++ b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5833bc23a748fc18c8039050c1d854e9
diff --git a/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219 b/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
index d91ae4ed8cbb..bbc53db753e8 100644
--- a/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
+++ b/metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/gsldap-0.0.1_pre20070219.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b88894172f80d18ec5015baa05c56643
diff --git a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1 b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1
index 7addc122ddb0..3eb1bf35861c 100644
--- a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1
+++ b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/pmanager/0.2/HighlighterKit-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0cba6bbba215b89b4d8366552ceedf0
diff --git a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2 b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
index ab3c09806677..7c1a810585fb 100644
--- a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
+++ b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/HighlighterKit-0.1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f27c2eb2362d04f1ec65bd5c315d05f
diff --git a/metadata/md5-cache/gnustep-libs/iconkit-0.4.1 b/metadata/md5-cache/gnustep-libs/iconkit-0.4.1
index 1121b0a3c42f..355c5a770c85 100644
--- a/metadata/md5-cache/gnustep-libs/iconkit-0.4.1
+++ b/metadata/md5-cache/gnustep-libs/iconkit-0.4.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/libpng >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/etoile/etoile-0.4.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e7f4b43f7480618f3086f0684bb357f
diff --git a/metadata/md5-cache/gnustep-libs/netclasses-1.06-r1 b/metadata/md5-cache/gnustep-libs/netclasses-1.06-r1
index 6cc203ba4071..730676b3b636 100644
--- a/metadata/md5-cache/gnustep-libs/netclasses-1.06-r1
+++ b/metadata/md5-cache/gnustep-libs/netclasses-1.06-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/netclasses/netclasses-1.06.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0db2f3f1a5e129d6d542dc6acb457001
diff --git a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0 b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0
index 98197f8bf6bc..35070f122f26 100644
--- a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0
+++ b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 Elm
 RDEPEND=dev-libs/openssl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/Pantomime-1.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d195ef9e48d4fbf80981e17875e3ed8
diff --git a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3 b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3
index 98aae1865f6b..cb19a72c259f 100644
--- a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3
+++ b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 Elm
 RDEPEND=dev-libs/openssl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.collaboration-world.com/pantomime.data/releases/Stable/Pantomime-1.2.0pre3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=442f007e8839c7f3acbf020098bc4452
diff --git a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3-r1 b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3-r1
index 73dddac625cc..c6c0e70f7ae9 100644
--- a/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3-r1
+++ b/metadata/md5-cache/gnustep-libs/pantomime-1.2.0_pre3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 Elm
 RDEPEND=dev-libs/openssl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.collaboration-world.com/pantomime.data/releases/Stable/Pantomime-1.2.0pre3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b019bdef15c7b352dadf151faee06f60
diff --git a/metadata/md5-cache/gnustep-libs/popplerkit-0.4.1 b/metadata/md5-cache/gnustep-libs/popplerkit-0.4.1
index ae981e347d7a..cd462e8bd5eb 100644
--- a/metadata/md5-cache/gnustep-libs/popplerkit-0.4.1
+++ b/metadata/md5-cache/gnustep-libs/popplerkit-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[xpdf-headers] >=media-libs/freetype-2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/etoile/etoile-0.4.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d2e1a03d4b9c97d448dbca5a582e5cf
diff --git a/metadata/md5-cache/gnustep-libs/prefsmodule-1.1.1_pre20061204-r1 b/metadata/md5-cache/gnustep-libs/prefsmodule-1.1.1_pre20061204-r1
index 901f9eaaa8ba..3c0de2615d04 100644
--- a/metadata/md5-cache/gnustep-libs/prefsmodule-1.1.1_pre20061204-r1
+++ b/metadata/md5-cache/gnustep-libs/prefsmodule-1.1.1_pre20061204-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/prefsmodule-1.1.1_pre20061204.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31b0208fcaa9705fc0121d0b9ecfd85e
diff --git a/metadata/md5-cache/gnustep-libs/renaissance-0.9.0 b/metadata/md5-cache/gnustep-libs/renaissance-0.9.0
index 48727fae22d3..c1c229347070 100644
--- a/metadata/md5-cache/gnustep-libs/renaissance-0.9.0
+++ b/metadata/md5-cache/gnustep-libs/renaissance-0.9.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.gnustep.it/Renaissance/Download/Renaissance-0.9.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=742a8911c8c31fb868f10addf09120ce
diff --git a/metadata/md5-cache/gnustep-libs/smbkit-0.0.1.20061010 b/metadata/md5-cache/gnustep-libs/smbkit-0.0.1.20061010
index 0ee189a5ca5f..8bfe72d2e54b 100644
--- a/metadata/md5-cache/gnustep-libs/smbkit-0.0.1.20061010
+++ b/metadata/md5-cache/gnustep-libs/smbkit-0.0.1.20061010
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=net-fs/samba >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/smbkit-0.0.1.20061010.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6142a6282b5fe45d1f8b9c3780bdf61e
diff --git a/metadata/md5-cache/gnustep-libs/wizardkit-0.1 b/metadata/md5-cache/gnustep-libs/wizardkit-0.1
index 798cdead0df4..722682f49e38 100644
--- a/metadata/md5-cache/gnustep-libs/wizardkit-0.1
+++ b/metadata/md5-cache/gnustep-libs/wizardkit-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/pmanager/0.2/WizardKit-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b94cbee079c2c6ad7ca7f03bf491862
diff --git a/metadata/md5-cache/kde-base/activitymanager-4.7.4 b/metadata/md5-cache/kde-base/activitymanager-4.7.4
index e6b58888aa9d..6a8af09d7ae3 100644
--- a/metadata/md5-cache/kde-base/activitymanager-4.7.4
+++ b/metadata/md5-cache/kde-base/activitymanager-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f83cf27eda9010cd3fbfe7c6da1c2305
diff --git a/metadata/md5-cache/kde-base/akonadi-4.4.11.1 b/metadata/md5-cache/kde-base/akonadi-4.4.11.1
index df58954cae9a..81262064f75d 100644
--- a/metadata/md5-cache/kde-base/akonadi-4.4.11.1
+++ b/metadata/md5-cache/kde-base/akonadi-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-office/akonadi-server-1.3.1 >=kde-base/kdelibs-4.6:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] !kde-base/kdemaildir:4 !<kde-base/kdepim-kresources-4.2.95:4 >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b87608706463c11025bafcd082ca2cc3
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.7.4 b/metadata/md5-cache/kde-base/akonadiconsole-4.7.4
index 879718bc6c4d..510ff9cbd319 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.7.4
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=81dc24c52af8d84f76131b62f244efa6
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.8.3 b/metadata/md5-cache/kde-base/akonadiconsole-4.8.3
index 2b99a31fd01f..22c48b730f85 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.8.3
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6c33744ccf06e37f97da4e80391ac4c5
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.8.4 b/metadata/md5-cache/kde-base/akonadiconsole-4.8.4
index e55738ff976a..cea805e64199 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.8.4
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d1d5949abbeb5645f610c3d442da7be
diff --git a/metadata/md5-cache/kde-base/akregator-4.4.11.1 b/metadata/md5-cache/kde-base/akregator-4.4.11.1
index 539767bfea03..307b18513ae9 100644
--- a/metadata/md5-cache/kde-base/akregator-4.4.11.1
+++ b/metadata/md5-cache/kde-base/akregator-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=] >=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b2ec2ec0ced0f49c4d19f520a92d905a
diff --git a/metadata/md5-cache/kde-base/akregator-4.4.11.1-r1 b/metadata/md5-cache/kde-base/akregator-4.4.11.1-r1
index 38593d064196..5286fb9de622 100644
--- a/metadata/md5-cache/kde-base/akregator-4.4.11.1-r1
+++ b/metadata/md5-cache/kde-base/akregator-4.4.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=] >=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=11b87e142064168a556169ddeec9f458
diff --git a/metadata/md5-cache/kde-base/akregator-4.7.4 b/metadata/md5-cache/kde-base/akregator-4.7.4
index c13a208cc4d8..b41a102e6b01 100644
--- a/metadata/md5-cache/kde-base/akregator-4.7.4
+++ b/metadata/md5-cache/kde-base/akregator-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] kontact? ( >=kde-base/kontact-4.7.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d27ee88b022247fca0718e3a160b4010
diff --git a/metadata/md5-cache/kde-base/akregator-4.8.3 b/metadata/md5-cache/kde-base/akregator-4.8.3
index bc24269092f4..df0bbf3362a4 100644
--- a/metadata/md5-cache/kde-base/akregator-4.8.3
+++ b/metadata/md5-cache/kde-base/akregator-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] kontact? ( >=kde-base/kontact-4.8.3:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=117b66413e28930b9b1689af6176e9bb
diff --git a/metadata/md5-cache/kde-base/akregator-4.8.4 b/metadata/md5-cache/kde-base/akregator-4.8.4
index 0a476e871e4f..3276fc38abd6 100644
--- a/metadata/md5-cache/kde-base/akregator-4.8.4
+++ b/metadata/md5-cache/kde-base/akregator-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] kontact? ( >=kde-base/kontact-4.8.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=90361e788ed965c06460313abc17c48e
diff --git a/metadata/md5-cache/kde-base/amor-4.7.4 b/metadata/md5-cache/kde-base/amor-4.7.4
index cb518c6864a8..f9c624b41ee7 100644
--- a/metadata/md5-cache/kde-base/amor-4.7.4
+++ b/metadata/md5-cache/kde-base/amor-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdetoys-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2292a16214b756917bccef9eed9cbed3
diff --git a/metadata/md5-cache/kde-base/amor-4.8.3 b/metadata/md5-cache/kde-base/amor-4.8.3
index cf36dc4773a3..1a3a35fc91bb 100644
--- a/metadata/md5-cache/kde-base/amor-4.8.3
+++ b/metadata/md5-cache/kde-base/amor-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdetoys-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c371d611261025178137b2e679f847b2
diff --git a/metadata/md5-cache/kde-base/amor-4.8.4 b/metadata/md5-cache/kde-base/amor-4.8.4
index 197e252dae0f..b38066c794e2 100644
--- a/metadata/md5-cache/kde-base/amor-4.8.4
+++ b/metadata/md5-cache/kde-base/amor-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdetoys-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7e09cc8f77c5c64834af48c90a9b2f7b
diff --git a/metadata/md5-cache/kde-base/analitza-4.8.3 b/metadata/md5-cache/kde-base/analitza-4.8.3
index 8e6367646753..f905285036d9 100644
--- a/metadata/md5-cache/kde-base/analitza-4.8.3
+++ b/metadata/md5-cache/kde-base/analitza-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=readline? ( sys-libs/readline ) !<=kde-base/kalgebra-4.7.50:4 >=kde-base
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/analitza-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a4c6b8281fbac724664af906ada07ff6
diff --git a/metadata/md5-cache/kde-base/analitza-4.8.4 b/metadata/md5-cache/kde-base/analitza-4.8.4
index a982eba7b753..7494430963b9 100644
--- a/metadata/md5-cache/kde-base/analitza-4.8.4
+++ b/metadata/md5-cache/kde-base/analitza-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=readline? ( sys-libs/readline ) !<=kde-base/kalgebra-4.7.50:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/analitza-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2447feaf5e5b66e641c835787eb1cb61
diff --git a/metadata/md5-cache/kde-base/ark-4.7.4 b/metadata/md5-cache/kde-base/ark-4.7.4
index b1b6ef314ae8..0df3fc75df40 100644
--- a/metadata/md5-cache/kde-base/ark-4.7.4
+++ b/metadata/md5-cache/kde-base/ark-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] sys-libs/zlib archive? ( >=app-arch/li
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dc13c5702050749879d9f93052fd5409
diff --git a/metadata/md5-cache/kde-base/ark-4.8.3 b/metadata/md5-cache/kde-base/ark-4.8.3
index 4fab20ac940e..9cf108ddc87a 100644
--- a/metadata/md5-cache/kde-base/ark-4.8.3
+++ b/metadata/md5-cache/kde-base/ark-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/ark-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1cd0debdc04a22dbde5e8e2ec04d7f2b
diff --git a/metadata/md5-cache/kde-base/ark-4.8.4 b/metadata/md5-cache/kde-base/ark-4.8.4
index a8fa110758ab..b9f0ae477aef 100644
--- a/metadata/md5-cache/kde-base/ark-4.8.4
+++ b/metadata/md5-cache/kde-base/ark-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/ark-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d8695ea8f1ac04e48175a0ff9259243e
diff --git a/metadata/md5-cache/kde-base/attica-4.7.4 b/metadata/md5-cache/kde-base/attica-4.7.4
index 421ea6170615..fcef3a97b3b1 100644
--- a/metadata/md5-cache/kde-base/attica-4.7.4
+++ b/metadata/md5-cache/kde-base/attica-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6576922301d858147f757ee07e04eea3
diff --git a/metadata/md5-cache/kde-base/attica-4.8.3 b/metadata/md5-cache/kde-base/attica-4.8.3
index 7af8dffd1c8d..8bc7d55e6da5 100644
--- a/metadata/md5-cache/kde-base/attica-4.8.3
+++ b/metadata/md5-cache/kde-base/attica-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b67d82d3995d617f9c2571ebaebaf0cb
diff --git a/metadata/md5-cache/kde-base/attica-4.8.4 b/metadata/md5-cache/kde-base/attica-4.8.4
index 60fbd291e4a8..4a0c7c4104d7 100644
--- a/metadata/md5-cache/kde-base/attica-4.8.4
+++ b/metadata/md5-cache/kde-base/attica-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a24515249f463c4d65e08e2e01a17c4a
diff --git a/metadata/md5-cache/kde-base/blinken-4.7.4 b/metadata/md5-cache/kde-base/blinken-4.7.4
index ebf327760c8e..ce43d66b28a3 100644
--- a/metadata/md5-cache/kde-base/blinken-4.7.4
+++ b/metadata/md5-cache/kde-base/blinken-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.7.4:4[aqua=] >=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/blinken-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9501ae0b7a2cd8616e1903109c175dfb
diff --git a/metadata/md5-cache/kde-base/blinken-4.8.3 b/metadata/md5-cache/kde-base/blinken-4.8.3
index fd8e0de67f44..3a61aca2fe39 100644
--- a/metadata/md5-cache/kde-base/blinken-4.8.3
+++ b/metadata/md5-cache/kde-base/blinken-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.8.3:4[aqua=] >=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/blinken-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=989373b520ac06c0a9a232aa3e7a9e65
diff --git a/metadata/md5-cache/kde-base/blinken-4.8.4 b/metadata/md5-cache/kde-base/blinken-4.8.4
index edd025067aff..fc7b47a99827 100644
--- a/metadata/md5-cache/kde-base/blinken-4.8.4
+++ b/metadata/md5-cache/kde-base/blinken-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.8.4:4[aqua=] >=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/blinken-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8f3e525dde0f4f66342985c70a074235
diff --git a/metadata/md5-cache/kde-base/blogilo-4.4.11.1 b/metadata/md5-cache/kde-base/blogilo-4.4.11.1
index fb3e3740ede1..cbea1f68a973 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.4.11.1
+++ b/metadata/md5-cache/kde-base/blogilo-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] !kde-misc/bilbo !kde-misc/blogilo >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4.11.1:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2aa636a857383328cd38d20c59cd9425
diff --git a/metadata/md5-cache/kde-base/blogilo-4.7.4 b/metadata/md5-cache/kde-base/blogilo-4.7.4
index 31788a35c29f..18f229b04386 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.7.4
+++ b/metadata/md5-cache/kde-base/blogilo-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=47410f3837f7423b035c2330f75d21c8
diff --git a/metadata/md5-cache/kde-base/blogilo-4.8.3 b/metadata/md5-cache/kde-base/blogilo-4.8.3
index ca8c8bca1e5d..741e80548ad6 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.8.3
+++ b/metadata/md5-cache/kde-base/blogilo-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f45a9a7119e04e1c8524c882334843f6
diff --git a/metadata/md5-cache/kde-base/blogilo-4.8.4 b/metadata/md5-cache/kde-base/blogilo-4.8.4
index 4bc20a723164..aa0894ac9ee5 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.8.4
+++ b/metadata/md5-cache/kde-base/blogilo-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a3d61aaded9d30440e8a8c5b0fccc3a5
diff --git a/metadata/md5-cache/kde-base/bomber-4.7.4 b/metadata/md5-cache/kde-base/bomber-4.7.4
index d6304623f0f1..ffdbeccc885c 100644
--- a/metadata/md5-cache/kde-base/bomber-4.7.4
+++ b/metadata/md5-cache/kde-base/bomber-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2177391cfd4291ea87e00859a99cc923
diff --git a/metadata/md5-cache/kde-base/bomber-4.8.3 b/metadata/md5-cache/kde-base/bomber-4.8.3
index 1476f509351c..c38ba1706548 100644
--- a/metadata/md5-cache/kde-base/bomber-4.8.3
+++ b/metadata/md5-cache/kde-base/bomber-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=30e066b95daf2cb2c52136d7f82833cf
diff --git a/metadata/md5-cache/kde-base/bomber-4.8.4 b/metadata/md5-cache/kde-base/bomber-4.8.4
index 8ef723c7242f..bd637ec31bf0 100644
--- a/metadata/md5-cache/kde-base/bomber-4.8.4
+++ b/metadata/md5-cache/kde-base/bomber-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=38b8d4510d92959b2086ca1a94df79e3
diff --git a/metadata/md5-cache/kde-base/bovo-4.7.4 b/metadata/md5-cache/kde-base/bovo-4.7.4
index d3b53dd8c5eb..54f43296e35f 100644
--- a/metadata/md5-cache/kde-base/bovo-4.7.4
+++ b/metadata/md5-cache/kde-base/bovo-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0b59eef7b2fad2ca07c1b3d072315529
diff --git a/metadata/md5-cache/kde-base/bovo-4.8.3 b/metadata/md5-cache/kde-base/bovo-4.8.3
index da99d5a93ffa..e22ec93a3cb5 100644
--- a/metadata/md5-cache/kde-base/bovo-4.8.3
+++ b/metadata/md5-cache/kde-base/bovo-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51472b81f409f590f0511a08617e4785
diff --git a/metadata/md5-cache/kde-base/bovo-4.8.4 b/metadata/md5-cache/kde-base/bovo-4.8.4
index 7cf59b565e5a..380336ad42d2 100644
--- a/metadata/md5-cache/kde-base/bovo-4.8.4
+++ b/metadata/md5-cache/kde-base/bovo-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5b963fb53d6652d3ba86fb159b7a0a53
diff --git a/metadata/md5-cache/kde-base/cantor-4.7.4 b/metadata/md5-cache/kde-base/cantor-4.7.4
index 616a343d2cc8..dbb6c847dbc1 100644
--- a/metadata/md5-cache/kde-base/cantor-4.7.4
+++ b/metadata/md5-cache/kde-base/cantor-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=postscript? ( app-text/libspectre ) R? ( dev-lang/R ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/cantor-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f203deaa9b5a3442c8f3f62e23b6c734
diff --git a/metadata/md5-cache/kde-base/cantor-4.8.3 b/metadata/md5-cache/kde-base/cantor-4.8.3
index a6f52929520c..33d17a4a4943 100644
--- a/metadata/md5-cache/kde-base/cantor-4.8.3
+++ b/metadata/md5-cache/kde-base/cantor-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=analitza? ( >=kde-base/analitza-4.8.3:4[aqua=] ) postscript? ( app-text/libspectre ) R? ( dev-lang/R ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/cantor-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=227f8d02b0d417e9b6cab8716ba68bfb
diff --git a/metadata/md5-cache/kde-base/cantor-4.8.4 b/metadata/md5-cache/kde-base/cantor-4.8.4
index 1616f6d66b42..aaca01aa9825 100644
--- a/metadata/md5-cache/kde-base/cantor-4.8.4
+++ b/metadata/md5-cache/kde-base/cantor-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=analitza? ( >=kde-base/analitza-4.8.4:4[aqua=] ) postscript? ( app-text/libspectre ) R? ( dev-lang/R ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/cantor-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fcfa0bfe172bbdf557956de97878daa1
diff --git a/metadata/md5-cache/kde-base/cervisia-4.7.4 b/metadata/md5-cache/kde-base/cervisia-4.7.4
index 3ea378afbe0e..8741bf5c4a6f 100644
--- a/metadata/md5-cache/kde-base/cervisia-4.7.4
+++ b/metadata/md5-cache/kde-base/cervisia-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/cvs >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=420e625a4e17ca7ee4f26a530065cfdb
diff --git a/metadata/md5-cache/kde-base/cervisia-4.8.3 b/metadata/md5-cache/kde-base/cervisia-4.8.3
index 291ff8831da2..69c895f7d657 100644
--- a/metadata/md5-cache/kde-base/cervisia-4.8.3
+++ b/metadata/md5-cache/kde-base/cervisia-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/cvs >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b855b64932ad8910d1a1c90549541dfc
diff --git a/metadata/md5-cache/kde-base/cervisia-4.8.4 b/metadata/md5-cache/kde-base/cervisia-4.8.4
index 890e4b2ed8e1..a79055646abc 100644
--- a/metadata/md5-cache/kde-base/cervisia-4.8.4
+++ b/metadata/md5-cache/kde-base/cervisia-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/cvs >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fea675425b1606d386175166d6e06fe2
diff --git a/metadata/md5-cache/kde-base/dolphin-4.7.4 b/metadata/md5-cache/kde-base/dolphin-4.7.4
index 825d9b135f25..8404f33512c3 100644
--- a/metadata/md5-cache/kde-base/dolphin-4.7.4
+++ b/metadata/md5-cache/kde-base/dolphin-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=>=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=68a68816a1fc46eb8965b2b2c0cfa27a
diff --git a/metadata/md5-cache/kde-base/dolphin-4.8.3-r1 b/metadata/md5-cache/kde-base/dolphin-4.8.3-r1
index 83253a986c35..5204f2901ca4 100644
--- a/metadata/md5-cache/kde-base/dolphin-4.8.3-r1
+++ b/metadata/md5-cache/kde-base/dolphin-4.8.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e38fbe722de2793ddf84afe1031ec5ae
diff --git a/metadata/md5-cache/kde-base/dolphin-4.8.4 b/metadata/md5-cache/kde-base/dolphin-4.8.4
index d475861b4658..a3d5f0d07593 100644
--- a/metadata/md5-cache/kde-base/dolphin-4.8.4
+++ b/metadata/md5-cache/kde-base/dolphin-4.8.4
@@ -11,5 +11,5 @@ RDEPEND=>=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cd3f764efeb07239e0a5c40f379f66c5
diff --git a/metadata/md5-cache/kde-base/dolphin-plugins-4.7.4 b/metadata/md5-cache/kde-base/dolphin-plugins-4.7.4
index 6ad2c93a1d83..da541212783e 100644
--- a/metadata/md5-cache/kde-base/dolphin-plugins-4.7.4
+++ b/metadata/md5-cache/kde-base/dolphin-plugins-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/kompare-4.7.4:4[aqua=] git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4361e5d475b8019e4fc6870bfac13e6
diff --git a/metadata/md5-cache/kde-base/dolphin-plugins-4.8.3 b/metadata/md5-cache/kde-base/dolphin-plugins-4.8.3
index 0ee91a90ef7c..f9d8d14bb9fb 100644
--- a/metadata/md5-cache/kde-base/dolphin-plugins-4.8.3
+++ b/metadata/md5-cache/kde-base/dolphin-plugins-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/kompare-4.8.3:4[aqua=] bazaar? ( dev-vcs/bzr ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e74d04f5554556d6af8514f6567ff4a1
diff --git a/metadata/md5-cache/kde-base/dolphin-plugins-4.8.4 b/metadata/md5-cache/kde-base/dolphin-plugins-4.8.4
index 60deb36c71ac..4c7bc8ef2f64 100644
--- a/metadata/md5-cache/kde-base/dolphin-plugins-4.8.4
+++ b/metadata/md5-cache/kde-base/dolphin-plugins-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/kompare-4.8.4:4[aqua=] bazaar? ( dev-vcs/bzr ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0b904dad4de433fa35fc278531552b50
diff --git a/metadata/md5-cache/kde-base/dragonplayer-4.7.4 b/metadata/md5-cache/kde-base/dragonplayer-4.7.4
index 80393bce7834..db2d66fdf2aa 100644
--- a/metadata/md5-cache/kde-base/dragonplayer-4.7.4
+++ b/metadata/md5-cache/kde-base/dragonplayer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 xine? ( media-libs/xine-lib[xcb] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1e44be372be2d298cafb748bacdc9918
diff --git a/metadata/md5-cache/kde-base/dragonplayer-4.8.3 b/metadata/md5-cache/kde-base/dragonplayer-4.8.3
index e38a8266b686..b94ed9106665 100644
--- a/metadata/md5-cache/kde-base/dragonplayer-4.8.3
+++ b/metadata/md5-cache/kde-base/dragonplayer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f21da6d702b40aebee9d3a994c88ff2b
diff --git a/metadata/md5-cache/kde-base/dragonplayer-4.8.4 b/metadata/md5-cache/kde-base/dragonplayer-4.8.4
index b27aa31a1005..ef30e0e19265 100644
--- a/metadata/md5-cache/kde-base/dragonplayer-4.8.4
+++ b/metadata/md5-cache/kde-base/dragonplayer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bf6fefacd816062f847f3e78597ea38d
diff --git a/metadata/md5-cache/kde-base/drkonqi-4.7.4 b/metadata/md5-cache/kde-base/drkonqi-4.7.4
index 6368dd335b9e..5bf79f23f620 100644
--- a/metadata/md5-cache/kde-base/drkonqi-4.7.4
+++ b/metadata/md5-cache/kde-base/drkonqi-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=caed624c9a9168c6697263b7110cf415
diff --git a/metadata/md5-cache/kde-base/drkonqi-4.8.3 b/metadata/md5-cache/kde-base/drkonqi-4.8.3
index 66942e5cddc6..0b72e19e7d89 100644
--- a/metadata/md5-cache/kde-base/drkonqi-4.8.3
+++ b/metadata/md5-cache/kde-base/drkonqi-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=253ccf638235089cbca369f41b6cb56c
diff --git a/metadata/md5-cache/kde-base/drkonqi-4.8.4 b/metadata/md5-cache/kde-base/drkonqi-4.8.4
index b12b307b0b6e..97422993a87e 100644
--- a/metadata/md5-cache/kde-base/drkonqi-4.8.4
+++ b/metadata/md5-cache/kde-base/drkonqi-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51511ca1b2eced7830a3693a6a84a1f6
diff --git a/metadata/md5-cache/kde-base/ffmpegthumbs-4.7.4 b/metadata/md5-cache/kde-base/ffmpegthumbs-4.7.4
index aba6fa2fc2bb..02816e502337 100644
--- a/metadata/md5-cache/kde-base/ffmpegthumbs-4.7.4
+++ b/metadata/md5-cache/kde-base/ffmpegthumbs-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ffmpeg >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=888ff55e833ed27ba8d4999e2a1eebe6
diff --git a/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.3 b/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.3
index fa53fd15b3d1..6b8042f9e11b 100644
--- a/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.3
+++ b/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ffmpeg >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d00b6c1b915565bae3644d6c02341d1a
diff --git a/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.4 b/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.4
index 31b886bf981f..2832ab2a1e6c 100644
--- a/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.4
+++ b/metadata/md5-cache/kde-base/ffmpegthumbs-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/ffmpeg >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7b3ae81413ebf99f3661fb05b3c483f7
diff --git a/metadata/md5-cache/kde-base/filelight-4.7.4 b/metadata/md5-cache/kde-base/filelight-4.7.4
index 14b70fcbf0f2..47416462232d 100644
--- a/metadata/md5-cache/kde-base/filelight-4.7.4
+++ b/metadata/md5-cache/kde-base/filelight-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=69f0e80e209e8ad33b4da7cf36e30ab5
diff --git a/metadata/md5-cache/kde-base/filelight-4.8.3 b/metadata/md5-cache/kde-base/filelight-4.8.3
index 02487ec692d6..907db731795a 100644
--- a/metadata/md5-cache/kde-base/filelight-4.8.3
+++ b/metadata/md5-cache/kde-base/filelight-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/filelight-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=99b568f3b06c54618af8cef59383f3ce
diff --git a/metadata/md5-cache/kde-base/filelight-4.8.4 b/metadata/md5-cache/kde-base/filelight-4.8.4
index 85cef9685746..81882fa9383a 100644
--- a/metadata/md5-cache/kde-base/filelight-4.8.4
+++ b/metadata/md5-cache/kde-base/filelight-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/filelight-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6b21f111c0a50a8210deb868024b6f84
diff --git a/metadata/md5-cache/kde-base/freespacenotifier-4.7.4 b/metadata/md5-cache/kde-base/freespacenotifier-4.7.4
index da4070104160..71a051a0de8e 100644
--- a/metadata/md5-cache/kde-base/freespacenotifier-4.7.4
+++ b/metadata/md5-cache/kde-base/freespacenotifier-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eed352701367f12018f323b97c88dfa7
diff --git a/metadata/md5-cache/kde-base/freespacenotifier-4.8.3 b/metadata/md5-cache/kde-base/freespacenotifier-4.8.3
index 383dd8475513..f67b16da3388 100644
--- a/metadata/md5-cache/kde-base/freespacenotifier-4.8.3
+++ b/metadata/md5-cache/kde-base/freespacenotifier-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8101aa26f47b28baf576191342aeaa8a
diff --git a/metadata/md5-cache/kde-base/freespacenotifier-4.8.4 b/metadata/md5-cache/kde-base/freespacenotifier-4.8.4
index b863ede8b6ee..c3d7f856892e 100644
--- a/metadata/md5-cache/kde-base/freespacenotifier-4.8.4
+++ b/metadata/md5-cache/kde-base/freespacenotifier-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d504e82e587570706aa3c4220ccbc52e
diff --git a/metadata/md5-cache/kde-base/granatier-4.7.4 b/metadata/md5-cache/kde-base/granatier-4.7.4
index 8869c3a64da3..52c26c17bc31 100644
--- a/metadata/md5-cache/kde-base/granatier-4.7.4
+++ b/metadata/md5-cache/kde-base/granatier-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e44f601d6c03bbd7a84b9038d9d2d831
diff --git a/metadata/md5-cache/kde-base/granatier-4.8.3 b/metadata/md5-cache/kde-base/granatier-4.8.3
index 680528cbef10..943a5dc7499e 100644
--- a/metadata/md5-cache/kde-base/granatier-4.8.3
+++ b/metadata/md5-cache/kde-base/granatier-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9b886cd3987c4c8191686f19c9baaf41
diff --git a/metadata/md5-cache/kde-base/granatier-4.8.4 b/metadata/md5-cache/kde-base/granatier-4.8.4
index e972d75681e2..15dc538be404 100644
--- a/metadata/md5-cache/kde-base/granatier-4.8.4
+++ b/metadata/md5-cache/kde-base/granatier-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2450416e59acda108827ebaa616b49df
diff --git a/metadata/md5-cache/kde-base/gwenview-4.7.4 b/metadata/md5-cache/kde-base/gwenview-4.7.4
index 3c2b1659704a..6faf96af9ea9 100644
--- a/metadata/md5-cache/kde-base/gwenview-4.7.4
+++ b/metadata/md5-cache/kde-base/gwenview-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/gwenview-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ddc313c9cdec95bf454aabdb06a2bf2
diff --git a/metadata/md5-cache/kde-base/gwenview-4.8.3 b/metadata/md5-cache/kde-base/gwenview-4.8.3
index 24d5a2fac605..02548b95f38e 100644
--- a/metadata/md5-cache/kde-base/gwenview-4.8.3
+++ b/metadata/md5-cache/kde-base/gwenview-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/gwenview-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ea7223d69e53f178066825030090690e
diff --git a/metadata/md5-cache/kde-base/gwenview-4.8.4 b/metadata/md5-cache/kde-base/gwenview-4.8.4
index 672aa761a8d9..7d734c107f38 100644
--- a/metadata/md5-cache/kde-base/gwenview-4.8.4
+++ b/metadata/md5-cache/kde-base/gwenview-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/gwenview-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0805bce87874affd1cc88f2c4ea3af5c
diff --git a/metadata/md5-cache/kde-base/jovie-4.7.4 b/metadata/md5-cache/kde-base/jovie-4.7.4
index de4763605327..1ba2fc7ada23 100644
--- a/metadata/md5-cache/kde-base/jovie-4.7.4
+++ b/metadata/md5-cache/kde-base/jovie-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d1e6d93682269fccb150e69072e188b
diff --git a/metadata/md5-cache/kde-base/jovie-4.8.3 b/metadata/md5-cache/kde-base/jovie-4.8.3
index 34fd037696de..5494ac2ba207 100644
--- a/metadata/md5-cache/kde-base/jovie-4.8.3
+++ b/metadata/md5-cache/kde-base/jovie-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/jovie-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4400545c1f9ce3d775e363288556f427
diff --git a/metadata/md5-cache/kde-base/jovie-4.8.4 b/metadata/md5-cache/kde-base/jovie-4.8.4
index 0689f9ef2b92..27d49b6b4c8a 100644
--- a/metadata/md5-cache/kde-base/jovie-4.8.4
+++ b/metadata/md5-cache/kde-base/jovie-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/jovie-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9b1ccacac6ec6b2c2476b77f7f8afb3f
diff --git a/metadata/md5-cache/kde-base/juk-4.7.4 b/metadata/md5-cache/kde-base/juk-4.7.4
index 074668513a27..0b483f0ca521 100644
--- a/metadata/md5-cache/kde-base/juk-4.7.4
+++ b/metadata/md5-cache/kde-base/juk-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=caf2a88172c97ff68a38161dfa3bf4d5
diff --git a/metadata/md5-cache/kde-base/juk-4.8.3 b/metadata/md5-cache/kde-base/juk-4.8.3
index 2cb0efcabb10..26baf0d5c5e3 100644
--- a/metadata/md5-cache/kde-base/juk-4.8.3
+++ b/metadata/md5-cache/kde-base/juk-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=23539b0bc28801038ca29b2d130deaf2
diff --git a/metadata/md5-cache/kde-base/juk-4.8.4 b/metadata/md5-cache/kde-base/juk-4.8.4
index 58e8f8e00620..53a74e47513e 100644
--- a/metadata/md5-cache/kde-base/juk-4.8.4
+++ b/metadata/md5-cache/kde-base/juk-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=38571e2fa6176604d64e5a7876f2016f
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.4.11.1 b/metadata/md5-cache/kde-base/kabcclient-4.4.11.1
index b29052b8cbaf..c17ced0d6e52 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kabcclient-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e5892c534089c3916a238514275f233
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.7.4 b/metadata/md5-cache/kde-base/kabcclient-4.7.4
index 4599c061be32..ef800d559712 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.7.4
+++ b/metadata/md5-cache/kde-base/kabcclient-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=734ca4cdacaf28eb7bad9da54f95bd69
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.8.3 b/metadata/md5-cache/kde-base/kabcclient-4.8.3
index b3a20d6963e1..decc8624c6b0 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.8.3
+++ b/metadata/md5-cache/kde-base/kabcclient-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96a5d39718c1aa83e53db560442f60bc
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.8.4 b/metadata/md5-cache/kde-base/kabcclient-4.8.4
index a6c2699aecbf..852a45f9d460 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.8.4
+++ b/metadata/md5-cache/kde-base/kabcclient-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a469aa4c0649475fd3aa77817e19618
diff --git a/metadata/md5-cache/kde-base/kaccessible-4.7.4 b/metadata/md5-cache/kde-base/kaccessible-4.7.4
index 4e962b6fac10..3ce1be27106c 100644
--- a/metadata/md5-cache/kde-base/kaccessible-4.7.4
+++ b/metadata/md5-cache/kde-base/kaccessible-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=354f95d5433f6a36df466ad1d8a5b71c
diff --git a/metadata/md5-cache/kde-base/kaccessible-4.7.4-r1 b/metadata/md5-cache/kde-base/kaccessible-4.7.4-r1
index 65ac05cdb10b..64b515f56c0b 100644
--- a/metadata/md5-cache/kde-base/kaccessible-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kaccessible-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=372ace66ea7065f7f18c2b3b0994a925
diff --git a/metadata/md5-cache/kde-base/kaccessible-4.8.3 b/metadata/md5-cache/kde-base/kaccessible-4.8.3
index 775d3bcba54e..5c9ee68b93c2 100644
--- a/metadata/md5-cache/kde-base/kaccessible-4.8.3
+++ b/metadata/md5-cache/kde-base/kaccessible-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kaccessible-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6aab0a323926a9fcbedb911004292d29
diff --git a/metadata/md5-cache/kde-base/kaccessible-4.8.4 b/metadata/md5-cache/kde-base/kaccessible-4.8.4
index 9463379eb577..70ea38a405d5 100644
--- a/metadata/md5-cache/kde-base/kaccessible-4.8.4
+++ b/metadata/md5-cache/kde-base/kaccessible-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kaccessible-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=df66b5f5a365ac257d87e0ccffaa6b87
diff --git a/metadata/md5-cache/kde-base/kactivities-4.7.4 b/metadata/md5-cache/kde-base/kactivities-4.7.4
index 2355d0467a9b..8a065c1b565c 100644
--- a/metadata/md5-cache/kde-base/kactivities-4.7.4
+++ b/metadata/md5-cache/kde-base/kactivities-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=!<=kde-base/kdelibs-4.7.1-r1:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] de
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdelibs-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c27bf499eb8d920221e1f7cd733d93b9
diff --git a/metadata/md5-cache/kde-base/kactivities-4.8.3 b/metadata/md5-cache/kde-base/kactivities-4.8.3
index 15ffa8b7c831..aada5a5c2c23 100644
--- a/metadata/md5-cache/kde-base/kactivities-4.8.3
+++ b/metadata/md5-cache/kde-base/kactivities-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!<=kde-base/kdelibs-4.7.1-r1:4 !kde-base/activitymanager:4 >=kde-base/ox
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kactivities-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c90785bfafb6b4ef7322c13ad020dee3
diff --git a/metadata/md5-cache/kde-base/kactivities-4.8.4 b/metadata/md5-cache/kde-base/kactivities-4.8.4
index c6e5cf6f2d1a..a111316dae0e 100644
--- a/metadata/md5-cache/kde-base/kactivities-4.8.4
+++ b/metadata/md5-cache/kde-base/kactivities-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] !<=kde-base/kdelibs-4.7.1-r1:4 !kde-base/activitymanager:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kactivities-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a22971ec4b4730fd129def9ff8d959e2
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.4.11.1 b/metadata/md5-cache/kde-base/kaddressbook-4.4.11.1
index 6a241708dcb9..e72f7c274227 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/libkleo-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=405abbac0d04a87122f4240f59ed83f5
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.7.4 b/metadata/md5-cache/kde-base/kaddressbook-4.7.4
index fd88c3a7028b..8b191d149331 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.7.4
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desk
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a7bce3f69953d5f747e2fe9ba16852cd
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.8.3 b/metadata/md5-cache/kde-base/kaddressbook-4.8.3
index 3e7b664a47b6..15e897f4e550 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.8.3
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desk
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=207f6ea92e5fe4b4e421f3105a811892
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.8.4 b/metadata/md5-cache/kde-base/kaddressbook-4.8.4
index 9b3c33d759e1..4c55b7afce2f 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.8.4
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] kontact? ( >=kde-base/kontact-4.8.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6f57043d6855a5ee3c4239bbbc84a06f
diff --git a/metadata/md5-cache/kde-base/kajongg-4.7.4 b/metadata/md5-cache/kde-base/kajongg-4.7.4
index 86c41fda1ec8..002d5d139380 100644
--- a/metadata/md5-cache/kde-base/kajongg-4.7.4
+++ b/metadata/md5-cache/kde-base/kajongg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=kde-base/libkdegames-4.7.4:4[aqua=] >=kde-base/pykde4-4.7.4:4[aqua=] >=kde-base/libkmahjongg-4.7.4:4[aqua=] >=dev-python/twisted-8.2.0 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=59ed39acfe3acd77828d474ed1419c6b
diff --git a/metadata/md5-cache/kde-base/kajongg-4.8.3 b/metadata/md5-cache/kde-base/kajongg-4.8.3
index 388911382463..caf8cbea45b9 100644
--- a/metadata/md5-cache/kde-base/kajongg-4.8.3
+++ b/metadata/md5-cache/kde-base/kajongg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=kde-base/libkdegames-4.8.3:4[aqua=] >=kde-base/pykde4-4.8.3:4[aqua=] >=kde-base/libkmahjongg-4.8.3:4[aqua=] >=dev-python/twisted-8.2.0 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ec0f37687df92f2975f2135de0593100
diff --git a/metadata/md5-cache/kde-base/kajongg-4.8.4 b/metadata/md5-cache/kde-base/kajongg-4.8.4
index b4ca0aeac32c..c6f1285e1c74 100644
--- a/metadata/md5-cache/kde-base/kajongg-4.8.4
+++ b/metadata/md5-cache/kde-base/kajongg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=kde-base/libkdegames-4.8.4:4[aqua=] >=kde-base/pykde4-4.8.4:4[aqua=] >=kde-base/libkmahjongg-4.8.4:4[aqua=] >=dev-python/twisted-8.2.0 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7a8a903d5415632b40ded5ecf97364d1
diff --git a/metadata/md5-cache/kde-base/kalarm-4.4.11.1-r1 b/metadata/md5-cache/kde-base/kalarm-4.4.11.1-r1
index 1d0c0f291601..2d7afb62bedc 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.4.11.1-r1
+++ b/metadata/md5-cache/kde-base/kalarm-4.4.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4.11.1:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bfb95a0fff68e7669b3224a50cd644e6
diff --git a/metadata/md5-cache/kde-base/kalarm-4.7.4 b/metadata/md5-cache/kde-base/kalarm-4.7.4
index 4aec2e1bafab..a82c18bf9cf5 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.7.4
+++ b/metadata/md5-cache/kde-base/kalarm-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] media-libs/phonon >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a26242b34ddb32401d02a67f3b1a9ff
diff --git a/metadata/md5-cache/kde-base/kalarm-4.8.3 b/metadata/md5-cache/kde-base/kalarm-4.8.3
index ee8f678ba701..cdcf3a9af0f7 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.8.3
+++ b/metadata/md5-cache/kde-base/kalarm-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] media-libs/phonon >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5fbee3eb65ebb70ea914052f2dd8eacc
diff --git a/metadata/md5-cache/kde-base/kalarm-4.8.4 b/metadata/md5-cache/kde-base/kalarm-4.8.4
index edf6b157d155..c0a05cd5533e 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.8.4
+++ b/metadata/md5-cache/kde-base/kalarm-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] media-libs/phonon >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8b699e73680c96e31b2f1106cad05e34
diff --git a/metadata/md5-cache/kde-base/kalgebra-4.7.4 b/metadata/md5-cache/kde-base/kalgebra-4.7.4
index b5028583a5fc..a586eace2c7b 100644
--- a/metadata/md5-cache/kde-base/kalgebra-4.7.4
+++ b/metadata/md5-cache/kde-base/kalgebra-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkdeedu-4.7.4:4[aqua=] readline? ( sys-libs/readline ) >=kd
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kalgebra-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4ed3b3780852a2ced41002fa5d1d7450
diff --git a/metadata/md5-cache/kde-base/kalgebra-4.8.3 b/metadata/md5-cache/kde-base/kalgebra-4.8.3
index 7206c176584c..91539effc64b 100644
--- a/metadata/md5-cache/kde-base/kalgebra-4.8.3
+++ b/metadata/md5-cache/kde-base/kalgebra-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/analitza-4.8.3:4[aqua=] >=kde-base/libkdeedu-4.8.3:4[aqua=] readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kalgebra-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fc0a8503beb126cbdc9b2b2b65f352a2
diff --git a/metadata/md5-cache/kde-base/kalgebra-4.8.4 b/metadata/md5-cache/kde-base/kalgebra-4.8.4
index 985004bb6400..9755657ecfb9 100644
--- a/metadata/md5-cache/kde-base/kalgebra-4.8.4
+++ b/metadata/md5-cache/kde-base/kalgebra-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/analitza-4.8.4:4[aqua=] >=kde-base/libkdeedu-4.8.4:4[aqua=] readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kalgebra-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bd63de077714472f05109b7c39c74abf
diff --git a/metadata/md5-cache/kde-base/kalzium-4.7.4 b/metadata/md5-cache/kde-base/kalzium-4.7.4
index 2eeb497e6644..ac202f9c966c 100644
--- a/metadata/md5-cache/kde-base/kalzium-4.7.4
+++ b/metadata/md5-cache/kde-base/kalzium-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.7.4:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kalzium-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=63b30fc94619acdf707e3ad5fb6ef459
diff --git a/metadata/md5-cache/kde-base/kalzium-4.8.3 b/metadata/md5-cache/kde-base/kalzium-4.8.3
index 3a71c400b55e..bcd68810a36f 100644
--- a/metadata/md5-cache/kde-base/kalzium-4.8.3
+++ b/metadata/md5-cache/kde-base/kalzium-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.8.3:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kalzium-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=608a48d4f639944d568ee1decbbfa49b
diff --git a/metadata/md5-cache/kde-base/kalzium-4.8.4 b/metadata/md5-cache/kde-base/kalzium-4.8.4
index f4205b1031ae..194bd620daf0 100644
--- a/metadata/md5-cache/kde-base/kalzium-4.8.4
+++ b/metadata/md5-cache/kde-base/kalzium-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.8.4:4[aqua=] editor? ( >=sci-chemistry/openbabel-2.2 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kalzium-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=08c94f17cf300112faf329c7190372c1
diff --git a/metadata/md5-cache/kde-base/kamera-4.7.4 b/metadata/md5-cache/kde-base/kamera-4.7.4
index 996f8d90f159..999d906a0001 100644
--- a/metadata/md5-cache/kde-base/kamera-4.7.4
+++ b/metadata/md5-cache/kde-base/kamera-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libgphoto2 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kamera-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d43e71c11bd933a49fd64783ee57dd1b
diff --git a/metadata/md5-cache/kde-base/kamera-4.8.3 b/metadata/md5-cache/kde-base/kamera-4.8.3
index b3cf7135b208..5f78cf53d159 100644
--- a/metadata/md5-cache/kde-base/kamera-4.8.3
+++ b/metadata/md5-cache/kde-base/kamera-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libgphoto2 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kamera-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4ab838be0a2123ba2ed20ee3c26c5da8
diff --git a/metadata/md5-cache/kde-base/kamera-4.8.4 b/metadata/md5-cache/kde-base/kamera-4.8.4
index f4b4237b4753..708a0a3e1622 100644
--- a/metadata/md5-cache/kde-base/kamera-4.8.4
+++ b/metadata/md5-cache/kde-base/kamera-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libgphoto2 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kamera-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=81fa4db188dbf7348732b2192180fe14
diff --git a/metadata/md5-cache/kde-base/kanagram-4.7.4 b/metadata/md5-cache/kde-base/kanagram-4.7.4
index 52021b8e7c9f..d4f54c1d5e2e 100644
--- a/metadata/md5-cache/kde-base/kanagram-4.7.4
+++ b/metadata/md5-cache/kde-base/kanagram-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kanagram-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=900b0c6a19e5327dcc301bc4ede6839e
diff --git a/metadata/md5-cache/kde-base/kanagram-4.8.3 b/metadata/md5-cache/kde-base/kanagram-4.8.3
index 2a5d7ced6ecf..0090bcf73fb1 100644
--- a/metadata/md5-cache/kde-base/kanagram-4.8.3
+++ b/metadata/md5-cache/kde-base/kanagram-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kanagram-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ed313429c7d2c43a4bac889de76e0243
diff --git a/metadata/md5-cache/kde-base/kanagram-4.8.4 b/metadata/md5-cache/kde-base/kanagram-4.8.4
index 593861bc0f02..583ba5d8c836 100644
--- a/metadata/md5-cache/kde-base/kanagram-4.8.4
+++ b/metadata/md5-cache/kde-base/kanagram-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kanagram-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=414e3611492660a5f7815953bb33fdb7
diff --git a/metadata/md5-cache/kde-base/kapman-4.7.4 b/metadata/md5-cache/kde-base/kapman-4.7.4
index 119acfa3e18f..e97a39d25422 100644
--- a/metadata/md5-cache/kde-base/kapman-4.7.4
+++ b/metadata/md5-cache/kde-base/kapman-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1d134d09b35d55618f6c0fb77fcb3420
diff --git a/metadata/md5-cache/kde-base/kapman-4.8.3 b/metadata/md5-cache/kde-base/kapman-4.8.3
index ad13c9b598b9..70b0c9a681ed 100644
--- a/metadata/md5-cache/kde-base/kapman-4.8.3
+++ b/metadata/md5-cache/kde-base/kapman-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fd3d6498c1233a03f3996e9d687358ec
diff --git a/metadata/md5-cache/kde-base/kapman-4.8.4 b/metadata/md5-cache/kde-base/kapman-4.8.4
index 2020d39c4b41..0e06c8db6c91 100644
--- a/metadata/md5-cache/kde-base/kapman-4.8.4
+++ b/metadata/md5-cache/kde-base/kapman-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d715060981814ac7c082e27a501bb7b2
diff --git a/metadata/md5-cache/kde-base/kapptemplate-4.7.4 b/metadata/md5-cache/kde-base/kapptemplate-4.7.4
index 937fd0faa31e..5860e9325982 100644
--- a/metadata/md5-cache/kde-base/kapptemplate-4.7.4
+++ b/metadata/md5-cache/kde-base/kapptemplate-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7a4debdee67f5efe0032e44f2b237113
diff --git a/metadata/md5-cache/kde-base/kapptemplate-4.8.3 b/metadata/md5-cache/kde-base/kapptemplate-4.8.3
index edf24f16679e..80bf6fb70771 100644
--- a/metadata/md5-cache/kde-base/kapptemplate-4.8.3
+++ b/metadata/md5-cache/kde-base/kapptemplate-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7c59f50b8334f791b562fd0026aae920
diff --git a/metadata/md5-cache/kde-base/kapptemplate-4.8.4 b/metadata/md5-cache/kde-base/kapptemplate-4.8.4
index b66dc5a5fd84..5b92b6cf23cb 100644
--- a/metadata/md5-cache/kde-base/kapptemplate-4.8.4
+++ b/metadata/md5-cache/kde-base/kapptemplate-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aaf7c833e00a1af19c23cfaeaed57ae9
diff --git a/metadata/md5-cache/kde-base/kate-4.7.4 b/metadata/md5-cache/kde-base/kate-4.7.4
index 2b1c796bc0da..6bc4eed6ea41 100644
--- a/metadata/md5-cache/kde-base/kate-4.7.4
+++ b/metadata/md5-cache/kde-base/kate-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kate-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71f8e0380ebf1307d224fadb496707c7
diff --git a/metadata/md5-cache/kde-base/kate-4.8.3 b/metadata/md5-cache/kde-base/kate-4.8.3
index a14fe0929f92..bce5123c212d 100644
--- a/metadata/md5-cache/kde-base/kate-4.8.3
+++ b/metadata/md5-cache/kde-base/kate-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kate-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3bfea53b3e59d6c5e26efeaf0b5911bc
diff --git a/metadata/md5-cache/kde-base/kate-4.8.4 b/metadata/md5-cache/kde-base/kate-4.8.4
index 672f854cd7d9..a444c56f07c7 100644
--- a/metadata/md5-cache/kde-base/kate-4.8.4
+++ b/metadata/md5-cache/kde-base/kate-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/katepart-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kate-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1728230bc4e45c30292e4229f26ace4b
diff --git a/metadata/md5-cache/kde-base/katepart-4.7.4 b/metadata/md5-cache/kde-base/katepart-4.7.4
index 5180c9154ec2..95788963b466 100644
--- a/metadata/md5-cache/kde-base/katepart-4.7.4
+++ b/metadata/md5-cache/kde-base/katepart-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=!<=kde-base/kdelibs-4.6.50:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] hand
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kate-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=28e0626f69128106098f36e5992fa8c8
diff --git a/metadata/md5-cache/kde-base/katepart-4.8.3 b/metadata/md5-cache/kde-base/katepart-4.8.3
index cefeab86d193..e794fd4f7a85 100644
--- a/metadata/md5-cache/kde-base/katepart-4.8.3
+++ b/metadata/md5-cache/kde-base/katepart-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!<=kde-base/kdelibs-4.6.50:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] hand
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kate-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=76fd59e93259ccd4b22dc9743ecec18e
diff --git a/metadata/md5-cache/kde-base/katepart-4.8.4 b/metadata/md5-cache/kde-base/katepart-4.8.4
index 0bfcc78bca2a..1487adba4b64 100644
--- a/metadata/md5-cache/kde-base/katepart-4.8.4
+++ b/metadata/md5-cache/kde-base/katepart-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=!<=kde-base/kdelibs-4.6.50:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] hand
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kate-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0398ade5e2a47f776aca207aced18d0b
diff --git a/metadata/md5-cache/kde-base/katomic-4.7.4 b/metadata/md5-cache/kde-base/katomic-4.7.4
index cda653f146a7..a861de83d69a 100644
--- a/metadata/md5-cache/kde-base/katomic-4.7.4
+++ b/metadata/md5-cache/kde-base/katomic-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ef91211461cf3ca251c5d36b40cbb8cc
diff --git a/metadata/md5-cache/kde-base/katomic-4.8.3 b/metadata/md5-cache/kde-base/katomic-4.8.3
index dda71a13c8ac..352a3778010d 100644
--- a/metadata/md5-cache/kde-base/katomic-4.8.3
+++ b/metadata/md5-cache/kde-base/katomic-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8fd1641cf295562f2e6e8913245c156
diff --git a/metadata/md5-cache/kde-base/katomic-4.8.4 b/metadata/md5-cache/kde-base/katomic-4.8.4
index 77a859fb3e07..d1edc13344a8 100644
--- a/metadata/md5-cache/kde-base/katomic-4.8.4
+++ b/metadata/md5-cache/kde-base/katomic-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a1877ea78198f20abb4fee99ab8eaf1a
diff --git a/metadata/md5-cache/kde-base/kbattleship-4.7.4 b/metadata/md5-cache/kde-base/kbattleship-4.7.4
index a072bb3bda1c..7d204d20991d 100644
--- a/metadata/md5-cache/kde-base/kbattleship-4.7.4
+++ b/metadata/md5-cache/kde-base/kbattleship-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=930fa42362e712f11fa0325c4bc01014
diff --git a/metadata/md5-cache/kde-base/kbattleship-4.8.3 b/metadata/md5-cache/kde-base/kbattleship-4.8.3
index 0b64c21567d5..604c65a95b17 100644
--- a/metadata/md5-cache/kde-base/kbattleship-4.8.3
+++ b/metadata/md5-cache/kde-base/kbattleship-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3f0584f5ad9b13a946406261b65276c1
diff --git a/metadata/md5-cache/kde-base/kbattleship-4.8.4 b/metadata/md5-cache/kde-base/kbattleship-4.8.4
index 7b689c5f4c22..e6c90d0a07c0 100644
--- a/metadata/md5-cache/kde-base/kbattleship-4.8.4
+++ b/metadata/md5-cache/kde-base/kbattleship-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=096837bedf3adc3e26a18f76d35f0021
diff --git a/metadata/md5-cache/kde-base/kblackbox-4.7.4 b/metadata/md5-cache/kde-base/kblackbox-4.7.4
index 7e1d56cc12d0..811699064ea6 100644
--- a/metadata/md5-cache/kde-base/kblackbox-4.7.4
+++ b/metadata/md5-cache/kde-base/kblackbox-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=19a45486c3450be188a2adda7c1f0ba4
diff --git a/metadata/md5-cache/kde-base/kblackbox-4.8.3 b/metadata/md5-cache/kde-base/kblackbox-4.8.3
index d68524ca0464..c51423d2b6db 100644
--- a/metadata/md5-cache/kde-base/kblackbox-4.8.3
+++ b/metadata/md5-cache/kde-base/kblackbox-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=93f6c33637f8a9c2e4fe2d26d7b570c1
diff --git a/metadata/md5-cache/kde-base/kblackbox-4.8.4 b/metadata/md5-cache/kde-base/kblackbox-4.8.4
index 76d7a3861bb2..86e982bec5a2 100644
--- a/metadata/md5-cache/kde-base/kblackbox-4.8.4
+++ b/metadata/md5-cache/kde-base/kblackbox-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b14fdcd0315039407ce5c3629c00500a
diff --git a/metadata/md5-cache/kde-base/kblocks-4.7.4 b/metadata/md5-cache/kde-base/kblocks-4.7.4
index bf54e63277a5..fe8b12042f7d 100644
--- a/metadata/md5-cache/kde-base/kblocks-4.7.4
+++ b/metadata/md5-cache/kde-base/kblocks-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e509484572b9a6bc4c12015a1242d53f
diff --git a/metadata/md5-cache/kde-base/kblocks-4.8.3 b/metadata/md5-cache/kde-base/kblocks-4.8.3
index 3bcfdf15336c..71ad49e6187f 100644
--- a/metadata/md5-cache/kde-base/kblocks-4.8.3
+++ b/metadata/md5-cache/kde-base/kblocks-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f6b0353c9d45ad16a54b2a6f9e561f7e
diff --git a/metadata/md5-cache/kde-base/kblocks-4.8.4 b/metadata/md5-cache/kde-base/kblocks-4.8.4
index 0a7d7a163333..2da42baed2de 100644
--- a/metadata/md5-cache/kde-base/kblocks-4.8.4
+++ b/metadata/md5-cache/kde-base/kblocks-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=471e32c8e9b8d50f69a8e4424bd42731
diff --git a/metadata/md5-cache/kde-base/kbounce-4.7.4 b/metadata/md5-cache/kde-base/kbounce-4.7.4
index ec4049d4d35a..74dd97779318 100644
--- a/metadata/md5-cache/kde-base/kbounce-4.7.4
+++ b/metadata/md5-cache/kde-base/kbounce-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c1c39b7a9ef13335486f158c36def2d1
diff --git a/metadata/md5-cache/kde-base/kbounce-4.8.3 b/metadata/md5-cache/kde-base/kbounce-4.8.3
index b7fc9624d8f6..621e3a87bbfb 100644
--- a/metadata/md5-cache/kde-base/kbounce-4.8.3
+++ b/metadata/md5-cache/kde-base/kbounce-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=985a914ee83f5b5300aea8d130bd9a13
diff --git a/metadata/md5-cache/kde-base/kbounce-4.8.4 b/metadata/md5-cache/kde-base/kbounce-4.8.4
index d8200679e484..12bdf86cafe1 100644
--- a/metadata/md5-cache/kde-base/kbounce-4.8.4
+++ b/metadata/md5-cache/kde-base/kbounce-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=68a1eb3ce818cba5260f38ebe80c0edb
diff --git a/metadata/md5-cache/kde-base/kbreakout-4.7.4 b/metadata/md5-cache/kde-base/kbreakout-4.7.4
index d5bc9d900fbf..7b9c4db77ddc 100644
--- a/metadata/md5-cache/kde-base/kbreakout-4.7.4
+++ b/metadata/md5-cache/kde-base/kbreakout-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1c9d9f4e7b7c08b76b9ee141defd8e8b
diff --git a/metadata/md5-cache/kde-base/kbreakout-4.8.3 b/metadata/md5-cache/kde-base/kbreakout-4.8.3
index cb90d8a1bb99..95547e8837a8 100644
--- a/metadata/md5-cache/kde-base/kbreakout-4.8.3
+++ b/metadata/md5-cache/kde-base/kbreakout-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2a7f19caf8cbe66ebe24ed82eac49fc0
diff --git a/metadata/md5-cache/kde-base/kbreakout-4.8.4 b/metadata/md5-cache/kde-base/kbreakout-4.8.4
index bdca55e8a732..b791623c25a9 100644
--- a/metadata/md5-cache/kde-base/kbreakout-4.8.4
+++ b/metadata/md5-cache/kde-base/kbreakout-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fa4aa3b805f9031afbf7acc649a5d85b
diff --git a/metadata/md5-cache/kde-base/kbruch-4.7.4 b/metadata/md5-cache/kde-base/kbruch-4.7.4
index b18c298f9008..efdd8d6995b8 100644
--- a/metadata/md5-cache/kde-base/kbruch-4.7.4
+++ b/metadata/md5-cache/kde-base/kbruch-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kbruch-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f5184912bbaf5bef6c55b695f48b06e5
diff --git a/metadata/md5-cache/kde-base/kbruch-4.8.3 b/metadata/md5-cache/kde-base/kbruch-4.8.3
index 4d50eef0ebed..efbac75ecd00 100644
--- a/metadata/md5-cache/kde-base/kbruch-4.8.3
+++ b/metadata/md5-cache/kde-base/kbruch-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kbruch-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=619df04d44512974807935bec6c2499f
diff --git a/metadata/md5-cache/kde-base/kbruch-4.8.4 b/metadata/md5-cache/kde-base/kbruch-4.8.4
index 00d9b60e96d8..c68e646655c7 100644
--- a/metadata/md5-cache/kde-base/kbruch-4.8.4
+++ b/metadata/md5-cache/kde-base/kbruch-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kbruch-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5c4702e98b5dac14308a3d32019192e5
diff --git a/metadata/md5-cache/kde-base/kcachegrind-4.7.4 b/metadata/md5-cache/kde-base/kcachegrind-4.7.4
index fd58e854b9cf..92af9fb13586 100644
--- a/metadata/md5-cache/kde-base/kcachegrind-4.7.4
+++ b/metadata/md5-cache/kde-base/kcachegrind-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f21ee5f92c6937655e7a19f8a5e4ed79
diff --git a/metadata/md5-cache/kde-base/kcachegrind-4.8.3 b/metadata/md5-cache/kde-base/kcachegrind-4.8.3
index 19e7896379d7..6370bc72d6b4 100644
--- a/metadata/md5-cache/kde-base/kcachegrind-4.8.3
+++ b/metadata/md5-cache/kde-base/kcachegrind-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b457e894b542077df9c0df53d5fe285a
diff --git a/metadata/md5-cache/kde-base/kcachegrind-4.8.4 b/metadata/md5-cache/kde-base/kcachegrind-4.8.4
index 2a3c24d9c904..0e36c75b81ae 100644
--- a/metadata/md5-cache/kde-base/kcachegrind-4.8.4
+++ b/metadata/md5-cache/kde-base/kcachegrind-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=41f1d066569b50dbfc5cbb3f5f96cfcc
diff --git a/metadata/md5-cache/kde-base/kcalc-4.7.4 b/metadata/md5-cache/kde-base/kcalc-4.7.4
index b545784f6831..26f72dff2fd1 100644
--- a/metadata/md5-cache/kde-base/kcalc-4.7.4
+++ b/metadata/md5-cache/kde-base/kcalc-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-ba
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=12e43dd8b3389548282f6bcd66c80ded
diff --git a/metadata/md5-cache/kde-base/kcalc-4.8.3 b/metadata/md5-cache/kde-base/kcalc-4.8.3
index d7fa07a44caf..af25253ca6b3 100644
--- a/metadata/md5-cache/kde-base/kcalc-4.8.3
+++ b/metadata/md5-cache/kde-base/kcalc-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-ba
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kcalc-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7f0b2ca3484ca3c2e9eabc25372e01ae
diff --git a/metadata/md5-cache/kde-base/kcalc-4.8.4 b/metadata/md5-cache/kde-base/kcalc-4.8.4
index bf22422f88a5..729b5d397081 100644
--- a/metadata/md5-cache/kde-base/kcalc-4.8.4
+++ b/metadata/md5-cache/kde-base/kcalc-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-ba
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kcalc-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=934f425c403c256319633afd3b10df7a
diff --git a/metadata/md5-cache/kde-base/kcharselect-4.7.4 b/metadata/md5-cache/kde-base/kcharselect-4.7.4
index 7bafa678f34f..7a366ad58158 100644
--- a/metadata/md5-cache/kde-base/kcharselect-4.7.4
+++ b/metadata/md5-cache/kde-base/kcharselect-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0b581ae9e72e5430852e39bff50bba0c
diff --git a/metadata/md5-cache/kde-base/kcharselect-4.8.3 b/metadata/md5-cache/kde-base/kcharselect-4.8.3
index 01fdb5bfe789..1f5741878ff8 100644
--- a/metadata/md5-cache/kde-base/kcharselect-4.8.3
+++ b/metadata/md5-cache/kde-base/kcharselect-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kcharselect-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ec73db81a89ee14b4cf8d809d92b928
diff --git a/metadata/md5-cache/kde-base/kcharselect-4.8.4 b/metadata/md5-cache/kde-base/kcharselect-4.8.4
index 536fc723237d..55c006770812 100644
--- a/metadata/md5-cache/kde-base/kcharselect-4.8.4
+++ b/metadata/md5-cache/kde-base/kcharselect-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kcharselect-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ced38fcc646624622785f9ee28fdb93
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.7.4 b/metadata/md5-cache/kde-base/kcheckpass-4.7.4
index d4860934ca4e..b29cfa07eb96 100644
--- a/metadata/md5-cache/kde-base/kcheckpass-4.7.4
+++ b/metadata/md5-cache/kde-base/kcheckpass-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7d72df67777391efa331ad64cd1b1bb5
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.7.4-r1 b/metadata/md5-cache/kde-base/kcheckpass-4.7.4-r1
index eba1ce88f667..0be160677a90 100644
--- a/metadata/md5-cache/kde-base/kcheckpass-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kcheckpass-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c7260fd5a77376ef347b643d2c8c8206
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.8.3 b/metadata/md5-cache/kde-base/kcheckpass-4.8.3
index 55dcc966281b..f339ec3eda72 100644
--- a/metadata/md5-cache/kde-base/kcheckpass-4.8.3
+++ b/metadata/md5-cache/kde-base/kcheckpass-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=27d8ce09347ae875296630b7257f720a
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.8.4 b/metadata/md5-cache/kde-base/kcheckpass-4.8.4
index dfba46b532a4..c55753ffce30 100644
--- a/metadata/md5-cache/kde-base/kcheckpass-4.8.4
+++ b/metadata/md5-cache/kde-base/kcheckpass-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0a109d12b970d824d69f7cd4cf8b22fb
diff --git a/metadata/md5-cache/kde-base/kcminit-4.7.4 b/metadata/md5-cache/kde-base/kcminit-4.7.4
index 2ae18dc1043c..e3a0674d9346 100644
--- a/metadata/md5-cache/kde-base/kcminit-4.7.4
+++ b/metadata/md5-cache/kde-base/kcminit-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/ksplash-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d2af7e5fe1b17a616adfa2411dc9bf94
diff --git a/metadata/md5-cache/kde-base/kcminit-4.8.3 b/metadata/md5-cache/kde-base/kcminit-4.8.3
index f943fd86b86f..ba02af8f94fe 100644
--- a/metadata/md5-cache/kde-base/kcminit-4.8.3
+++ b/metadata/md5-cache/kde-base/kcminit-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/ksplash-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=071e1c217125984d5ed81b15e60ba2dc
diff --git a/metadata/md5-cache/kde-base/kcminit-4.8.4 b/metadata/md5-cache/kde-base/kcminit-4.8.4
index 50fa4b5b6141..9c93a40aebe4 100644
--- a/metadata/md5-cache/kde-base/kcminit-4.8.4
+++ b/metadata/md5-cache/kde-base/kcminit-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/ksplash-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ffe35be6fdb7f134b00f661ec40469cf
diff --git a/metadata/md5-cache/kde-base/kcmshell-4.7.4 b/metadata/md5-cache/kde-base/kcmshell-4.7.4
index 2c9cfae3435b..c077946c94ce 100644
--- a/metadata/md5-cache/kde-base/kcmshell-4.7.4
+++ b/metadata/md5-cache/kde-base/kcmshell-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1834742fa49e07efdc5216da4b67a90a
diff --git a/metadata/md5-cache/kde-base/kcmshell-4.8.3 b/metadata/md5-cache/kde-base/kcmshell-4.8.3
index 01c703d1fb7b..32ea3de23544 100644
--- a/metadata/md5-cache/kde-base/kcmshell-4.8.3
+++ b/metadata/md5-cache/kde-base/kcmshell-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d7662b088cf87d00d2164802b31acb0d
diff --git a/metadata/md5-cache/kde-base/kcmshell-4.8.4 b/metadata/md5-cache/kde-base/kcmshell-4.8.4
index a2072ea100a4..0cac02f2e4f1 100644
--- a/metadata/md5-cache/kde-base/kcmshell-4.8.4
+++ b/metadata/md5-cache/kde-base/kcmshell-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fada084a40ff85a8d196f4fa820659e0
diff --git a/metadata/md5-cache/kde-base/kcolorchooser-4.7.4 b/metadata/md5-cache/kde-base/kcolorchooser-4.7.4
index bf28ba12fde9..ddca0a766501 100644
--- a/metadata/md5-cache/kde-base/kcolorchooser-4.7.4
+++ b/metadata/md5-cache/kde-base/kcolorchooser-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kcolorchooser-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fb0029de46b42c4b89f5ae4875fce9b5
diff --git a/metadata/md5-cache/kde-base/kcolorchooser-4.8.3 b/metadata/md5-cache/kde-base/kcolorchooser-4.8.3
index a335c1a9ae5d..068c98afe389 100644
--- a/metadata/md5-cache/kde-base/kcolorchooser-4.8.3
+++ b/metadata/md5-cache/kde-base/kcolorchooser-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kcolorchooser-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e6934ff35b40eda536653b6a9fe9638b
diff --git a/metadata/md5-cache/kde-base/kcolorchooser-4.8.4 b/metadata/md5-cache/kde-base/kcolorchooser-4.8.4
index 695fd31a4338..7a57492ad1f0 100644
--- a/metadata/md5-cache/kde-base/kcolorchooser-4.8.4
+++ b/metadata/md5-cache/kde-base/kcolorchooser-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kcolorchooser-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3063c257d6e81848cd9431007e58f22f
diff --git a/metadata/md5-cache/kde-base/kcontrol-4.7.4 b/metadata/md5-cache/kde-base/kcontrol-4.7.4
index f8235428d6a1..2e3f5d0f7d60 100644
--- a/metadata/md5-cache/kde-base/kcontrol-4.7.4
+++ b/metadata/md5-cache/kde-base/kcontrol-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdnssd-4.7.4:4[aqua=] >=kde-base/khotkeys-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=de2f2f67b49d34035e2b21dde69be641
diff --git a/metadata/md5-cache/kde-base/kcontrol-4.8.3 b/metadata/md5-cache/kde-base/kcontrol-4.8.3
index 962730d75664..98a31f85b155 100644
--- a/metadata/md5-cache/kde-base/kcontrol-4.8.3
+++ b/metadata/md5-cache/kde-base/kcontrol-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdnssd-4.8.3:4[aqua=] >=kde-base/khotkeys-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3e0c19a050ab2185440879a80cec1d84
diff --git a/metadata/md5-cache/kde-base/kcontrol-4.8.4 b/metadata/md5-cache/kde-base/kcontrol-4.8.4
index b8a355d4fee1..93c21323806b 100644
--- a/metadata/md5-cache/kde-base/kcontrol-4.8.4
+++ b/metadata/md5-cache/kde-base/kcontrol-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdnssd-4.8.4:4[aqua=] >=kde-base/khotkeys-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2fe5db1fe30f16df7d11a300c8830a3e
diff --git a/metadata/md5-cache/kde-base/kcron-4.7.4 b/metadata/md5-cache/kde-base/kcron-4.7.4
index a738425f19ea..46903457a577 100644
--- a/metadata/md5-cache/kde-base/kcron-4.7.4
+++ b/metadata/md5-cache/kde-base/kcron-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeadmin-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=54bf407eb8829a6c7731486c3be0bc81
diff --git a/metadata/md5-cache/kde-base/kcron-4.8.3 b/metadata/md5-cache/kde-base/kcron-4.8.3
index 4323bca56f70..4762c2c74536 100644
--- a/metadata/md5-cache/kde-base/kcron-4.8.3
+++ b/metadata/md5-cache/kde-base/kcron-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeadmin-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e9e4a1675944ed81b36e82dea1387e7e
diff --git a/metadata/md5-cache/kde-base/kcron-4.8.4 b/metadata/md5-cache/kde-base/kcron-4.8.4
index cffd25a41980..d541e1627288 100644
--- a/metadata/md5-cache/kde-base/kcron-4.8.4
+++ b/metadata/md5-cache/kde-base/kcron-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeadmin-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=68230ecdae674f8185d01e1da989c0cd
diff --git a/metadata/md5-cache/kde-base/kde-env-4.7.4 b/metadata/md5-cache/kde-base/kde-env-4.7.4
index 59518f522a08..000cfe3e0172 100644
--- a/metadata/md5-cache/kde-base/kde-env-4.7.4
+++ b/metadata/md5-cache/kde-base/kde-env-4.7.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=as-is
 RDEPEND=!<=kde-base/kdelibs-4.6.80:4
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=214aa38ad09e70f637c6f05c615240d4
diff --git a/metadata/md5-cache/kde-base/kde-env-4.8.3 b/metadata/md5-cache/kde-base/kde-env-4.8.3
index 3399b399816b..7d87b549f504 100644
--- a/metadata/md5-cache/kde-base/kde-env-4.8.3
+++ b/metadata/md5-cache/kde-base/kde-env-4.8.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linu
 LICENSE=as-is
 RDEPEND=!<=kde-base/kdelibs-4.6.80:4
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ce5572d4cede4686e310527ab81b9d25
diff --git a/metadata/md5-cache/kde-base/kde-env-4.8.4 b/metadata/md5-cache/kde-base/kde-env-4.8.4
index 69fc1804b400..a27880d297fd 100644
--- a/metadata/md5-cache/kde-base/kde-env-4.8.4
+++ b/metadata/md5-cache/kde-base/kde-env-4.8.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-li
 LICENSE=as-is
 RDEPEND=!<=kde-base/kdelibs-4.6.80:4
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=262f247e2733d4f49680caa5924d61c9
diff --git a/metadata/md5-cache/kde-base/kde-l10n-4.7.4 b/metadata/md5-cache/kde-base/kde-l10n-4.7.4
index 898414b2543a..059c08af508e 100644
--- a/metadata/md5-cache/kde-base/kde-l10n-4.7.4
+++ b/metadata/md5-cache/kde-base/kde-l10n-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-misc/konq-plugins-4.6 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ar-4.7.4.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bg-4.7.4.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bs-4.7.4.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca-4.7.4.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca@valencia-4.7.4.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-cs-4.7.4.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-da-4.7.4.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-de-4.7.4.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-el-4.7.4.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-en_GB-4.7.4.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-es-4.7.4.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-et-4.7.4.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-eu-4.7.4.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fi-4.7.4.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fr-4.7.4.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ga-4.7.4.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-gl-4.7.4.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-he-4.7.4.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hr-4.7.4.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hu-4.7.4.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ia-4.7.4.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-id-4.7.4.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-is-4.7.4.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-it-4.7.4.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ja-4.7.4.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kk-4.7.4.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-km-4.7.4.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kn-4.7.4.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ko-4.7.4.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lt-4.7.4.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lv-4.7.4.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nb-4.7.4.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nds-4.7.4.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nl-4.7.4.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nn-4.7.4.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pa-4.7.4.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pl-4.7.4.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt-4.7.4.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt_BR-4.7.4.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ro-4.7.4.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ru-4.7.4.tar.bz2 ) linguas_si? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-si-4.7.4.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sk-4.7.4.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sl-4.7.4.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sr-4.7.4.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sv-4.7.4.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-th-4.7.4.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-tr-4.7.4.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ug-4.7.4.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-uk-4.7.4.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-wa-4.7.4.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_CN-4.7.4.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_TW-4.7.4.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8590aa5350071639a4ee6dae6b29a90d
diff --git a/metadata/md5-cache/kde-base/kde-l10n-4.8.3 b/metadata/md5-cache/kde-base/kde-l10n-4.8.3
index d8cb2b7ae183..f0c2a57dc529 100644
--- a/metadata/md5-cache/kde-base/kde-l10n-4.8.3
+++ b/metadata/md5-cache/kde-base/kde-l10n-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-misc/konq-plugins-4.6 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ar-4.8.3.tar.xz ) linguas_bg? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-bg-4.8.3.tar.xz ) linguas_bs? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-bs-4.8.3.tar.xz ) linguas_ca? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ca-4.8.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ca@valencia-4.8.3.tar.xz ) linguas_cs? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-cs-4.8.3.tar.xz ) linguas_da? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-da-4.8.3.tar.xz ) linguas_de? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-de-4.8.3.tar.xz ) linguas_el? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-el-4.8.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-en_GB-4.8.3.tar.xz ) linguas_es? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-es-4.8.3.tar.xz ) linguas_et? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-et-4.8.3.tar.xz ) linguas_eu? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-eu-4.8.3.tar.xz ) linguas_fa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fa-4.8.3.tar.xz ) linguas_fi? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fi-4.8.3.tar.xz ) linguas_fr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fr-4.8.3.tar.xz ) linguas_ga? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ga-4.8.3.tar.xz ) linguas_gl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-gl-4.8.3.tar.xz ) linguas_he? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-he-4.8.3.tar.xz ) linguas_hr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-hr-4.8.3.tar.xz ) linguas_hu? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-hu-4.8.3.tar.xz ) linguas_ia? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ia-4.8.3.tar.xz ) linguas_id? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-id-4.8.3.tar.xz ) linguas_is? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-is-4.8.3.tar.xz ) linguas_it? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-it-4.8.3.tar.xz ) linguas_ja? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ja-4.8.3.tar.xz ) linguas_kk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-kk-4.8.3.tar.xz ) linguas_km? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-km-4.8.3.tar.xz ) linguas_ko? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ko-4.8.3.tar.xz ) linguas_lt? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-lt-4.8.3.tar.xz ) linguas_lv? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-lv-4.8.3.tar.xz ) linguas_nb? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nb-4.8.3.tar.xz ) linguas_nds? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nds-4.8.3.tar.xz ) linguas_nl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nl-4.8.3.tar.xz ) linguas_nn? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nn-4.8.3.tar.xz ) linguas_pa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pa-4.8.3.tar.xz ) linguas_pl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pl-4.8.3.tar.xz ) linguas_pt? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pt-4.8.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pt_BR-4.8.3.tar.xz ) linguas_ro? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ro-4.8.3.tar.xz ) linguas_ru? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ru-4.8.3.tar.xz ) linguas_si? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-si-4.8.3.tar.xz ) linguas_sk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sk-4.8.3.tar.xz ) linguas_sl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sl-4.8.3.tar.xz ) linguas_sr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sr-4.8.3.tar.xz ) linguas_sv? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sv-4.8.3.tar.xz ) linguas_tg? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-tg-4.8.3.tar.xz ) linguas_th? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-th-4.8.3.tar.xz ) linguas_tr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-tr-4.8.3.tar.xz ) linguas_ug? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ug-4.8.3.tar.xz ) linguas_uk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-uk-4.8.3.tar.xz ) linguas_vi? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-vi-4.8.3.tar.xz ) linguas_wa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-wa-4.8.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-zh_CN-4.8.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-zh_TW-4.8.3.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c6ee8592097e09f1c8ea3ea1ab67ee26
diff --git a/metadata/md5-cache/kde-base/kde-l10n-4.8.4 b/metadata/md5-cache/kde-base/kde-l10n-4.8.4
index 17016a02d5c8..ef1e95682dee 100644
--- a/metadata/md5-cache/kde-base/kde-l10n-4.8.4
+++ b/metadata/md5-cache/kde-base/kde-l10n-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-misc/konq-plugins-4.6 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ar-4.8.4.tar.xz ) linguas_bg? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-bg-4.8.4.tar.xz ) linguas_bs? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-bs-4.8.4.tar.xz ) linguas_ca? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ca-4.8.4.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ca@valencia-4.8.4.tar.xz ) linguas_cs? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-cs-4.8.4.tar.xz ) linguas_da? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-da-4.8.4.tar.xz ) linguas_de? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-de-4.8.4.tar.xz ) linguas_el? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-el-4.8.4.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-en_GB-4.8.4.tar.xz ) linguas_es? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-es-4.8.4.tar.xz ) linguas_et? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-et-4.8.4.tar.xz ) linguas_eu? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-eu-4.8.4.tar.xz ) linguas_fa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fa-4.8.4.tar.xz ) linguas_fi? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fi-4.8.4.tar.xz ) linguas_fr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fr-4.8.4.tar.xz ) linguas_ga? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ga-4.8.4.tar.xz ) linguas_gl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-gl-4.8.4.tar.xz ) linguas_he? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-he-4.8.4.tar.xz ) linguas_hr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-hr-4.8.4.tar.xz ) linguas_hu? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-hu-4.8.4.tar.xz ) linguas_ia? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ia-4.8.4.tar.xz ) linguas_id? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-id-4.8.4.tar.xz ) linguas_is? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-is-4.8.4.tar.xz ) linguas_it? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-it-4.8.4.tar.xz ) linguas_ja? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ja-4.8.4.tar.xz ) linguas_kk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-kk-4.8.4.tar.xz ) linguas_km? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-km-4.8.4.tar.xz ) linguas_ko? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ko-4.8.4.tar.xz ) linguas_lt? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-lt-4.8.4.tar.xz ) linguas_lv? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-lv-4.8.4.tar.xz ) linguas_nb? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nb-4.8.4.tar.xz ) linguas_nds? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nds-4.8.4.tar.xz ) linguas_nl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nl-4.8.4.tar.xz ) linguas_nn? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nn-4.8.4.tar.xz ) linguas_pa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pa-4.8.4.tar.xz ) linguas_pl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pl-4.8.4.tar.xz ) linguas_pt? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pt-4.8.4.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pt_BR-4.8.4.tar.xz ) linguas_ro? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ro-4.8.4.tar.xz ) linguas_ru? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ru-4.8.4.tar.xz ) linguas_si? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-si-4.8.4.tar.xz ) linguas_sk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sk-4.8.4.tar.xz ) linguas_sl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sl-4.8.4.tar.xz ) linguas_sr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sr-4.8.4.tar.xz ) linguas_sv? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sv-4.8.4.tar.xz ) linguas_tg? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-tg-4.8.4.tar.xz ) linguas_th? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-th-4.8.4.tar.xz ) linguas_tr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-tr-4.8.4.tar.xz ) linguas_ug? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ug-4.8.4.tar.xz ) linguas_uk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-uk-4.8.4.tar.xz ) linguas_vi? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-vi-4.8.4.tar.xz ) linguas_wa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-wa-4.8.4.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-zh_CN-4.8.4.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-zh_TW-4.8.4.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cdfe54bc2eb8784613e52e392912221e
diff --git a/metadata/md5-cache/kde-base/kde-wallpapers-4.7.4 b/metadata/md5-cache/kde-base/kde-wallpapers-4.7.4
index e2e859eadfad..418cae16a026 100644
--- a/metadata/md5-cache/kde-base/kde-wallpapers-4.7.4
+++ b/metadata/md5-cache/kde-base/kde-wallpapers-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-wallpapers:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-wallpapers-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=14ebd8e2d8ec9d979849ba51941a1220
diff --git a/metadata/md5-cache/kde-base/kde-wallpapers-4.8.3 b/metadata/md5-cache/kde-base/kde-wallpapers-4.8.3
index 8afc93b4dbb6..50df059f3f6c 100644
--- a/metadata/md5-cache/kde-base/kde-wallpapers-4.8.3
+++ b/metadata/md5-cache/kde-base/kde-wallpapers-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-wallpapers:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-wallpapers-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aaf22577d7fd8dbe033aaab2b43da8bf
diff --git a/metadata/md5-cache/kde-base/kde-wallpapers-4.8.4 b/metadata/md5-cache/kde-base/kde-wallpapers-4.8.4
index 57201b816566..4ad5d8fc9ed7 100644
--- a/metadata/md5-cache/kde-base/kde-wallpapers-4.8.4
+++ b/metadata/md5-cache/kde-base/kde-wallpapers-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-wallpapers:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-wallpapers-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=64d033a8b12080e513a34262f836a836
diff --git a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.7.4 b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.7.4
index 55050889769d..376f8b911b6e 100644
--- a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9f72001b6574239db4e51d686ff41d18
diff --git a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.3 b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.3
index 8e9a0d60c3a7..407832585354 100644
--- a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=69b8d55d9cc21b88c764641ae6b08cc6
diff --git a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.4 b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.4
index e947320c9c26..e5e25c5984b8 100644
--- a/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeaccounts-plugin-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9cea1ef7ff761684fa6bde37bf6f1a64
diff --git a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.7.4
index 497c3068f6ed..7a3888a69f7c 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdeaccessibility-colorschemes:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bf6bc3343cfd98d0ef7d84ee56679eff
diff --git a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.3
index fd13c4ed54ee..ee17e9f78fda 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdeaccessibility-colorschemes:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bb466902aa1bdd89f05d7e1dd1858393
diff --git a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.4
index 46c32c2f560e..b23aaaf311a3 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdeaccessibility-colorschemes:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8b2265242eb114a2f0ac09fe46449c73
diff --git a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.7.4
index 6ee98944893f..42871f86d5d4 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=da08a5541db8e6244e56d6a136cebfdd
diff --git a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.3
index dc01d1e4aeed..f3e5dea789c7 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=54d1e1e0b8693efdb374a75a2a381869
diff --git a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.4
index 22d8aa9a6d5d..3340eb676325 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2730caa7c7eba6a199389c647c423cfa
diff --git a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.7.4
index 521af09eedba..f4a6a42dc5e8 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=13041e56a8863ccfd5d5ab3a275b87ac
diff --git a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.3
index 2688d491e7fc..17d2f00494d0 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=144f759acc66410f22a12a0bc4d09b52
diff --git a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.4
index b4d1f4840b72..2b2627308500 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=53830110388cb4addfe59bff76341c67
diff --git a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.7.4
index 0c7a9432fa0f..d2cd0d34fb5e 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-themes/nuvola !kde-base/kdeaccessibility-iconthemes:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=08ac36dd9298008f98e97df1ef47667c
diff --git a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.3
index bacfd812f856..f59a1d947d48 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-themes/nuvola !kde-base/kdeaccessibility-iconthemes:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=824c068fb0ff69ff38f8e755188a289b
diff --git a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.4
index a8a04dba114c..86165710eeba 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-themes/nuvola !kde-base/kdeaccessibility-iconthemes:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ede7b994a5a67a9488d567f00998c6fa
diff --git a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.7.4
index f39b866b13af..ab1fd574b0c7 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.7.4:4[aqua=,opengl?] >=kde-base/libkworkspace-4.7.4:4[aqua=] media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5cab628d3d51c519864ba08c71c24afe
diff --git a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.3
index 7e42d74a374d..3c4abd6eb742 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.8.3:4[aqua=,opengl?] >=kde-base/libkworkspace-4.8.3:4[aqua=] media-libs/libart_lgpl kexiv2? ( >=kde-base/libkexiv2-4.8.3:4[aqua=] ) opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9cf38de9c675559d6e9d0bfac7db7842
diff --git a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.4
index 8aa75feaa57f..fc1b953f8265 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.8.4:4[aqua=,opengl?] >=kde-base/libkworkspace-4.8.4:4[aqua=] media-libs/libart_lgpl kexiv2? ( >=kde-base/libkexiv2-4.8.4:4[aqua=] ) opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=155f7cb00b2e0233498aa4e98f9f1e6b
diff --git a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.7.4
index 719d768a6b0c..2802dd9b1ac4 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d855c54d688aa21c0dfc356aef2caef
diff --git a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.3
index 4ab972206b65..36a5f9aae06f 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=00ea5ebba18d9a483dd71549d1506c0c
diff --git a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.4
index 92e4514e575b..ea19d8b8ab32 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eca38018bae7e11da8876ccd2efc55c4
diff --git a/metadata/md5-cache/kde-base/kdeartwork-styles-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-styles-4.7.4
index a151a8ae4dc1..f6bdab6822c7 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-styles-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-styles-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=12ffe188f7f4c5a4765d886234cbf473
diff --git a/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.3
index a8ecb6da46f5..94e58c01c278 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d59dcedfcc5bb372ea978f5fd7682a8d
diff --git a/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.4
index 62738d8a8778..d5018eb1e20f 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-styles-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a4d96fc6c234ca2ecf3b04fd9ad69df0
diff --git a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.7.4
index fda220e894ac..62c7c593866b 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7b4624ff2e0d4fd5a44f7cd69e0fc704
diff --git a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.3
index 41295e69905d..163320ea795b 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=67a9fb425cb6d800ed0a903f61683417
diff --git a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.4
index abe3c204d29c..64fe09e62a29 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=binchecks strip
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=406c5b544833b72a89fec5be73a90f21
diff --git a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.7.4 b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
index cefcd6440469..50cc3a20fb49 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdeartwork-wallpapers-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeartwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=02fbc583a1da22ed0428329f69fc8487
diff --git a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.3 b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.3
index bb04989dc2b7..a0f6925ee0a0 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdeartwork-wallpapers-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeartwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b7ed2c816cdd2b65a878a6d918f32333
diff --git a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.4 b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.4
index cd4274720301..aef9b3d6cffe 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdeartwork-wallpapers-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeartwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=17e1bfd2e04105c1860417fae969bf29
diff --git a/metadata/md5-cache/kde-base/kdebase-cursors-4.7.4 b/metadata/md5-cache/kde-base/kdebase-cursors-4.7.4
index e57a3a069514..9fcf2af13433 100644
--- a/metadata/md5-cache/kde-base/kdebase-cursors-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-cursors-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a1b7b9f44a7c07c027595258bc088e5
diff --git a/metadata/md5-cache/kde-base/kdebase-cursors-4.8.3 b/metadata/md5-cache/kde-base/kdebase-cursors-4.8.3
index 6da45f7b4032..de090717799d 100644
--- a/metadata/md5-cache/kde-base/kdebase-cursors-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-cursors-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=713a5e1c0f1cfc821ff74fd6eebfc13c
diff --git a/metadata/md5-cache/kde-base/kdebase-cursors-4.8.4 b/metadata/md5-cache/kde-base/kdebase-cursors-4.8.4
index 50ae4c06edfb..cbc750400d32 100644
--- a/metadata/md5-cache/kde-base/kdebase-cursors-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-cursors-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c0db5ba646b98f1a8866f9487641b7fc
diff --git a/metadata/md5-cache/kde-base/kdebase-data-4.7.4 b/metadata/md5-cache/kde-base/kdebase-data-4.7.4
index 283d651b6658..07e6848d2e8a 100644
--- a/metadata/md5-cache/kde-base/kdebase-data-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-data-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wallpapers? ( >=kde-base/kde-wallpapers-4.7.4:4[aqua=] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b1efc2ad21d8dfbfecb98c2c5593d461
diff --git a/metadata/md5-cache/kde-base/kdebase-data-4.8.3 b/metadata/md5-cache/kde-base/kdebase-data-4.8.3
index 02fe22cab5ed..23161f81465a 100644
--- a/metadata/md5-cache/kde-base/kdebase-data-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-data-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wallpapers? ( >=kde-base/kde-wallpapers-4.8.3:4[aqua=] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6dee0ef59a58cf8a7ce8e4767bcccbb8
diff --git a/metadata/md5-cache/kde-base/kdebase-data-4.8.4 b/metadata/md5-cache/kde-base/kdebase-data-4.8.4
index 3d73b7d196e8..3bf8920fe250 100644
--- a/metadata/md5-cache/kde-base/kdebase-data-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-data-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wallpapers? ( >=kde-base/kde-wallpapers-4.8.4:4[aqua=] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=79211b05ac75ea97b2f8c8cdc48a589a
diff --git a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.7.4 b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.7.4
index 7c5e263c8809..fd6afebcfc54 100644
--- a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=58f66f681d89c19822aac1529807f12f
diff --git a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.3 b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.3
index 0e3b8de60571..a44580ad9907 100644
--- a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=34e347efa3289cf0c9b5991870187cb1
diff --git a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.4 b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.4
index 1cea554821b6..0ad00e7b1cce 100644
--- a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3a72cadf12a8602cef23580d171ab9e1
diff --git a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.7.4 b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.7.4
index 746bf621e4c9..104f63bc2481 100644
--- a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=!aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-g
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2912e5ae76ee6be9fa726ffd4ba3e4af
diff --git a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.3 b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.3
index cf645fa44e3c..8e33eb888a76 100644
--- a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-g
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=582d06b369d61b06144f57bc109d03b7
diff --git a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.4 b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.4
index 637bf36e9451..ef2283ac5fe0 100644
--- a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=!aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-g
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=03b5654ae4a1949eba575a847ec6f2ed
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-4.7.4 b/metadata/md5-cache/kde-base/kdebase-menu-4.7.4
index 3079df4ea43f..6bae6e2c835b 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-menu-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=89cd0c122d58be4f879b7b0693fb854a
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-4.8.3 b/metadata/md5-cache/kde-base/kdebase-menu-4.8.3
index 16794b5011a2..ef487038e2c4 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-menu-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=15697d720fb090e67322ab9b237e83cc
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-4.8.4 b/metadata/md5-cache/kde-base/kdebase-menu-4.8.4
index 6ec13a3ef255..53abdf5b9d04 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-menu-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aab391e32b9c0258b7ac6201c0f8bf44
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.7.4 b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.7.4
index 0a685626c933..26e2df19c604 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71d95fe23c2a973e43b8165f85e76068
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.3 b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.3
index b3632be10f69..95c697f72b89 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b7153b288959b36df3f0ee8be882d05e
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.4 b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.4
index 1ae522b20499..265498d4f557 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ac0c223bb5494687f584761a047b8c0d
diff --git a/metadata/md5-cache/kde-base/kdebase-pam-7 b/metadata/md5-cache/kde-base/kdebase-pam-7
index f0c24e35a20e..6102009ce58a 100644
--- a/metadata/md5-cache/kde-base/kdebase-pam-7
+++ b/metadata/md5-cache/kde-base/kdebase-pam-7
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=as-is
 RDEPEND=virtual/pam
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6f1d10930bab860e7e26f821ec184e7
diff --git a/metadata/md5-cache/kde-base/kdebase-startkde-4.7.4 b/metadata/md5-cache/kde-base/kdebase-startkde-4.7.4
index c809ffb68779..b6551ec7eb7a 100644
--- a/metadata/md5-cache/kde-base/kdebase-startkde-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebase-startkde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.7.4:4[aqua=] >=kde-base/kdebase-runtime-meta-4.7.4:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.7.4:4[aqua=] ) >=kde-base/kfmclient-4.7.4:4[aqua=] >=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/kreadconfig-4.7.4:4[aqua=] >=kde-base/krunner-4.7.4:4[aqua=] >=kde-base/ksmserver-4.7.4:4[aqua=] >=kde-base/ksplash-4.7.4:4[aqua=] >=kde-base/kstartupconfig-4.7.4:4[aqua=] >=kde-base/kwin-4.7.4:4[aqua=] >=kde-base/phonon-kde-4.7.4:4[aqua=] >=kde-base/plasma-apps-4.7.4:4[aqua=] >=kde-base/plasma-workspace-4.7.4:4[aqua=] >=kde-base/systemsettings-4.7.4:4[aqua=] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fe6db4069805cc76021c04896aa2d685
diff --git a/metadata/md5-cache/kde-base/kdebase-startkde-4.8.3 b/metadata/md5-cache/kde-base/kdebase-startkde-4.8.3
index e4b472b822e1..d0ec58a09ca3 100644
--- a/metadata/md5-cache/kde-base/kdebase-startkde-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebase-startkde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.8.3:4[aqua=] >=kde-base/kdebase-runtime-meta-4.8.3:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.8.3:4[aqua=] ) >=kde-base/kfmclient-4.8.3:4[aqua=] >=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/kreadconfig-4.8.3:4[aqua=] >=kde-base/krunner-4.8.3:4[aqua=] >=kde-base/ksmserver-4.8.3:4[aqua=] >=kde-base/ksplash-4.8.3:4[aqua=] >=kde-base/kstartupconfig-4.8.3:4[aqua=] >=kde-base/kwin-4.8.3:4[aqua=] >=kde-base/phonon-kde-4.8.3:4[aqua=] >=kde-base/plasma-apps-4.8.3:4[aqua=] >=kde-base/plasma-workspace-4.8.3:4[aqua=] >=kde-base/systemsettings-4.8.3:4[aqua=] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6ebc19d20770825818b1770ad331aab6
diff --git a/metadata/md5-cache/kde-base/kdebase-startkde-4.8.4 b/metadata/md5-cache/kde-base/kdebase-startkde-4.8.4
index 55c16893e372..2acaf6a9f323 100644
--- a/metadata/md5-cache/kde-base/kdebase-startkde-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebase-startkde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.8.4:4[aqua=] >=kde-base/kdebase-runtime-meta-4.8.4:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.8.4:4[aqua=] ) >=kde-base/kfmclient-4.8.4:4[aqua=] >=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/kreadconfig-4.8.4:4[aqua=] >=kde-base/krunner-4.8.4:4[aqua=] >=kde-base/ksmserver-4.8.4:4[aqua=] >=kde-base/ksplash-4.8.4:4[aqua=] >=kde-base/kstartupconfig-4.8.4:4[aqua=] >=kde-base/kwin-4.8.4:4[aqua=] >=kde-base/phonon-kde-4.8.4:4[aqua=] >=kde-base/plasma-apps-4.8.4:4[aqua=] >=kde-base/plasma-workspace-4.8.4:4[aqua=] >=kde-base/systemsettings-4.8.4:4[aqua=] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=98713768f65be68c278a48501bee1475
diff --git a/metadata/md5-cache/kde-base/kdebugdialog-4.7.4 b/metadata/md5-cache/kde-base/kdebugdialog-4.7.4
index 4f3b87962d56..4d1d714440b6 100644
--- a/metadata/md5-cache/kde-base/kdebugdialog-4.7.4
+++ b/metadata/md5-cache/kde-base/kdebugdialog-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9217aa258996ff5ed3fce760a401308e
diff --git a/metadata/md5-cache/kde-base/kdebugdialog-4.8.3 b/metadata/md5-cache/kde-base/kdebugdialog-4.8.3
index 9d8bbcad213a..33ccffd96355 100644
--- a/metadata/md5-cache/kde-base/kdebugdialog-4.8.3
+++ b/metadata/md5-cache/kde-base/kdebugdialog-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=68cd88d0c719f49235e605724300f235
diff --git a/metadata/md5-cache/kde-base/kdebugdialog-4.8.4 b/metadata/md5-cache/kde-base/kdebugdialog-4.8.4
index 0381e21dbf9d..54342e3fa0c3 100644
--- a/metadata/md5-cache/kde-base/kdebugdialog-4.8.4
+++ b/metadata/md5-cache/kde-base/kdebugdialog-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4f7f36223c30a70d9a2637727fc9b048
diff --git a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.3 b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.3
index d5837862ec8b..a71f4ae6be7c 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.3
+++ b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegraphics-mobipocket-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61d759337c082172c530126b17deb978
diff --git a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.4 b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.4
index d66bb3cffa82..9588a4eab958 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.4
+++ b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegraphics-mobipocket-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=98b0c86b0a6d90252be33822dcea99d0
diff --git a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.7.4 b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
index f6afd00a00ce..7e1aeb542843 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
+++ b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegraphics-strigi-analyzer-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=60d196e4ec609e53158e179b0ec89d1c
diff --git a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.3 b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.3
index 15617c522c39..d756bece83db 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.3
+++ b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegraphics-strigi-analyzer-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e26ac5b56b408184e0e9e07878fa3a11
diff --git a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.4 b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.4
index b4f2d7684800..79a8f26a77ea 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.4
+++ b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegraphics-strigi-analyzer-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2a79a362dcd089495a77723e2cecccb6
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.7.4 b/metadata/md5-cache/kde-base/kdelibs-4.7.4
index 227a5abc96ca..935e9b6ff553 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.7.4
+++ b/metadata/md5-cache/kde-base/kdelibs-4.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdelibs-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ab04cb8343d6d57b0ae3971f8ddc3925
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.7.4-r12 b/metadata/md5-cache/kde-base/kdelibs-4.7.4-r12
index 5beab055d07a..20e17d5a7cd7 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.7.4-r12
+++ b/metadata/md5-cache/kde-base/kdelibs-4.7.4-r12
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdelibs-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2580e602b34c87af99f00b129eab63a7
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.8.3 b/metadata/md5-cache/kde-base/kdelibs-4.8.3
index ee69d8369d28..5e8f8740ebed 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.8.3
+++ b/metadata/md5-cache/kde-base/kdelibs-4.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdelibs-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7edfc87ca21a99880d69b7dd7e5ec26e
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.8.4 b/metadata/md5-cache/kde-base/kdelibs-4.8.4
index 7a8be6a57455..a9fa27476d0c 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.8.4
+++ b/metadata/md5-cache/kde-base/kdelibs-4.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdelibs-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4e79a23424fe835e519ac2dd4e72229
diff --git a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.7.4 b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.7.4
index 147c4dcd1470..e7fef9dac37e 100644
--- a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.7.4
+++ b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkcddb-4.7.4:4[aqua=] >=kde-base/libkcompactdisc-4.7.4:4[aq
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=758772d267e34222015a347ff091bd2f
diff --git a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.3 b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.3
index 90da985da186..044a292f7587 100644
--- a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.3
+++ b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkcddb-4.8.3:4[aqua=] >=kde-base/libkcompactdisc-4.8.3:4[aq
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bdcc43c19a6950141aa0ea591108beb3
diff --git a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.4 b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.4
index 840393b99d72..0306fcf4d428 100644
--- a/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.4
+++ b/metadata/md5-cache/kde-base/kdemultimedia-kioslaves-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkcddb-4.8.4:4[aqua=] >=kde-base/libkcompactdisc-4.8.4:4[aq
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d186c4e470313d8b3a2c29f55cf52df7
diff --git a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.7.4 b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.7.4
index d5834ec0237e..ff7f67b065c4 100644
--- a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.7.4
+++ b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=56c4ff05a585c69a0373df8f6d5ecfbd
diff --git a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.3 b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.3
index ebcd471e863f..6d0c09806421 100644
--- a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.3
+++ b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cc0d684323c0f0ac1ab6d84ca42a90e7
diff --git a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.4 b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.4
index 36c925932594..766c9ea4601c 100644
--- a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.4
+++ b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61f0d4cd77ec544cc8f6059f434e0104
diff --git a/metadata/md5-cache/kde-base/kdepasswd-4.7.4 b/metadata/md5-cache/kde-base/kdepasswd-4.7.4
index ca5e883aeaaf..e5bf4590de4a 100644
--- a/metadata/md5-cache/kde-base/kdepasswd-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepasswd-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/kdesu-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0bea6959a285ba292861625fc62deadf
diff --git a/metadata/md5-cache/kde-base/kdepasswd-4.8.3 b/metadata/md5-cache/kde-base/kdepasswd-4.8.3
index b86c29e0e28d..de8272ca15e2 100644
--- a/metadata/md5-cache/kde-base/kdepasswd-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepasswd-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/kdesu-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=268fda09766fd8551d086c133fcd6ac0
diff --git a/metadata/md5-cache/kde-base/kdepasswd-4.8.4 b/metadata/md5-cache/kde-base/kdepasswd-4.8.4
index 56987dfe7fac..7020828460f3 100644
--- a/metadata/md5-cache/kde-base/kdepasswd-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepasswd-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/kdesu-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dea4a02f9aa335f1e67f1fa572397a63
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.7.4 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.7.4
index 7f6cd7a076a2..87a71ec184f5 100644
--- a/metadata/md5-cache/kde-base/kdepim-common-libs-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-des
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e8164eae60ab2918f66a525e7c62cae0
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.3 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.3
index 22f3559405fb..94d66bdc5524 100644
--- a/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-des
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=acffc2045242b85554e1c40a5c4f0081
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.4 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.4
index 66617601b2c9..1fcc19f5470b 100644
--- a/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-des
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=10a9170c319f3d23f4080e4b4b011520
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.4.11.1 b/metadata/md5-cache/kde-base/kdepim-icons-4.4.11.1
index 44beaa1285d0..1a33ed951b1b 100644
--- a/metadata/md5-cache/kde-base/kdepim-icons-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ee383810e1c85f5704f86ec121c3b237
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.7.4 b/metadata/md5-cache/kde-base/kdepim-icons-4.7.4
index 7f514d828f71..08c15883eaf9 100644
--- a/metadata/md5-cache/kde-base/kdepim-icons-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=294835026f236dce72edc68859da16d0
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.8.3 b/metadata/md5-cache/kde-base/kdepim-icons-4.8.3
index 81cd6ed69786..eb11c5726e7e 100644
--- a/metadata/md5-cache/kde-base/kdepim-icons-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1fe8ddcf4bd1b7ee808eddcbb4a9c448
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.8.4 b/metadata/md5-cache/kde-base/kdepim-icons-4.8.4
index 08be0b63ff62..b4363b1e7f6d 100644
--- a/metadata/md5-cache/kde-base/kdepim-icons-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ef1e8030222ba0b9e7638e15e948425b
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.4.11.1 b/metadata/md5-cache/kde-base/kdepim-kresources-4.4.11.1
index 1b67c2eb7d5d..80e372f67968 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d9751b68313152a6492ac7ce2f76b785
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.7.4 b/metadata/md5-cache/kde-base/kdepim-kresources-4.7.4
index 2f80d7def471..1da75af6ac13 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=49eff3f0b8ac191d048c61430edfe86f
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.8.3 b/metadata/md5-cache/kde-base/kdepim-kresources-4.8.3
index 0159ddcf9df9..16033ab02a64 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fa832c6a71f6dbe97f3d53c4a0e1de9f
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.8.4 b/metadata/md5-cache/kde-base/kdepim-kresources-4.8.4
index ce4649bf734b..1090a148f7e2 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3d8fafdaa5f885942d150ee5c77a7827
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.4.11.1-r1 b/metadata/md5-cache/kde-base/kdepim-l10n-4.4.11.1-r1
index fb2f2efac833..cb95b5a67218 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.4.11.1-r1
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.4.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/kde-l10n-4.5.50:4 >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ar-4.4.5.tar.bz2 ) linguas_bg? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-bg-4.4.5.tar.bz2 ) linguas_ca? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ca-4.4.5.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ca@valencia-4.4.5.tar.bz2 ) linguas_cs? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-cs-4.4.5.tar.bz2 ) linguas_csb? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-csb-4.4.5.tar.bz2 ) linguas_da? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-da-4.4.5.tar.bz2 ) linguas_de? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-de-4.4.5.tar.bz2 ) linguas_el? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-el-4.4.5.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-en_GB-4.4.5.tar.bz2 ) linguas_eo? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-eo-4.4.5.tar.bz2 ) linguas_es? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-es-4.4.5.tar.bz2 ) linguas_et? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-et-4.4.5.tar.bz2 ) linguas_eu? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-eu-4.4.5.tar.bz2 ) linguas_fi? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-fi-4.4.5.tar.bz2 ) linguas_fr? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-fr-4.4.5.tar.bz2 ) linguas_fy? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-fy-4.4.5.tar.bz2 ) linguas_ga? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ga-4.4.5.tar.bz2 ) linguas_gl? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-gl-4.4.5.tar.bz2 ) linguas_gu? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-gu-4.4.5.tar.bz2 ) linguas_he? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-he-4.4.5.tar.bz2 ) linguas_hi? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-hi-4.4.5.tar.bz2 ) linguas_hr? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-hr-4.4.5.tar.bz2 ) linguas_hu? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-hu-4.4.5.tar.bz2 ) linguas_id? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-id-4.4.5.tar.bz2 ) linguas_is? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-is-4.4.5.tar.bz2 ) linguas_it? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-it-4.4.5.tar.bz2 ) linguas_ja? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ja-4.4.5.tar.bz2 ) linguas_kk? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-kk-4.4.5.tar.bz2 ) linguas_km? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-km-4.4.5.tar.bz2 ) linguas_kn? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-kn-4.4.5.tar.bz2 ) linguas_ko? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ko-4.4.5.tar.bz2 ) linguas_lt? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-lt-4.4.5.tar.bz2 ) linguas_lv? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-lv-4.4.5.tar.bz2 ) linguas_mai? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-mai-4.4.5.tar.bz2 ) linguas_mk? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-mk-4.4.5.tar.bz2 ) linguas_ml? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ml-4.4.5.tar.bz2 ) linguas_nb? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-nb-4.4.5.tar.bz2 ) linguas_nds? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-nds-4.4.5.tar.bz2 ) linguas_nl? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-nl-4.4.5.tar.bz2 ) linguas_nn? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-nn-4.4.5.tar.bz2 ) linguas_pa? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-pa-4.4.5.tar.bz2 ) linguas_pl? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-pl-4.4.5.tar.bz2 ) linguas_pt? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-pt-4.4.5.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-pt_BR-4.4.5.tar.bz2 ) linguas_ro? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ro-4.4.5.tar.bz2 ) linguas_ru? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-ru-4.4.5.tar.bz2 ) linguas_si? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-si-4.4.5.tar.bz2 ) linguas_sk? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-sk-4.4.5.tar.bz2 ) linguas_sl? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-sl-4.4.5.tar.bz2 ) linguas_sr? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-sr-4.4.5.tar.bz2 ) linguas_sv? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-sv-4.4.5.tar.bz2 ) linguas_tg? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-tg-4.4.5.tar.bz2 ) linguas_tr? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-tr-4.4.5.tar.bz2 ) linguas_uk? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-uk-4.4.5.tar.bz2 ) linguas_wa? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-wa-4.4.5.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-zh_CN-4.4.5.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-l10n/kde-l10n-zh_TW-4.4.5.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d81604e132e495843fd0bfc1f4c984e
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4 b/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4
index dc7b3c143eb0..e0efbb38adec 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ar-4.7.4.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bg-4.7.4.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bs-4.7.4.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca-4.7.4.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca@valencia-4.7.4.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-cs-4.7.4.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-da-4.7.4.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-de-4.7.4.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-el-4.7.4.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-en_GB-4.7.4.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-es-4.7.4.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-et-4.7.4.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-eu-4.7.4.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fi-4.7.4.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fr-4.7.4.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ga-4.7.4.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-gl-4.7.4.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-he-4.7.4.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hr-4.7.4.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hu-4.7.4.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ia-4.7.4.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-id-4.7.4.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-is-4.7.4.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-it-4.7.4.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ja-4.7.4.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kk-4.7.4.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-km-4.7.4.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kn-4.7.4.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ko-4.7.4.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lt-4.7.4.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lv-4.7.4.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nb-4.7.4.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nds-4.7.4.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nl-4.7.4.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nn-4.7.4.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pa-4.7.4.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pl-4.7.4.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt-4.7.4.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt_BR-4.7.4.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ro-4.7.4.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ru-4.7.4.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sk-4.7.4.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sl-4.7.4.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sr-4.7.4.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sv-4.7.4.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-th-4.7.4.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-tr-4.7.4.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ug-4.7.4.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-uk-4.7.4.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-wa-4.7.4.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_CN-4.7.4.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_TW-4.7.4.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9f639669cb1b01eede1c67b02b2db2c2
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4-r1 b/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4-r1
index 01e417fba471..3e4dc61461b5 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ar-4.7.4.tar.bz2 ) linguas_bg? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bg-4.7.4.tar.bz2 ) linguas_bs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-bs-4.7.4.tar.bz2 ) linguas_ca? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca-4.7.4.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ca@valencia-4.7.4.tar.bz2 ) linguas_cs? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-cs-4.7.4.tar.bz2 ) linguas_da? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-da-4.7.4.tar.bz2 ) linguas_de? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-de-4.7.4.tar.bz2 ) linguas_el? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-el-4.7.4.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-en_GB-4.7.4.tar.bz2 ) linguas_es? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-es-4.7.4.tar.bz2 ) linguas_et? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-et-4.7.4.tar.bz2 ) linguas_eu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-eu-4.7.4.tar.bz2 ) linguas_fi? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fi-4.7.4.tar.bz2 ) linguas_fr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-fr-4.7.4.tar.bz2 ) linguas_ga? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ga-4.7.4.tar.bz2 ) linguas_gl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-gl-4.7.4.tar.bz2 ) linguas_he? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-he-4.7.4.tar.bz2 ) linguas_hr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hr-4.7.4.tar.bz2 ) linguas_hu? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-hu-4.7.4.tar.bz2 ) linguas_ia? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ia-4.7.4.tar.bz2 ) linguas_id? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-id-4.7.4.tar.bz2 ) linguas_is? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-is-4.7.4.tar.bz2 ) linguas_it? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-it-4.7.4.tar.bz2 ) linguas_ja? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ja-4.7.4.tar.bz2 ) linguas_kk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kk-4.7.4.tar.bz2 ) linguas_km? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-km-4.7.4.tar.bz2 ) linguas_kn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-kn-4.7.4.tar.bz2 ) linguas_ko? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ko-4.7.4.tar.bz2 ) linguas_lt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lt-4.7.4.tar.bz2 ) linguas_lv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-lv-4.7.4.tar.bz2 ) linguas_nb? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nb-4.7.4.tar.bz2 ) linguas_nds? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nds-4.7.4.tar.bz2 ) linguas_nl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nl-4.7.4.tar.bz2 ) linguas_nn? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-nn-4.7.4.tar.bz2 ) linguas_pa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pa-4.7.4.tar.bz2 ) linguas_pl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pl-4.7.4.tar.bz2 ) linguas_pt? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt-4.7.4.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-pt_BR-4.7.4.tar.bz2 ) linguas_ro? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ro-4.7.4.tar.bz2 ) linguas_ru? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ru-4.7.4.tar.bz2 ) linguas_sk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sk-4.7.4.tar.bz2 ) linguas_sl? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sl-4.7.4.tar.bz2 ) linguas_sr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sr-4.7.4.tar.bz2 ) linguas_sv? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-sv-4.7.4.tar.bz2 ) linguas_th? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-th-4.7.4.tar.bz2 ) linguas_tr? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-tr-4.7.4.tar.bz2 ) linguas_ug? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-ug-4.7.4.tar.bz2 ) linguas_uk? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-uk-4.7.4.tar.bz2 ) linguas_wa? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-wa-4.7.4.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_CN-4.7.4.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/4.7.4/src/kde-l10n/kde-l10n-zh_TW-4.7.4.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7393236c7df72ac1459fa18f19318f31
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.8.3 b/metadata/md5-cache/kde-base/kdepim-l10n-4.8.3
index 1427515d3fbd..fedf45779232 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ar-4.8.3.tar.xz ) linguas_bg? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-bg-4.8.3.tar.xz ) linguas_bs? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-bs-4.8.3.tar.xz ) linguas_ca? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ca-4.8.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ca@valencia-4.8.3.tar.xz ) linguas_cs? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-cs-4.8.3.tar.xz ) linguas_da? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-da-4.8.3.tar.xz ) linguas_de? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-de-4.8.3.tar.xz ) linguas_el? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-el-4.8.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-en_GB-4.8.3.tar.xz ) linguas_es? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-es-4.8.3.tar.xz ) linguas_et? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-et-4.8.3.tar.xz ) linguas_eu? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-eu-4.8.3.tar.xz ) linguas_fa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fa-4.8.3.tar.xz ) linguas_fi? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fi-4.8.3.tar.xz ) linguas_fr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-fr-4.8.3.tar.xz ) linguas_ga? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ga-4.8.3.tar.xz ) linguas_gl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-gl-4.8.3.tar.xz ) linguas_he? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-he-4.8.3.tar.xz ) linguas_hr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-hr-4.8.3.tar.xz ) linguas_hu? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-hu-4.8.3.tar.xz ) linguas_ia? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ia-4.8.3.tar.xz ) linguas_id? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-id-4.8.3.tar.xz ) linguas_is? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-is-4.8.3.tar.xz ) linguas_it? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-it-4.8.3.tar.xz ) linguas_ja? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ja-4.8.3.tar.xz ) linguas_kk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-kk-4.8.3.tar.xz ) linguas_km? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-km-4.8.3.tar.xz ) linguas_ko? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ko-4.8.3.tar.xz ) linguas_lt? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-lt-4.8.3.tar.xz ) linguas_lv? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-lv-4.8.3.tar.xz ) linguas_nb? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nb-4.8.3.tar.xz ) linguas_nds? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nds-4.8.3.tar.xz ) linguas_nl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nl-4.8.3.tar.xz ) linguas_nn? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-nn-4.8.3.tar.xz ) linguas_pa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pa-4.8.3.tar.xz ) linguas_pl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pl-4.8.3.tar.xz ) linguas_pt? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pt-4.8.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-pt_BR-4.8.3.tar.xz ) linguas_ro? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ro-4.8.3.tar.xz ) linguas_ru? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ru-4.8.3.tar.xz ) linguas_si? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-si-4.8.3.tar.xz ) linguas_sk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sk-4.8.3.tar.xz ) linguas_sl? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sl-4.8.3.tar.xz ) linguas_sr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sr-4.8.3.tar.xz ) linguas_sv? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-sv-4.8.3.tar.xz ) linguas_tg? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-tg-4.8.3.tar.xz ) linguas_th? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-th-4.8.3.tar.xz ) linguas_tr? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-tr-4.8.3.tar.xz ) linguas_ug? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-ug-4.8.3.tar.xz ) linguas_uk? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-uk-4.8.3.tar.xz ) linguas_vi? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-vi-4.8.3.tar.xz ) linguas_wa? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-wa-4.8.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-zh_CN-4.8.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.8.3/src/kde-l10n/kde-l10n-zh_TW-4.8.3.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1cf796e8f1c713497fcf4b190e3fa43f
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.8.4 b/metadata/md5-cache/kde-base/kdepim-l10n-4.8.4
index d9e09a7b93d9..cc44d5c54172 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ar-4.8.4.tar.xz ) linguas_bg? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-bg-4.8.4.tar.xz ) linguas_bs? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-bs-4.8.4.tar.xz ) linguas_ca? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ca-4.8.4.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ca@valencia-4.8.4.tar.xz ) linguas_cs? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-cs-4.8.4.tar.xz ) linguas_da? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-da-4.8.4.tar.xz ) linguas_de? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-de-4.8.4.tar.xz ) linguas_el? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-el-4.8.4.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-en_GB-4.8.4.tar.xz ) linguas_es? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-es-4.8.4.tar.xz ) linguas_et? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-et-4.8.4.tar.xz ) linguas_eu? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-eu-4.8.4.tar.xz ) linguas_fa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fa-4.8.4.tar.xz ) linguas_fi? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fi-4.8.4.tar.xz ) linguas_fr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-fr-4.8.4.tar.xz ) linguas_ga? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ga-4.8.4.tar.xz ) linguas_gl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-gl-4.8.4.tar.xz ) linguas_he? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-he-4.8.4.tar.xz ) linguas_hr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-hr-4.8.4.tar.xz ) linguas_hu? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-hu-4.8.4.tar.xz ) linguas_ia? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ia-4.8.4.tar.xz ) linguas_id? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-id-4.8.4.tar.xz ) linguas_is? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-is-4.8.4.tar.xz ) linguas_it? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-it-4.8.4.tar.xz ) linguas_ja? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ja-4.8.4.tar.xz ) linguas_kk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-kk-4.8.4.tar.xz ) linguas_km? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-km-4.8.4.tar.xz ) linguas_ko? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ko-4.8.4.tar.xz ) linguas_lt? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-lt-4.8.4.tar.xz ) linguas_lv? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-lv-4.8.4.tar.xz ) linguas_nb? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nb-4.8.4.tar.xz ) linguas_nds? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nds-4.8.4.tar.xz ) linguas_nl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nl-4.8.4.tar.xz ) linguas_nn? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-nn-4.8.4.tar.xz ) linguas_pa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pa-4.8.4.tar.xz ) linguas_pl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pl-4.8.4.tar.xz ) linguas_pt? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pt-4.8.4.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-pt_BR-4.8.4.tar.xz ) linguas_ro? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ro-4.8.4.tar.xz ) linguas_ru? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ru-4.8.4.tar.xz ) linguas_si? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-si-4.8.4.tar.xz ) linguas_sk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sk-4.8.4.tar.xz ) linguas_sl? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sl-4.8.4.tar.xz ) linguas_sr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sr-4.8.4.tar.xz ) linguas_sv? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-sv-4.8.4.tar.xz ) linguas_tg? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-tg-4.8.4.tar.xz ) linguas_th? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-th-4.8.4.tar.xz ) linguas_tr? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-tr-4.8.4.tar.xz ) linguas_ug? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-ug-4.8.4.tar.xz ) linguas_uk? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-uk-4.8.4.tar.xz ) linguas_vi? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-vi-4.8.4.tar.xz ) linguas_wa? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-wa-4.8.4.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-zh_CN-4.8.4.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.8.4/src/kde-l10n/kde-l10n-zh_TW-4.8.4.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7c13048e4c8972a96f0f7fa49562b563
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.4.11.1 b/metadata/md5-cache/kde-base/kdepim-runtime-4.4.11.1
index d23344356e97..a15048172a84 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.4.11.1
@@ -10,5 +10,5 @@ RDEPEND=app-misc/strigi >=app-office/akonadi-server-1.3.1 dev-libs/libxml2:2 dev
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-runtime-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1af901c4e2d879f01ce511960fc36dc5
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.7.4 b/metadata/md5-cache/kde-base/kdepim-runtime-4.7.4
index b7d8e6df1f34..49843b168815 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=app-misc/strigi >=app-office/akonadi-server-1.3.60 dev-libs/boost dev-li
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aaba4e4d54f45773c4c63695d96a7a50
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.8.3-r2 b/metadata/md5-cache/kde-base/kdepim-runtime-4.8.3-r2
index 712012b6904f..8dd19b74f086 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.8.3-r2
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=app-misc/strigi >=app-office/akonadi-server-1.7.0 dev-libs/boost dev-lib
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a05fd1fed0ac88f6ed9ed6709e0af3f0
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.8.4 b/metadata/md5-cache/kde-base/kdepim-runtime-4.8.4
index 020a82c1556e..9379af4a6eaf 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=app-misc/strigi >=app-office/akonadi-server-1.7.0 dev-libs/boost dev-lib
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=413d7418f8c7fb1d8e7650a86d73d908
diff --git a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.4.11.1 b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
index 3a70ecbc9c1b..1ff8385080b0 100644
--- a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=745dc1709e953f369a53089a949c28d4
diff --git a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.7.4 b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.7.4
index 26aad7ac9b3d..53512a39722e 100644
--- a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2d2cd546706d4d6bb5ea3265d6fc061f
diff --git a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.3 b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.3
index 85b132a9b014..e1b6c0bf6cbb 100644
--- a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a2783908a0f06e8a4571455efdc8c6e
diff --git a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.4 b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.4
index af04399f8f62..a2c4f3e050fc 100644
--- a/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepim-strigi-analyzer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e82db75dcb7f505850b7f9f6d307a3fb
diff --git a/metadata/md5-cache/kde-base/kdepim-wizards-4.4.11.1 b/metadata/md5-cache/kde-base/kdepim-wizards-4.4.11.1
index aacea3f7f6fd..fd34905b1cea 100644
--- a/metadata/md5-cache/kde-base/kdepim-wizards-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kdepim-wizards-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/kdepim-kresources-4.4.11.1:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0d1076ae33ee286a8da9b444b014bed1
diff --git a/metadata/md5-cache/kde-base/kdepim-wizards-4.7.4 b/metadata/md5-cache/kde-base/kdepim-wizards-4.7.4
index e2c197ec7d0d..2e64ab1eeddf 100644
--- a/metadata/md5-cache/kde-base/kdepim-wizards-4.7.4
+++ b/metadata/md5-cache/kde-base/kdepim-wizards-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-kresources-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=465e3ef19fc95a6bb53a3e4715b4c3de
diff --git a/metadata/md5-cache/kde-base/kdepimlibs-4.7.4-r1 b/metadata/md5-cache/kde-base/kdepimlibs-4.7.4-r1
index 25259f8c453d..932081cfb823 100644
--- a/metadata/md5-cache/kde-base/kdepimlibs-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kdepimlibs-4.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.6 dev-libs/libgpg-error >=dev-libs/libical-0.43 de
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepimlibs-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c0262f421c5baaef99a645b62ff699da
diff --git a/metadata/md5-cache/kde-base/kdepimlibs-4.8.3 b/metadata/md5-cache/kde-base/kdepimlibs-4.8.3
index d2346b048dba..ee942509585f 100644
--- a/metadata/md5-cache/kde-base/kdepimlibs-4.8.3
+++ b/metadata/md5-cache/kde-base/kdepimlibs-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5 dev-libs/libgpg-error
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepimlibs-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ee7a5e2756a4b67b1ad4b11d190fc93f
diff --git a/metadata/md5-cache/kde-base/kdepimlibs-4.8.4 b/metadata/md5-cache/kde-base/kdepimlibs-4.8.4
index 5609a523e282..deb83d906b43 100644
--- a/metadata/md5-cache/kde-base/kdepimlibs-4.8.4
+++ b/metadata/md5-cache/kde-base/kdepimlibs-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5 dev-libs/libgpg-error
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepimlibs-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=31b8a1631ebeaf0f38288279fa77c7c7
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.7.4 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.7.4
index 73316071c4a2..eae7bbb933fd 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.7.4
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.7.4:4[aqua=] >=kde-base/plasma-workspace-4.7.4:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.7.4:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.7.4:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.7.4:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeplasma-addons-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=492665a7ad62eea2de42e584f9546131
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.3 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.3
index 07eb0b669596..0b1628921735 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.3
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.8.3:4[aqua=] >=kde-base/plasma-workspace-4.8.3:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.8.3:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.8.3:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.8.3:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeplasma-addons-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e6744940db517f3cce9ef3b2bf0deb6e
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.4 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.4
index 3b633d2dbfd0..baa379be19dd 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.4
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/krunner-4.8.4:4[aqua=] >=kde-base/plasma-workspace-4.8.4:4[aqua=,semantic-desktop=] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.8.4:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.8.4:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/plasma-workspace-4.8.4:4[aqua=,rss] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeplasma-addons-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3f0ba5cbdc8a4dc1e5eb24c586adf13d
diff --git a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.7.4 b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.7.4
index e5743cd412fa..6d6b0f32445a 100644
--- a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.7.4
+++ b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2d013307b1a8e08ea090ce0090ab2d84
diff --git a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.3 b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.3
index 81b16b940816..07eb09ce5029 100644
--- a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.3
+++ b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=56dc0bc9e09fccc79a3d168e6d1eaef8
diff --git a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.4 b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.4
index ae5f20e62271..a05d4e03b6ce 100644
--- a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.4
+++ b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cb1cee5a4114b2dcf389a06adf3172dd
diff --git a/metadata/md5-cache/kde-base/kdesdk-misc-4.7.4 b/metadata/md5-cache/kde-base/kdesdk-misc-4.7.4
index fb47569c7d52..57f299e47588 100644
--- a/metadata/md5-cache/kde-base/kdesdk-misc-4.7.4
+++ b/metadata/md5-cache/kde-base/kdesdk-misc-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f94b406afd12c071c901319ef4719f8c
diff --git a/metadata/md5-cache/kde-base/kdesdk-misc-4.8.3 b/metadata/md5-cache/kde-base/kdesdk-misc-4.8.3
index 54ee37975bf1..dbab7fd5f458 100644
--- a/metadata/md5-cache/kde-base/kdesdk-misc-4.8.3
+++ b/metadata/md5-cache/kde-base/kdesdk-misc-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=83dafccc7143e2ae678597c8a2aeb482
diff --git a/metadata/md5-cache/kde-base/kdesdk-misc-4.8.4 b/metadata/md5-cache/kde-base/kdesdk-misc-4.8.4
index d21c4863f374..c13a3c695533 100644
--- a/metadata/md5-cache/kde-base/kdesdk-misc-4.8.4
+++ b/metadata/md5-cache/kde-base/kdesdk-misc-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e5f99324237d1c8ff597201192e7f428
diff --git a/metadata/md5-cache/kde-base/kdesdk-scripts-4.7.4 b/metadata/md5-cache/kde-base/kdesdk-scripts-4.7.4
index 47d65a357b8a..7e05b972886b 100644
--- a/metadata/md5-cache/kde-base/kdesdk-scripts-4.7.4
+++ b/metadata/md5-cache/kde-base/kdesdk-scripts-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0c884d9d27067a710a38a8d32eb4c054
diff --git a/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.3 b/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.3
index 1715d4f324a4..959724532ed1 100644
--- a/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.3
+++ b/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=44ebe1132981944aec097adab692a821
diff --git a/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.4 b/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.4
index 7f2177cc8338..0f24b476132b 100644
--- a/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.4
+++ b/metadata/md5-cache/kde-base/kdesdk-scripts-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a8cb6fc49b5d1b72d5913b1c4cb730ee
diff --git a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.7.4 b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.7.4
index 16e1a0e4a8be..5efa6a1010ed 100644
--- a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.7.4
+++ b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=83b84d4bb33b676a05e451fd8af29aa9
diff --git a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.3 b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.3
index c9fe5e8bfd0b..3ff1c86d70ca 100644
--- a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.3
+++ b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9746d39c5e01727b84e4e13ae7bd98d5
diff --git a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.4 b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.4
index 4932c1a93f5b..dea03a15bb59 100644
--- a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.4
+++ b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5dafa42d518a7a04815f6b9a67becb56
diff --git a/metadata/md5-cache/kde-base/kdesu-4.7.4 b/metadata/md5-cache/kde-base/kdesu-4.7.4
index d474bf347ad3..712b81306b18 100644
--- a/metadata/md5-cache/kde-base/kdesu-4.7.4
+++ b/metadata/md5-cache/kde-base/kdesu-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d1c6f9c86fb956809b3558da0dc28dd8
diff --git a/metadata/md5-cache/kde-base/kdesu-4.8.3 b/metadata/md5-cache/kde-base/kdesu-4.8.3
index 22a4834c3efd..96b4e36bf94e 100644
--- a/metadata/md5-cache/kde-base/kdesu-4.8.3
+++ b/metadata/md5-cache/kde-base/kdesu-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5f53aedf7a4229cf6387f45a4b16279d
diff --git a/metadata/md5-cache/kde-base/kdesu-4.8.4 b/metadata/md5-cache/kde-base/kdesu-4.8.4
index ae2e64b4367a..7cbd9ff67545 100644
--- a/metadata/md5-cache/kde-base/kdesu-4.8.4
+++ b/metadata/md5-cache/kde-base/kdesu-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e5ad1c56147ffbfcaf74fefa2b80d730
diff --git a/metadata/md5-cache/kde-base/kdf-4.7.4 b/metadata/md5-cache/kde-base/kdf-4.7.4
index ba88b8567e06..7d65693419c3 100644
--- a/metadata/md5-cache/kde-base/kdf-4.7.4
+++ b/metadata/md5-cache/kde-base/kdf-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=162dcc73cfa745781de8ea7c359b4883
diff --git a/metadata/md5-cache/kde-base/kdf-4.8.3 b/metadata/md5-cache/kde-base/kdf-4.8.3
index 0565a31295d7..cfcb8e8e6b54 100644
--- a/metadata/md5-cache/kde-base/kdf-4.8.3
+++ b/metadata/md5-cache/kde-base/kdf-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdf-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=283c237b181a87cfabf28692d8cbb324
diff --git a/metadata/md5-cache/kde-base/kdf-4.8.4 b/metadata/md5-cache/kde-base/kdf-4.8.4
index 393f3a950a0a..0eb19df48cd8 100644
--- a/metadata/md5-cache/kde-base/kdf-4.8.4
+++ b/metadata/md5-cache/kde-base/kdf-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdf-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=516f89b5c790d14fca7906a7103781b8
diff --git a/metadata/md5-cache/kde-base/kdialog-4.7.4 b/metadata/md5-cache/kde-base/kdialog-4.7.4
index 1364f5d6f482..cd01ac188a0a 100644
--- a/metadata/md5-cache/kde-base/kdialog-4.7.4
+++ b/metadata/md5-cache/kde-base/kdialog-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3541f9af8a0932799b985167aecc6321
diff --git a/metadata/md5-cache/kde-base/kdialog-4.8.3 b/metadata/md5-cache/kde-base/kdialog-4.8.3
index b0357b8a9c95..82d04ba1600a 100644
--- a/metadata/md5-cache/kde-base/kdialog-4.8.3
+++ b/metadata/md5-cache/kde-base/kdialog-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8b32ff76f03ae88aea2f1717051dd1d6
diff --git a/metadata/md5-cache/kde-base/kdialog-4.8.4 b/metadata/md5-cache/kde-base/kdialog-4.8.4
index 37c217c8f216..11c000c48d0b 100644
--- a/metadata/md5-cache/kde-base/kdialog-4.8.4
+++ b/metadata/md5-cache/kde-base/kdialog-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=da210f0456947493b452e422032edeec
diff --git a/metadata/md5-cache/kde-base/kdiamond-4.7.4 b/metadata/md5-cache/kde-base/kdiamond-4.7.4
index 624db16acacb..7cc2a7f556df 100644
--- a/metadata/md5-cache/kde-base/kdiamond-4.7.4
+++ b/metadata/md5-cache/kde-base/kdiamond-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4811904f317da7fb1f24ddd986544885
diff --git a/metadata/md5-cache/kde-base/kdiamond-4.8.3 b/metadata/md5-cache/kde-base/kdiamond-4.8.3
index 4fec72458201..1f71eb00a837 100644
--- a/metadata/md5-cache/kde-base/kdiamond-4.8.3
+++ b/metadata/md5-cache/kde-base/kdiamond-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=306a6ffcb0555a47b664df0e2f1a37e1
diff --git a/metadata/md5-cache/kde-base/kdiamond-4.8.4 b/metadata/md5-cache/kde-base/kdiamond-4.8.4
index e23e8fcb1160..eae885145174 100644
--- a/metadata/md5-cache/kde-base/kdiamond-4.8.4
+++ b/metadata/md5-cache/kde-base/kdiamond-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4046f9cfc17756cb26600e30a77ae986
diff --git a/metadata/md5-cache/kde-base/kdm-4.7.4 b/metadata/md5-cache/kde-base/kdm-4.7.4
index 91b62ad9d877..f3510cfd9b33 100644
--- a/metadata/md5-cache/kde-base/kdm-4.7.4
+++ b/metadata/md5-cache/kde-base/kdm-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.7.4:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.7.4:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3da7da9732ba3cb9fabda30da00ff29e
diff --git a/metadata/md5-cache/kde-base/kdm-4.7.4-r1 b/metadata/md5-cache/kde-base/kdm-4.7.4-r1
index 47a2dd5cdd96..70943d3a3901 100644
--- a/metadata/md5-cache/kde-base/kdm-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kdm-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.7.4:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.7.4:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3711d107c0cbb8f690ef722703cf2993
diff --git a/metadata/md5-cache/kde-base/kdm-4.8.3 b/metadata/md5-cache/kde-base/kdm-4.8.3
index 2ee42b890528..b8a9f85afbbf 100644
--- a/metadata/md5-cache/kde-base/kdm-4.8.3
+++ b/metadata/md5-cache/kde-base/kdm-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.3:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.8.3:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.8.3:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=82a41f60a1b082b9690b815f0ba12ea1
diff --git a/metadata/md5-cache/kde-base/kdm-4.8.4 b/metadata/md5-cache/kde-base/kdm-4.8.4
index 196e8c2ac099..73a4b25f63f4 100644
--- a/metadata/md5-cache/kde-base/kdm-4.8.4
+++ b/metadata/md5-cache/kde-base/kdm-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.4:4[aqua=] x11-libs/libXau x11-libs/libXdmcp x11-libs/libXtst consolekit? ( >=sys-apps/dbus-1.0.2 sys-auth/consolekit ) kerberos? ( virtual/krb5 ) pam? ( >=kde-base/kcheckpass-4.8.4:4[aqua=] virtual/pam ) >=kde-base/kdepasswd-4.8.4:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=83b2c4ffcd2578cf642b331c20343d15
diff --git a/metadata/md5-cache/kde-base/kdnssd-4.7.4 b/metadata/md5-cache/kde-base/kdnssd-4.7.4
index 6b97a1c80b97..1693f7f3b5a7 100644
--- a/metadata/md5-cache/kde-base/kdnssd-4.7.4
+++ b/metadata/md5-cache/kde-base/kdnssd-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=zeroconf? ( >=kde-base/kdelibs-4.7.4:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=975e983166388a3e7fa21dc2b2d4fc14
diff --git a/metadata/md5-cache/kde-base/kdnssd-4.8.3 b/metadata/md5-cache/kde-base/kdnssd-4.8.3
index 14a82c9a917c..64152d89c776 100644
--- a/metadata/md5-cache/kde-base/kdnssd-4.8.3
+++ b/metadata/md5-cache/kde-base/kdnssd-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=zeroconf? ( >=kde-base/kdelibs-4.8.3:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fb03ec38da5ea3a7ef66dcfac601783a
diff --git a/metadata/md5-cache/kde-base/kdnssd-4.8.4 b/metadata/md5-cache/kde-base/kdnssd-4.8.4
index 621717cf664e..eb1151229a0c 100644
--- a/metadata/md5-cache/kde-base/kdnssd-4.8.4
+++ b/metadata/md5-cache/kde-base/kdnssd-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=zeroconf? ( >=kde-base/kdelibs-4.8.4:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5146bf26b997b20c213513eef77fb303
diff --git a/metadata/md5-cache/kde-base/kdontchangethehostname-4.7.4 b/metadata/md5-cache/kde-base/kdontchangethehostname-4.7.4
index 41aebe41557b..f823f020c978 100644
--- a/metadata/md5-cache/kde-base/kdontchangethehostname-4.7.4
+++ b/metadata/md5-cache/kde-base/kdontchangethehostname-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xauth >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96c9be5f30bbc90de3e31495a15b4ae5
diff --git a/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.3 b/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.3
index 9657f6163f89..c15d191d59a3 100644
--- a/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.3
+++ b/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xauth >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9273de9f5e4cd8f8a8d059989862aa63
diff --git a/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.4 b/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.4
index 214859401c2c..75c0268cd76e 100644
--- a/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.4
+++ b/metadata/md5-cache/kde-base/kdontchangethehostname-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xauth >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=92994da808bb8b1c0befd6a0b073102f
diff --git a/metadata/md5-cache/kde-base/keditbookmarks-4.7.4 b/metadata/md5-cache/kde-base/keditbookmarks-4.7.4
index 1426e5efbe96..d7fafd404742 100644
--- a/metadata/md5-cache/kde-base/keditbookmarks-4.7.4
+++ b/metadata/md5-cache/kde-base/keditbookmarks-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a879461e14173145d8799c28a9a1c628
diff --git a/metadata/md5-cache/kde-base/keditbookmarks-4.7.4-r1 b/metadata/md5-cache/kde-base/keditbookmarks-4.7.4-r1
index 66d0815abe3f..8e4e1261f619 100644
--- a/metadata/md5-cache/kde-base/keditbookmarks-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/keditbookmarks-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=26ae5c66f04a787fa3b852b2a9cadffc
diff --git a/metadata/md5-cache/kde-base/keditbookmarks-4.8.3 b/metadata/md5-cache/kde-base/keditbookmarks-4.8.3
index 311668cb5f1d..03dd26296f11 100644
--- a/metadata/md5-cache/kde-base/keditbookmarks-4.8.3
+++ b/metadata/md5-cache/kde-base/keditbookmarks-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7e88d93363b4b4a7b6d7bc90dc2b2b88
diff --git a/metadata/md5-cache/kde-base/keditbookmarks-4.8.4 b/metadata/md5-cache/kde-base/keditbookmarks-4.8.4
index 88b5009398eb..92f227d9bbed 100644
--- a/metadata/md5-cache/kde-base/keditbookmarks-4.8.4
+++ b/metadata/md5-cache/kde-base/keditbookmarks-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ede33e22712e73421ae58e5c3e6f155
diff --git a/metadata/md5-cache/kde-base/keditfiletype-4.7.4 b/metadata/md5-cache/kde-base/keditfiletype-4.7.4
index a59c62a4dd64..71b8e625b69d 100644
--- a/metadata/md5-cache/kde-base/keditfiletype-4.7.4
+++ b/metadata/md5-cache/kde-base/keditfiletype-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c63904d9544442b9f0237558ab88266a
diff --git a/metadata/md5-cache/kde-base/keditfiletype-4.8.3 b/metadata/md5-cache/kde-base/keditfiletype-4.8.3
index b941732979ff..870b049aaed6 100644
--- a/metadata/md5-cache/kde-base/keditfiletype-4.8.3
+++ b/metadata/md5-cache/kde-base/keditfiletype-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6ff502fa1c897d569d2d80e6d503691f
diff --git a/metadata/md5-cache/kde-base/keditfiletype-4.8.4 b/metadata/md5-cache/kde-base/keditfiletype-4.8.4
index 2a31434b441e..22951100382c 100644
--- a/metadata/md5-cache/kde-base/keditfiletype-4.8.4
+++ b/metadata/md5-cache/kde-base/keditfiletype-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cf3a1fb1a8176f0ddaf5bd919f169511
diff --git a/metadata/md5-cache/kde-base/kephal-4.7.4 b/metadata/md5-cache/kde-base/kephal-4.7.4
index c4c5e08e560b..d9bc8da3596e 100644
--- a/metadata/md5-cache/kde-base/kephal-4.7.4
+++ b/metadata/md5-cache/kde-base/kephal-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXrandr >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b96b18c1740ef23efd94c070b842faa0
diff --git a/metadata/md5-cache/kde-base/kephal-4.8.3 b/metadata/md5-cache/kde-base/kephal-4.8.3
index ef77599842a9..704b23ccb561 100644
--- a/metadata/md5-cache/kde-base/kephal-4.8.3
+++ b/metadata/md5-cache/kde-base/kephal-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXrandr >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e6b02530c6fb9ae18ba205eb2fa0c37a
diff --git a/metadata/md5-cache/kde-base/kephal-4.8.4 b/metadata/md5-cache/kde-base/kephal-4.8.4
index 867a20ab22d6..62ee08213edb 100644
--- a/metadata/md5-cache/kde-base/kephal-4.8.4
+++ b/metadata/md5-cache/kde-base/kephal-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXrandr >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bff8c7424694a80d48c5035c06b6dd44
diff --git a/metadata/md5-cache/kde-base/kfile-4.7.4 b/metadata/md5-cache/kde-base/kfile-4.7.4
index 878a1b4f567b..9386f7a1ed46 100644
--- a/metadata/md5-cache/kde-base/kfile-4.7.4
+++ b/metadata/md5-cache/kde-base/kfile-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b973f11b2debfba9e0648ef2340fc0d1
diff --git a/metadata/md5-cache/kde-base/kfile-4.8.3 b/metadata/md5-cache/kde-base/kfile-4.8.3
index c177577b84d1..411d3f734715 100644
--- a/metadata/md5-cache/kde-base/kfile-4.8.3
+++ b/metadata/md5-cache/kde-base/kfile-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=028723a60588ce43126f561220340c4d
diff --git a/metadata/md5-cache/kde-base/kfile-4.8.4 b/metadata/md5-cache/kde-base/kfile-4.8.4
index 4218442c90f6..4110a4633169 100644
--- a/metadata/md5-cache/kde-base/kfile-4.8.4
+++ b/metadata/md5-cache/kde-base/kfile-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a904c07751aea5fa13a4e278bd80f625
diff --git a/metadata/md5-cache/kde-base/kfilereplace-4.7.4 b/metadata/md5-cache/kde-base/kfilereplace-4.7.4
index e63198019ef7..f6f9bef7da10 100644
--- a/metadata/md5-cache/kde-base/kfilereplace-4.7.4
+++ b/metadata/md5-cache/kde-base/kfilereplace-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdewebdev-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=be820694ff1e638a0e02b2cfa7b6845d
diff --git a/metadata/md5-cache/kde-base/kfilereplace-4.8.3 b/metadata/md5-cache/kde-base/kfilereplace-4.8.3
index f34f2fa16855..20a742c7dde6 100644
--- a/metadata/md5-cache/kde-base/kfilereplace-4.8.3
+++ b/metadata/md5-cache/kde-base/kfilereplace-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdewebdev-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=35c65b31ccad2f4b891f7cfaea997a9c
diff --git a/metadata/md5-cache/kde-base/kfilereplace-4.8.4 b/metadata/md5-cache/kde-base/kfilereplace-4.8.4
index e772c8c50eda..641c4056fe3b 100644
--- a/metadata/md5-cache/kde-base/kfilereplace-4.8.4
+++ b/metadata/md5-cache/kde-base/kfilereplace-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdewebdev-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1acf47763da65161ddfdd09d12508048
diff --git a/metadata/md5-cache/kde-base/kfind-4.7.4 b/metadata/md5-cache/kde-base/kfind-4.7.4
index e0955b245333..4dddefd92a7a 100644
--- a/metadata/md5-cache/kde-base/kfind-4.7.4
+++ b/metadata/md5-cache/kde-base/kfind-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5977eb148c74b9013aa28c459aa9066f
diff --git a/metadata/md5-cache/kde-base/kfind-4.8.3 b/metadata/md5-cache/kde-base/kfind-4.8.3
index fa1daa473930..ec1720c1ab6f 100644
--- a/metadata/md5-cache/kde-base/kfind-4.8.3
+++ b/metadata/md5-cache/kde-base/kfind-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0151c066b0600a0c9715a3ebf5b722fd
diff --git a/metadata/md5-cache/kde-base/kfind-4.8.4 b/metadata/md5-cache/kde-base/kfind-4.8.4
index d1411bc7d0a0..de028b19a0f8 100644
--- a/metadata/md5-cache/kde-base/kfind-4.8.4
+++ b/metadata/md5-cache/kde-base/kfind-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a60a3b6bcdb6d2da55c8fb4e4858db52
diff --git a/metadata/md5-cache/kde-base/kfloppy-4.7.4 b/metadata/md5-cache/kde-base/kfloppy-4.7.4
index 4e7a20365a5e..d048bd43e0a5 100644
--- a/metadata/md5-cache/kde-base/kfloppy-4.7.4
+++ b/metadata/md5-cache/kde-base/kfloppy-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e6239ca7af527ce38863c02cc9970159
diff --git a/metadata/md5-cache/kde-base/kfloppy-4.8.3 b/metadata/md5-cache/kde-base/kfloppy-4.8.3
index 53f580b78107..ecee01bec4e7 100644
--- a/metadata/md5-cache/kde-base/kfloppy-4.8.3
+++ b/metadata/md5-cache/kde-base/kfloppy-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kfloppy-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=62876bc6c999ba610f08039bb6648e23
diff --git a/metadata/md5-cache/kde-base/kfloppy-4.8.4 b/metadata/md5-cache/kde-base/kfloppy-4.8.4
index fb6cc63cd01b..3685a114cb20 100644
--- a/metadata/md5-cache/kde-base/kfloppy-4.8.4
+++ b/metadata/md5-cache/kde-base/kfloppy-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kfloppy-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=940d50a6133c64a44469148dcfa852da
diff --git a/metadata/md5-cache/kde-base/kfmclient-4.7.4 b/metadata/md5-cache/kde-base/kfmclient-4.7.4
index e25aa5e4b515..4e3e9132a1ee 100644
--- a/metadata/md5-cache/kde-base/kfmclient-4.7.4
+++ b/metadata/md5-cache/kde-base/kfmclient-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e7917c8da2e2a2f3f6f27cbb42147760
diff --git a/metadata/md5-cache/kde-base/kfmclient-4.8.3 b/metadata/md5-cache/kde-base/kfmclient-4.8.3
index 2bdb1eebc567..e048f850d1a6 100644
--- a/metadata/md5-cache/kde-base/kfmclient-4.8.3
+++ b/metadata/md5-cache/kde-base/kfmclient-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=74cc87a6d85205ae2dc127071e24d1d8
diff --git a/metadata/md5-cache/kde-base/kfmclient-4.8.4 b/metadata/md5-cache/kde-base/kfmclient-4.8.4
index 0a5eb5618ae5..2acd91747af5 100644
--- a/metadata/md5-cache/kde-base/kfmclient-4.8.4
+++ b/metadata/md5-cache/kde-base/kfmclient-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1bf7b253dd37f7cf2248210b6cf9923b
diff --git a/metadata/md5-cache/kde-base/kfourinline-4.7.4 b/metadata/md5-cache/kde-base/kfourinline-4.7.4
index 2a0b74226ddc..ff853a136c25 100644
--- a/metadata/md5-cache/kde-base/kfourinline-4.7.4
+++ b/metadata/md5-cache/kde-base/kfourinline-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=99803739c4ce75267910d151c1ef8735
diff --git a/metadata/md5-cache/kde-base/kfourinline-4.8.3 b/metadata/md5-cache/kde-base/kfourinline-4.8.3
index ef808c1582cc..f83b3f8506ee 100644
--- a/metadata/md5-cache/kde-base/kfourinline-4.8.3
+++ b/metadata/md5-cache/kde-base/kfourinline-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ebcc28f64e9715c7c2c1e612905999d
diff --git a/metadata/md5-cache/kde-base/kfourinline-4.8.4 b/metadata/md5-cache/kde-base/kfourinline-4.8.4
index 31b4526de14a..4cf6c41e4edc 100644
--- a/metadata/md5-cache/kde-base/kfourinline-4.8.4
+++ b/metadata/md5-cache/kde-base/kfourinline-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7a179775402a9edac1348b33a1cfcec2
diff --git a/metadata/md5-cache/kde-base/kgamma-4.7.4 b/metadata/md5-cache/kde-base/kgamma-4.7.4
index f1e19330ce0e..8e4b26be8771 100644
--- a/metadata/md5-cache/kde-base/kgamma-4.7.4
+++ b/metadata/md5-cache/kde-base/kgamma-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kgamma-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=de7100b36dba76fc8cb8b4ad5d7c1355
diff --git a/metadata/md5-cache/kde-base/kgamma-4.8.3 b/metadata/md5-cache/kde-base/kgamma-4.8.3
index cc5e6a2721a2..cb4015d6f960 100644
--- a/metadata/md5-cache/kde-base/kgamma-4.8.3
+++ b/metadata/md5-cache/kde-base/kgamma-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kgamma-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8770bcdb3478cb66070a57563fe41eca
diff --git a/metadata/md5-cache/kde-base/kgamma-4.8.4 b/metadata/md5-cache/kde-base/kgamma-4.8.4
index 83926c9b9cdb..6c278df3d792 100644
--- a/metadata/md5-cache/kde-base/kgamma-4.8.4
+++ b/metadata/md5-cache/kde-base/kgamma-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kgamma-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c0b6a8e7734f40037d829880f25573ec
diff --git a/metadata/md5-cache/kde-base/kgeography-4.7.4 b/metadata/md5-cache/kde-base/kgeography-4.7.4
index ca74fbf0033b..8a025a9e6e2e 100644
--- a/metadata/md5-cache/kde-base/kgeography-4.7.4
+++ b/metadata/md5-cache/kde-base/kgeography-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kgeography-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ec3ecfd46e42cfa6d7c1e91bf08303df
diff --git a/metadata/md5-cache/kde-base/kgeography-4.8.3 b/metadata/md5-cache/kde-base/kgeography-4.8.3
index 5762991dde7e..410f3b1a17a4 100644
--- a/metadata/md5-cache/kde-base/kgeography-4.8.3
+++ b/metadata/md5-cache/kde-base/kgeography-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kgeography-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8a46761a3ee1d13c78535e08806abbc0
diff --git a/metadata/md5-cache/kde-base/kgeography-4.8.4 b/metadata/md5-cache/kde-base/kgeography-4.8.4
index 1345e4333065..78259b205688 100644
--- a/metadata/md5-cache/kde-base/kgeography-4.8.4
+++ b/metadata/md5-cache/kde-base/kgeography-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kgeography-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=23e60f6820ee304ed76e58203ae4c1f8
diff --git a/metadata/md5-cache/kde-base/kget-4.7.4 b/metadata/md5-cache/kde-base/kget-4.7.4
index 56acdec359ea..60665b609842 100644
--- a/metadata/md5-cache/kde-base/kget-4.7.4
+++ b/metadata/md5-cache/kde-base/kget-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/solid-4.7.4:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a5927178073ca1f64a962bc5f60a9483
diff --git a/metadata/md5-cache/kde-base/kget-4.8.3 b/metadata/md5-cache/kde-base/kget-4.8.3
index be3c21d127c5..e5dbab9ef0ba 100644
--- a/metadata/md5-cache/kde-base/kget-4.8.3
+++ b/metadata/md5-cache/kde-base/kget-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/solid-4.8.3:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6a01fb11d384413e7c9039f73efd8265
diff --git a/metadata/md5-cache/kde-base/kget-4.8.4 b/metadata/md5-cache/kde-base/kget-4.8.4
index b6af800ae593..08a073b09e11 100644
--- a/metadata/md5-cache/kde-base/kget-4.8.4
+++ b/metadata/md5-cache/kde-base/kget-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/solid-4.8.4:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=86b90803d3b736a34304462bfd35091f
diff --git a/metadata/md5-cache/kde-base/kglobalaccel-4.7.4 b/metadata/md5-cache/kde-base/kglobalaccel-4.7.4
index e44a4e65a2ea..c3c535378151 100644
--- a/metadata/md5-cache/kde-base/kglobalaccel-4.7.4
+++ b/metadata/md5-cache/kde-base/kglobalaccel-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b02c5425c6fd08f6fe754dc393b99dbc
diff --git a/metadata/md5-cache/kde-base/kglobalaccel-4.8.3 b/metadata/md5-cache/kde-base/kglobalaccel-4.8.3
index 72852e49995f..52468b72e575 100644
--- a/metadata/md5-cache/kde-base/kglobalaccel-4.8.3
+++ b/metadata/md5-cache/kde-base/kglobalaccel-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9849f4d5d8f8149715cdc1059b6d74c6
diff --git a/metadata/md5-cache/kde-base/kglobalaccel-4.8.4 b/metadata/md5-cache/kde-base/kglobalaccel-4.8.4
index 47621f353748..53b28592c829 100644
--- a/metadata/md5-cache/kde-base/kglobalaccel-4.8.4
+++ b/metadata/md5-cache/kde-base/kglobalaccel-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61c75a2d90e8e0828c74fc43ae10b967
diff --git a/metadata/md5-cache/kde-base/kgoldrunner-4.7.4 b/metadata/md5-cache/kde-base/kgoldrunner-4.7.4
index 13669e37c0a7..39aca012e80d 100644
--- a/metadata/md5-cache/kde-base/kgoldrunner-4.7.4
+++ b/metadata/md5-cache/kde-base/kgoldrunner-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ba7d78d37fc771a00db9db55871806be
diff --git a/metadata/md5-cache/kde-base/kgoldrunner-4.8.3 b/metadata/md5-cache/kde-base/kgoldrunner-4.8.3
index 5dd75d7dbe22..26857e55458a 100644
--- a/metadata/md5-cache/kde-base/kgoldrunner-4.8.3
+++ b/metadata/md5-cache/kde-base/kgoldrunner-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a82c7945649cf6d63b63137304ea0cd
diff --git a/metadata/md5-cache/kde-base/kgoldrunner-4.8.4 b/metadata/md5-cache/kde-base/kgoldrunner-4.8.4
index 46e7c888e3de..120f79e3fbe0 100644
--- a/metadata/md5-cache/kde-base/kgoldrunner-4.8.4
+++ b/metadata/md5-cache/kde-base/kgoldrunner-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ce22e7036850cbf78c5edc54de978e49
diff --git a/metadata/md5-cache/kde-base/kgpg-4.7.4 b/metadata/md5-cache/kde-base/kgpg-4.7.4
index 3d43af387dc7..94438a228bc5 100644
--- a/metadata/md5-cache/kde-base/kgpg-4.7.4
+++ b/metadata/md5-cache/kde-base/kgpg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9583c2c11537bb501770756c3f3c20f8
diff --git a/metadata/md5-cache/kde-base/kgpg-4.8.3 b/metadata/md5-cache/kde-base/kgpg-4.8.3
index 9906aee93cbd..75f644a2e14c 100644
--- a/metadata/md5-cache/kde-base/kgpg-4.8.3
+++ b/metadata/md5-cache/kde-base/kgpg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-gpg )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kgpg-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=32ee42b030ace7de2caa81fcfa9636d2
diff --git a/metadata/md5-cache/kde-base/kgpg-4.8.4 b/metadata/md5-cache/kde-base/kgpg-4.8.4
index 38ffee32d939..00f675be7d23 100644
--- a/metadata/md5-cache/kde-base/kgpg-4.8.4
+++ b/metadata/md5-cache/kde-base/kgpg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-gpg )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kgpg-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9399ea80618eba1ba313d7f4b73cdf46
diff --git a/metadata/md5-cache/kde-base/khangman-4.7.4 b/metadata/md5-cache/kde-base/khangman-4.7.4
index 179e023d5cef..f068cccde4e9 100644
--- a/metadata/md5-cache/kde-base/khangman-4.7.4
+++ b/metadata/md5-cache/kde-base/khangman-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/khangman-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0aab9351e5d8c8f9d7935fb374998a73
diff --git a/metadata/md5-cache/kde-base/khangman-4.8.3 b/metadata/md5-cache/kde-base/khangman-4.8.3
index f34bb5eb3281..56ecd549b608 100644
--- a/metadata/md5-cache/kde-base/khangman-4.8.3
+++ b/metadata/md5-cache/kde-base/khangman-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/khangman-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=59cda8bfe384fbef98c763aab47b5996
diff --git a/metadata/md5-cache/kde-base/khangman-4.8.4 b/metadata/md5-cache/kde-base/khangman-4.8.4
index 11243a407cb0..aea0bb4f2f4d 100644
--- a/metadata/md5-cache/kde-base/khangman-4.8.4
+++ b/metadata/md5-cache/kde-base/khangman-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/khangman-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=90121954816b3dffab4c123866b83298
diff --git a/metadata/md5-cache/kde-base/khelpcenter-4.7.4 b/metadata/md5-cache/kde-base/khelpcenter-4.7.4
index 3771aee6257b..e74c32a60607 100644
--- a/metadata/md5-cache/kde-base/khelpcenter-4.7.4
+++ b/metadata/md5-cache/kde-base/khelpcenter-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdesu-4.7.4:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.7.4:4[aqua=] >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=55514f35eb9c510b86d4ac11b28906e4
diff --git a/metadata/md5-cache/kde-base/khelpcenter-4.8.3 b/metadata/md5-cache/kde-base/khelpcenter-4.8.3
index 22a2bbf4476e..034129c2aa89 100644
--- a/metadata/md5-cache/kde-base/khelpcenter-4.8.3
+++ b/metadata/md5-cache/kde-base/khelpcenter-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdesu-4.8.3:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.8.3:4[aqua=] >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1fcdf42b1b8a5b6b4b139fc0cc6e32de
diff --git a/metadata/md5-cache/kde-base/khelpcenter-4.8.4 b/metadata/md5-cache/kde-base/khelpcenter-4.8.4
index 9d08bdc35e83..0151b9936539 100644
--- a/metadata/md5-cache/kde-base/khelpcenter-4.8.4
+++ b/metadata/md5-cache/kde-base/khelpcenter-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdesu-4.8.4:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.8.4:4[aqua=] >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=268f3ccbbbc2b73f4aa23e12cca980e8
diff --git a/metadata/md5-cache/kde-base/khotkeys-4.7.4 b/metadata/md5-cache/kde-base/khotkeys-4.7.4
index 845f103c2bfc..f074db824775 100644
--- a/metadata/md5-cache/kde-base/khotkeys-4.7.4
+++ b/metadata/md5-cache/kde-base/khotkeys-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] x11-libs/libXtst >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b79a472aaae0b7aa68dfedcc82972537
diff --git a/metadata/md5-cache/kde-base/khotkeys-4.8.3 b/metadata/md5-cache/kde-base/khotkeys-4.8.3
index aea5ede7e4f1..65d58bd22070 100644
--- a/metadata/md5-cache/kde-base/khotkeys-4.8.3
+++ b/metadata/md5-cache/kde-base/khotkeys-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.3:4[aqua=] x11-libs/libXtst >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=522ca6dfc30fc43107e79601a2fa02d0
diff --git a/metadata/md5-cache/kde-base/khotkeys-4.8.4 b/metadata/md5-cache/kde-base/khotkeys-4.8.4
index 8bec060efb21..bb8170a308e9 100644
--- a/metadata/md5-cache/kde-base/khotkeys-4.8.4
+++ b/metadata/md5-cache/kde-base/khotkeys-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.4:4[aqua=] x11-libs/libXtst >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7bc65afb644ff02c4abeb1c0758c8b5b
diff --git a/metadata/md5-cache/kde-base/kiconfinder-4.7.4 b/metadata/md5-cache/kde-base/kiconfinder-4.7.4
index 6cbfb8ec720d..3e6b86765b60 100644
--- a/metadata/md5-cache/kde-base/kiconfinder-4.7.4
+++ b/metadata/md5-cache/kde-base/kiconfinder-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=09a3bc13392436cbbcb50cbd6aa7cc3a
diff --git a/metadata/md5-cache/kde-base/kiconfinder-4.8.3 b/metadata/md5-cache/kde-base/kiconfinder-4.8.3
index b37bdb42ab6d..250c4214de52 100644
--- a/metadata/md5-cache/kde-base/kiconfinder-4.8.3
+++ b/metadata/md5-cache/kde-base/kiconfinder-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=151166918f5336924a8875af40b24282
diff --git a/metadata/md5-cache/kde-base/kiconfinder-4.8.4 b/metadata/md5-cache/kde-base/kiconfinder-4.8.4
index 115c26599707..801a0f81d4ac 100644
--- a/metadata/md5-cache/kde-base/kiconfinder-4.8.4
+++ b/metadata/md5-cache/kde-base/kiconfinder-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a616cd8b74832eaf3735b700eb00ab5
diff --git a/metadata/md5-cache/kde-base/kig-4.7.4 b/metadata/md5-cache/kde-base/kig-4.7.4
index 132db4ab7059..c7ec79c7c5b1 100644
--- a/metadata/md5-cache/kde-base/kig-4.7.4
+++ b/metadata/md5-cache/kde-base/kig-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kig-scripting? ( >=dev-libs/boost-1.32 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kig-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=badd8bb4ac8e53d30d32959338dbd127
diff --git a/metadata/md5-cache/kde-base/kig-4.8.3 b/metadata/md5-cache/kde-base/kig-4.8.3
index 1e18ca55ee64..f726bc453557 100644
--- a/metadata/md5-cache/kde-base/kig-4.8.3
+++ b/metadata/md5-cache/kde-base/kig-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kig-scripting? ( >=dev-libs/boost-1.32 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kig-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8abfaab6018013707776b6732548d13
diff --git a/metadata/md5-cache/kde-base/kig-4.8.4 b/metadata/md5-cache/kde-base/kig-4.8.4
index 4e28f146c93c..374e918a8763 100644
--- a/metadata/md5-cache/kde-base/kig-4.8.4
+++ b/metadata/md5-cache/kde-base/kig-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kig-scripting? ( >=dev-libs/boost-1.32 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kig-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f073d6a22f5b0f62ade5db4c198192bb
diff --git a/metadata/md5-cache/kde-base/kigo-4.7.4 b/metadata/md5-cache/kde-base/kigo-4.7.4
index c2c334b2d225..ba1584d6e248 100644
--- a/metadata/md5-cache/kde-base/kigo-4.7.4
+++ b/metadata/md5-cache/kde-base/kigo-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=games-board/gnugo >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a086831debf81fd5742d682b99764c84
diff --git a/metadata/md5-cache/kde-base/kigo-4.8.3 b/metadata/md5-cache/kde-base/kigo-4.8.3
index 25e3524ce9b1..7f53ba83360d 100644
--- a/metadata/md5-cache/kde-base/kigo-4.8.3
+++ b/metadata/md5-cache/kde-base/kigo-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=games-board/gnugo >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0a86d778365d2cd8e119bb1ee1929dcc
diff --git a/metadata/md5-cache/kde-base/kigo-4.8.4 b/metadata/md5-cache/kde-base/kigo-4.8.4
index 4f59ad9c832a..b7e2d46f61b2 100644
--- a/metadata/md5-cache/kde-base/kigo-4.8.4
+++ b/metadata/md5-cache/kde-base/kigo-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=games-board/gnugo >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e7cbb414b2a3984f4c3ebc59acc8beb0
diff --git a/metadata/md5-cache/kde-base/killbots-4.7.4 b/metadata/md5-cache/kde-base/killbots-4.7.4
index d91e1c198607..bfddd3f19182 100644
--- a/metadata/md5-cache/kde-base/killbots-4.7.4
+++ b/metadata/md5-cache/kde-base/killbots-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a16fca56d235f295d53c368de3f43b2
diff --git a/metadata/md5-cache/kde-base/killbots-4.8.3 b/metadata/md5-cache/kde-base/killbots-4.8.3
index 70b12a0d0477..621bf66d60e4 100644
--- a/metadata/md5-cache/kde-base/killbots-4.8.3
+++ b/metadata/md5-cache/kde-base/killbots-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=403dd27a7343d40c5e6d0ddd61aa1cd0
diff --git a/metadata/md5-cache/kde-base/killbots-4.8.4 b/metadata/md5-cache/kde-base/killbots-4.8.4
index b9460c1cf54c..5d9f99f510fb 100644
--- a/metadata/md5-cache/kde-base/killbots-4.8.4
+++ b/metadata/md5-cache/kde-base/killbots-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=01ec680b6d3f2040f6307081f27f3d06
diff --git a/metadata/md5-cache/kde-base/kimagemapeditor-4.7.4 b/metadata/md5-cache/kde-base/kimagemapeditor-4.7.4
index c70f287d15c1..01b49eec1e28 100644
--- a/metadata/md5-cache/kde-base/kimagemapeditor-4.7.4
+++ b/metadata/md5-cache/kde-base/kimagemapeditor-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdewebdev-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bfab29cb2ebbe0aaec11e1789d46a958
diff --git a/metadata/md5-cache/kde-base/kimagemapeditor-4.8.3 b/metadata/md5-cache/kde-base/kimagemapeditor-4.8.3
index 49c1ba12d61e..172ee1ada0a6 100644
--- a/metadata/md5-cache/kde-base/kimagemapeditor-4.8.3
+++ b/metadata/md5-cache/kde-base/kimagemapeditor-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdewebdev-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=55b2e68494817e30d8cdee9628131266
diff --git a/metadata/md5-cache/kde-base/kimagemapeditor-4.8.4 b/metadata/md5-cache/kde-base/kimagemapeditor-4.8.4
index 369fbff25dc4..f30e30c94ab1 100644
--- a/metadata/md5-cache/kde-base/kimagemapeditor-4.8.4
+++ b/metadata/md5-cache/kde-base/kimagemapeditor-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdewebdev-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=533296af55efaa2e8fbb9e36b3f58bcf
diff --git a/metadata/md5-cache/kde-base/kimono-4.7.4 b/metadata/md5-cache/kde-base/kimono-4.7.4
index 4c1d9e2af019..a5356e87a19e 100644
--- a/metadata/md5-cache/kde-base/kimono-4.7.4
+++ b/metadata/md5-cache/kde-base/kimono-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/qyoto-4.7.4:4[aqua=,webkit] >=kde-base/smokeqt-4.7.4:4[aqua=] >=kde-base/smokekde-4.7.4:4[aqua=,akonadi?,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.7.4:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] ) !kde-base/kdebindings-csharp:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kimono-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0d7805a2c1b57e1680ab3b1e6c3f107a
diff --git a/metadata/md5-cache/kde-base/kimono-4.8.3 b/metadata/md5-cache/kde-base/kimono-4.8.3
index 74add2976ec6..13b6e4196edc 100644
--- a/metadata/md5-cache/kde-base/kimono-4.8.3
+++ b/metadata/md5-cache/kde-base/kimono-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/qyoto-4.8.3:4[aqua=,webkit] >=kde-base/smokeqt-4.8.3:4[aqua=] >=kde-base/smokekde-4.8.3:4[aqua=,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.8.3:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] ) !kde-base/kdebindings-csharp:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kimono-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=50f04fc93960fd61e52142a6dbf6c01f
diff --git a/metadata/md5-cache/kde-base/kimono-4.8.4 b/metadata/md5-cache/kde-base/kimono-4.8.4
index fbfd0030df33..930a222d41b9 100644
--- a/metadata/md5-cache/kde-base/kimono-4.8.4
+++ b/metadata/md5-cache/kde-base/kimono-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/qyoto-4.8.4:4[aqua=,webkit] >=kde-base/smokeqt-4.8.4:4[aqua=] >=kde-base/smokekde-4.8.4:4[aqua=,semantic-desktop=] plasma? ( >=kde-base/smokeqt-4.8.4:4[aqua=,webkit] ) semantic-desktop? ( >=dev-libs/soprano-2.7.6[clucene] ) !kde-base/kdebindings-csharp:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kimono-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b0de002308095163b082ce38b17213dc
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.7.4 b/metadata/md5-cache/kde-base/kinfocenter-4.7.4
index 02081391d010..a2c98f6ed398 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.7.4
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-4.7.4:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fbdefb0bf4edd51ab8cd158db0311529
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.8.3 b/metadata/md5-cache/kde-base/kinfocenter-4.8.3
index e59976b3782d..8a137fa495a1 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.8.3
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-4.8.3:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fe138de69c6672f2e2248a6fcaf9f72e
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.8.4 b/metadata/md5-cache/kde-base/kinfocenter-4.8.4
index 8b0c2874d73c..c057c0c99efc 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.8.4
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-4.8.4:4[aqua=] sys-apps/pciutils ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f429fd2159d40eb98ca043d3b5c50e1f
diff --git a/metadata/md5-cache/kde-base/kioclient-4.7.4 b/metadata/md5-cache/kde-base/kioclient-4.7.4
index 6b19d7529eb3..7a848dd50ae8 100644
--- a/metadata/md5-cache/kde-base/kioclient-4.7.4
+++ b/metadata/md5-cache/kde-base/kioclient-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9f4a609d70516f13ba2bcbff8f78d9a5
diff --git a/metadata/md5-cache/kde-base/kioclient-4.8.3 b/metadata/md5-cache/kde-base/kioclient-4.8.3
index 4ec46d47dd38..33c666f6310f 100644
--- a/metadata/md5-cache/kde-base/kioclient-4.8.3
+++ b/metadata/md5-cache/kde-base/kioclient-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f687f02f85434ada3b9563ccb680a081
diff --git a/metadata/md5-cache/kde-base/kioclient-4.8.4 b/metadata/md5-cache/kde-base/kioclient-4.8.4
index 65335f889121..67b9746268f9 100644
--- a/metadata/md5-cache/kde-base/kioclient-4.8.4
+++ b/metadata/md5-cache/kde-base/kioclient-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e3dfd641507c8ca4ceff65d7e979de2d
diff --git a/metadata/md5-cache/kde-base/kiriki-4.7.4 b/metadata/md5-cache/kde-base/kiriki-4.7.4
index e3bb61bc8b87..dca16ffb63ff 100644
--- a/metadata/md5-cache/kde-base/kiriki-4.7.4
+++ b/metadata/md5-cache/kde-base/kiriki-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3eb1edea6ea7eb949e25605a4ace4661
diff --git a/metadata/md5-cache/kde-base/kiriki-4.8.3 b/metadata/md5-cache/kde-base/kiriki-4.8.3
index 91b5f1d5b546..48e04c827c5d 100644
--- a/metadata/md5-cache/kde-base/kiriki-4.8.3
+++ b/metadata/md5-cache/kde-base/kiriki-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0a1223911d7a012d9afe8ead28c67586
diff --git a/metadata/md5-cache/kde-base/kiriki-4.8.4 b/metadata/md5-cache/kde-base/kiriki-4.8.4
index 1a012028e771..5e8bba2d8899 100644
--- a/metadata/md5-cache/kde-base/kiriki-4.8.4
+++ b/metadata/md5-cache/kde-base/kiriki-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=da1a39d96c23453c9b928847b606072d
diff --git a/metadata/md5-cache/kde-base/kiten-4.7.4 b/metadata/md5-cache/kde-base/kiten-4.7.4
index 9c86d1157962..902a865bd011 100644
--- a/metadata/md5-cache/kde-base/kiten-4.7.4
+++ b/metadata/md5-cache/kde-base/kiten-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kiten-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=139b912951815e2d3f7d5708f42500fc
diff --git a/metadata/md5-cache/kde-base/kiten-4.8.3 b/metadata/md5-cache/kde-base/kiten-4.8.3
index 017de3022c91..f42adb079661 100644
--- a/metadata/md5-cache/kde-base/kiten-4.8.3
+++ b/metadata/md5-cache/kde-base/kiten-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kiten-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=386411311cc6667568ab3a567a202b4c
diff --git a/metadata/md5-cache/kde-base/kiten-4.8.4 b/metadata/md5-cache/kde-base/kiten-4.8.4
index f33052905e18..6a07a6d08424 100644
--- a/metadata/md5-cache/kde-base/kiten-4.8.4
+++ b/metadata/md5-cache/kde-base/kiten-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kiten-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2f0826d8cda19ddfb5a84c9e49a6577f
diff --git a/metadata/md5-cache/kde-base/kjots-4.4.11.1 b/metadata/md5-cache/kde-base/kjots-4.4.11.1
index 268b6a94ffdb..1fe9fe30bcdc 100644
--- a/metadata/md5-cache/kde-base/kjots-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kjots-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bd54fe89a1cf1c9531f54634657ab224
diff --git a/metadata/md5-cache/kde-base/kjots-4.7.4 b/metadata/md5-cache/kde-base/kjots-4.7.4
index c62f069a86b0..ceb8cf2dc791 100644
--- a/metadata/md5-cache/kde-base/kjots-4.7.4
+++ b/metadata/md5-cache/kde-base/kjots-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] kontact? ( >=kde-base/kontact-4.7.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d4bcde1260221c36a821795891462c4
diff --git a/metadata/md5-cache/kde-base/kjots-4.8.3 b/metadata/md5-cache/kde-base/kjots-4.8.3
index 88bbd41817c3..9615c297a43d 100644
--- a/metadata/md5-cache/kde-base/kjots-4.8.3
+++ b/metadata/md5-cache/kde-base/kjots-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] kontact? ( >=kde-base/kontact-4.8.3:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a1abd88e200c5e2da129e96bbf0a6a1e
diff --git a/metadata/md5-cache/kde-base/kjots-4.8.4 b/metadata/md5-cache/kde-base/kjots-4.8.4
index 8266e894f21e..d9a1f730471c 100644
--- a/metadata/md5-cache/kde-base/kjots-4.8.4
+++ b/metadata/md5-cache/kde-base/kjots-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.1 >=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] kontact? ( >=kde-base/kontact-4.8.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=25d9c6bd15c421fffc72dbabc09a54b2
diff --git a/metadata/md5-cache/kde-base/kjumpingcube-4.7.4 b/metadata/md5-cache/kde-base/kjumpingcube-4.7.4
index 8e47b10acd6c..365cd8d1b111 100644
--- a/metadata/md5-cache/kde-base/kjumpingcube-4.7.4
+++ b/metadata/md5-cache/kde-base/kjumpingcube-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bd765fe4ef7e89fa585f7412df16c815
diff --git a/metadata/md5-cache/kde-base/kjumpingcube-4.8.3 b/metadata/md5-cache/kde-base/kjumpingcube-4.8.3
index 53e9337fc062..45d853d67466 100644
--- a/metadata/md5-cache/kde-base/kjumpingcube-4.8.3
+++ b/metadata/md5-cache/kde-base/kjumpingcube-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=915b76c54f4ae553f40538920e34c2ba
diff --git a/metadata/md5-cache/kde-base/kjumpingcube-4.8.4 b/metadata/md5-cache/kde-base/kjumpingcube-4.8.4
index 8b780473e71f..bd1bbcc1646c 100644
--- a/metadata/md5-cache/kde-base/kjumpingcube-4.8.4
+++ b/metadata/md5-cache/kde-base/kjumpingcube-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d78136d7bb6e64888ab72cbce260cc8
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.4.11.1 b/metadata/md5-cache/kde-base/kleopatra-4.4.11.1
index 28eba3a11e24..f61fb39cdcb4 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kleopatra-4.4.11.1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=dev-libs/libassuan-2.0.0 dev-libs/libgpg-error >=kde-b
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/kleopatra-4.4.3-assuan2.patch.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1eb8c6ae8f5d1dc92a23e82ca154efba
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.7.4 b/metadata/md5-cache/kde-base/kleopatra-4.7.4
index b856ced4b4e7..04a3b3157b0f 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.7.4
+++ b/metadata/md5-cache/kde-base/kleopatra-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c3440bd5ad2fc5d5fd8061c5daa73943
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.8.3 b/metadata/md5-cache/kde-base/kleopatra-4.8.3
index bd8698712c4e..802e5b6465b3 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.8.3
+++ b/metadata/md5-cache/kde-base/kleopatra-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=469f2da07a8883b628c071374d381567
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.8.4 b/metadata/md5-cache/kde-base/kleopatra-4.8.4
index 1af0120d6ec9..3698e199ba12 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.8.4
+++ b/metadata/md5-cache/kde-base/kleopatra-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme dev-libs/boost dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b189b0f21f2be1fc9cf26478a5b32e77
diff --git a/metadata/md5-cache/kde-base/klettres-4.7.4 b/metadata/md5-cache/kde-base/klettres-4.7.4
index 946dd0122334..38951b7826f5 100644
--- a/metadata/md5-cache/kde-base/klettres-4.7.4
+++ b/metadata/md5-cache/kde-base/klettres-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/klettres-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8be7b234aa36a542dbfbbb86b6096230
diff --git a/metadata/md5-cache/kde-base/klettres-4.8.3 b/metadata/md5-cache/kde-base/klettres-4.8.3
index 183479246429..9ea5ed46ab6e 100644
--- a/metadata/md5-cache/kde-base/klettres-4.8.3
+++ b/metadata/md5-cache/kde-base/klettres-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/klettres-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d153ac4e82fc034852d3c6c3c73a06fa
diff --git a/metadata/md5-cache/kde-base/klettres-4.8.4 b/metadata/md5-cache/kde-base/klettres-4.8.4
index 081cd4778b71..a7a46400376e 100644
--- a/metadata/md5-cache/kde-base/klettres-4.8.4
+++ b/metadata/md5-cache/kde-base/klettres-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/klettres-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4a0e264b320b62a278e1a7c9e2705061
diff --git a/metadata/md5-cache/kde-base/klickety-4.7.4 b/metadata/md5-cache/kde-base/klickety-4.7.4
index 22a52193de40..6202ecd337ee 100644
--- a/metadata/md5-cache/kde-base/klickety-4.7.4
+++ b/metadata/md5-cache/kde-base/klickety-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=be0b405bfe3a24c8b030d79cd2a4cd32
diff --git a/metadata/md5-cache/kde-base/klickety-4.8.3 b/metadata/md5-cache/kde-base/klickety-4.8.3
index 7aca4eb20ff1..5d0ba2a06e66 100644
--- a/metadata/md5-cache/kde-base/klickety-4.8.3
+++ b/metadata/md5-cache/kde-base/klickety-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2997c1464e071fdd3a09e6edfc18aada
diff --git a/metadata/md5-cache/kde-base/klickety-4.8.4 b/metadata/md5-cache/kde-base/klickety-4.8.4
index cdfd3c76b2ce..e5831d6dd30e 100644
--- a/metadata/md5-cache/kde-base/klickety-4.8.4
+++ b/metadata/md5-cache/kde-base/klickety-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=451e8825f8c040b01ec4360b30bbdca0
diff --git a/metadata/md5-cache/kde-base/klines-4.7.4 b/metadata/md5-cache/kde-base/klines-4.7.4
index a71ce1edb838..f26719f9591c 100644
--- a/metadata/md5-cache/kde-base/klines-4.7.4
+++ b/metadata/md5-cache/kde-base/klines-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f18f8b052e81686260dbd386c3517b6c
diff --git a/metadata/md5-cache/kde-base/klines-4.8.3 b/metadata/md5-cache/kde-base/klines-4.8.3
index 3f1ef92065e8..ae8fa855db46 100644
--- a/metadata/md5-cache/kde-base/klines-4.8.3
+++ b/metadata/md5-cache/kde-base/klines-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=065fa4da73957687a3f146a8862a91f0
diff --git a/metadata/md5-cache/kde-base/klines-4.8.4 b/metadata/md5-cache/kde-base/klines-4.8.4
index 5a5f26e5073d..4ca4fdb2f306 100644
--- a/metadata/md5-cache/kde-base/klines-4.8.4
+++ b/metadata/md5-cache/kde-base/klines-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f8a426d770123cecd1d038c2cc5dece3
diff --git a/metadata/md5-cache/kde-base/klinkstatus-4.7.4 b/metadata/md5-cache/kde-base/klinkstatus-4.7.4
index 01f1c6622024..1e3b2cb96afc 100644
--- a/metadata/md5-cache/kde-base/klinkstatus-4.7.4
+++ b/metadata/md5-cache/kde-base/klinkstatus-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdewebdev-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5b67758704541ad543e0754e064685bd
diff --git a/metadata/md5-cache/kde-base/klinkstatus-4.8.3 b/metadata/md5-cache/kde-base/klinkstatus-4.8.3
index 0ac19b9b0b4b..92108dfca4c0 100644
--- a/metadata/md5-cache/kde-base/klinkstatus-4.8.3
+++ b/metadata/md5-cache/kde-base/klinkstatus-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdewebdev-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a7e32b988638f8412e429dd21b58e0be
diff --git a/metadata/md5-cache/kde-base/klinkstatus-4.8.4 b/metadata/md5-cache/kde-base/klinkstatus-4.8.4
index 21a215f829ad..ded087a06a03 100644
--- a/metadata/md5-cache/kde-base/klinkstatus-4.8.4
+++ b/metadata/md5-cache/kde-base/klinkstatus-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdewebdev-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0242892936ee166def831a45194c2bc7
diff --git a/metadata/md5-cache/kde-base/klipper-4.7.4 b/metadata/md5-cache/kde-base/klipper-4.7.4
index bcd3ffec2c27..03f980d80b76 100644
--- a/metadata/md5-cache/kde-base/klipper-4.7.4
+++ b/metadata/md5-cache/kde-base/klipper-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/libtaskmanager-4.7.4:4[aqua=] !aqua? ( x11-libs/libXfixes ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=08ad9401f2f2233dede426e6238da1e4
diff --git a/metadata/md5-cache/kde-base/klipper-4.8.3 b/metadata/md5-cache/kde-base/klipper-4.8.3
index 5cd4400429f0..b33109ca0f92 100644
--- a/metadata/md5-cache/kde-base/klipper-4.8.3
+++ b/metadata/md5-cache/kde-base/klipper-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/libtaskmanager-4.8.3:4[aqua=] prison? ( media-libs/prison ) !aqua? ( x11-libs/libXfixes ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4b8ac71c9a636de2b0d8b1dd3fd11b34
diff --git a/metadata/md5-cache/kde-base/klipper-4.8.4 b/metadata/md5-cache/kde-base/klipper-4.8.4
index a4d1cdc47f2b..819a3fa6097e 100644
--- a/metadata/md5-cache/kde-base/klipper-4.8.4
+++ b/metadata/md5-cache/kde-base/klipper-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/libtaskmanager-4.8.4:4[aqua=] prison? ( media-libs/prison ) !aqua? ( x11-libs/libXfixes ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b806e737844936ddababe19ec51db967
diff --git a/metadata/md5-cache/kde-base/kmag-4.7.4 b/metadata/md5-cache/kde-base/kmag-4.7.4
index ab2f6f282ca4..eae12710665a 100644
--- a/metadata/md5-cache/kde-base/kmag-4.7.4
+++ b/metadata/md5-cache/kde-base/kmag-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kaccessible-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=381e8d0e69f7febaa912144877c23d1f
diff --git a/metadata/md5-cache/kde-base/kmag-4.8.3 b/metadata/md5-cache/kde-base/kmag-4.8.3
index c5773cbf8c9e..2096616a12c8 100644
--- a/metadata/md5-cache/kde-base/kmag-4.8.3
+++ b/metadata/md5-cache/kde-base/kmag-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kaccessible-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kmag-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bf367cd021bd00bd896aba4099d46c08
diff --git a/metadata/md5-cache/kde-base/kmag-4.8.4 b/metadata/md5-cache/kde-base/kmag-4.8.4
index 3608fdf11bc0..3b3f3ce93a88 100644
--- a/metadata/md5-cache/kde-base/kmag-4.8.4
+++ b/metadata/md5-cache/kde-base/kmag-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kaccessible-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kmag-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=92635c1ff07ac632c4bc6f469dc24995
diff --git a/metadata/md5-cache/kde-base/kmahjongg-4.7.4 b/metadata/md5-cache/kde-base/kmahjongg-4.7.4
index ead68f14c079..361e7e55cff7 100644
--- a/metadata/md5-cache/kde-base/kmahjongg-4.7.4
+++ b/metadata/md5-cache/kde-base/kmahjongg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3d7f2f56cec02aec1352cf78b02e8060
diff --git a/metadata/md5-cache/kde-base/kmahjongg-4.8.3 b/metadata/md5-cache/kde-base/kmahjongg-4.8.3
index 03ba3da0e202..71409172e633 100644
--- a/metadata/md5-cache/kde-base/kmahjongg-4.8.3
+++ b/metadata/md5-cache/kde-base/kmahjongg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e1faff953b85bcdfaf2d2e924dbb628e
diff --git a/metadata/md5-cache/kde-base/kmahjongg-4.8.4 b/metadata/md5-cache/kde-base/kmahjongg-4.8.4
index 7d3468232f6a..03f10a25b9f7 100644
--- a/metadata/md5-cache/kde-base/kmahjongg-4.8.4
+++ b/metadata/md5-cache/kde-base/kmahjongg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51ef1b95813106c47bcb76bcdd903b9f
diff --git a/metadata/md5-cache/kde-base/kmail-4.4.11.1 b/metadata/md5-cache/kde-base/kmail-4.4.11.1
index 7072bdee9fcd..ff323c4beec5 100644
--- a/metadata/md5-cache/kde-base/kmail-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kmail-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/libkleo-4.4.11.1:4[aqua=] >=kde-base/libkpgp-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] !kde-base/kmailcvt:4 !kde-base/libksieve:4 !kde-base/messagecore:4 !kde-base/messagelist:4 !kde-base/messageviewer:4 !kde-base/mimelib:4 >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cc241dc08fd62027e62e479fdd38c3a2
diff --git a/metadata/md5-cache/kde-base/kmail-4.7.4 b/metadata/md5-cache/kde-base/kmail-4.7.4
index afb92aa66e35..e37beaf3b0f3 100644
--- a/metadata/md5-cache/kde-base/kmail-4.7.4
+++ b/metadata/md5-cache/kde-base/kmail-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/korgani
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=75772b75f8e3874e294f4fa5b42f11fa
diff --git a/metadata/md5-cache/kde-base/kmail-4.7.4-r1 b/metadata/md5-cache/kde-base/kmail-4.7.4-r1
index 26dcd7beccc9..bbf908a3f2c6 100644
--- a/metadata/md5-cache/kde-base/kmail-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kmail-4.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/korgani
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=651c8851e79df5821862c90d01339968
diff --git a/metadata/md5-cache/kde-base/kmail-4.8.3 b/metadata/md5-cache/kde-base/kmail-4.8.3
index 0709f22991ac..8f8f79875b7e 100644
--- a/metadata/md5-cache/kde-base/kmail-4.8.3
+++ b/metadata/md5-cache/kde-base/kmail-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/korgani
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ea50b409569f11201275a00a2e2b8699
diff --git a/metadata/md5-cache/kde-base/kmail-4.8.4 b/metadata/md5-cache/kde-base/kmail-4.8.4
index 6d12658a5a9b..162e3dc024e3 100644
--- a/metadata/md5-cache/kde-base/kmail-4.8.4
+++ b/metadata/md5-cache/kde-base/kmail-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/korgani
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d45de554b9ab8107cfcdefeaba2ae556
diff --git a/metadata/md5-cache/kde-base/kmenuedit-4.7.4 b/metadata/md5-cache/kde-base/kmenuedit-4.7.4
index d89de1ed4cc8..6344c00fd3f5 100644
--- a/metadata/md5-cache/kde-base/kmenuedit-4.7.4
+++ b/metadata/md5-cache/kde-base/kmenuedit-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/khotkeys-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=baa31a5dc747e07aa407f1b756cc79d0
diff --git a/metadata/md5-cache/kde-base/kmenuedit-4.8.3 b/metadata/md5-cache/kde-base/kmenuedit-4.8.3
index 72e8bbaf3e13..ae2d9ae8f0a0 100644
--- a/metadata/md5-cache/kde-base/kmenuedit-4.8.3
+++ b/metadata/md5-cache/kde-base/kmenuedit-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/khotkeys-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f22f44a41adec6c5caf0ae29801e0342
diff --git a/metadata/md5-cache/kde-base/kmenuedit-4.8.4 b/metadata/md5-cache/kde-base/kmenuedit-4.8.4
index b0ffadf469d0..c0f0bd52c840 100644
--- a/metadata/md5-cache/kde-base/kmenuedit-4.8.4
+++ b/metadata/md5-cache/kde-base/kmenuedit-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/khotkeys-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5f80708405deb9e2a6beaeab5cb771f5
diff --git a/metadata/md5-cache/kde-base/kmimetypefinder-4.7.4 b/metadata/md5-cache/kde-base/kmimetypefinder-4.7.4
index ca2d513976c4..c911d058cc74 100644
--- a/metadata/md5-cache/kde-base/kmimetypefinder-4.7.4
+++ b/metadata/md5-cache/kde-base/kmimetypefinder-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3d5dfd5ffde232c34a778a886cc32a85
diff --git a/metadata/md5-cache/kde-base/kmimetypefinder-4.8.3 b/metadata/md5-cache/kde-base/kmimetypefinder-4.8.3
index 4e225c488cec..bdd103bbb351 100644
--- a/metadata/md5-cache/kde-base/kmimetypefinder-4.8.3
+++ b/metadata/md5-cache/kde-base/kmimetypefinder-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=38f5d99a04c725d91867032e0b82f07f
diff --git a/metadata/md5-cache/kde-base/kmimetypefinder-4.8.4 b/metadata/md5-cache/kde-base/kmimetypefinder-4.8.4
index 95a7ca78ed6d..15737da36ff7 100644
--- a/metadata/md5-cache/kde-base/kmimetypefinder-4.8.4
+++ b/metadata/md5-cache/kde-base/kmimetypefinder-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=941a97d97b6ef75bede6128af222ba0e
diff --git a/metadata/md5-cache/kde-base/kmines-4.7.4 b/metadata/md5-cache/kde-base/kmines-4.7.4
index 231f9b76734c..9f2f74e79f45 100644
--- a/metadata/md5-cache/kde-base/kmines-4.7.4
+++ b/metadata/md5-cache/kde-base/kmines-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=203d3531b6d15f65033326e180832d22
diff --git a/metadata/md5-cache/kde-base/kmines-4.8.3 b/metadata/md5-cache/kde-base/kmines-4.8.3
index 183833577b00..f6479fd99a44 100644
--- a/metadata/md5-cache/kde-base/kmines-4.8.3
+++ b/metadata/md5-cache/kde-base/kmines-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6e06ac4c6e758e50e8e6207b89320c71
diff --git a/metadata/md5-cache/kde-base/kmines-4.8.4 b/metadata/md5-cache/kde-base/kmines-4.8.4
index 4c22fae00207..6ce5a327a495 100644
--- a/metadata/md5-cache/kde-base/kmines-4.8.4
+++ b/metadata/md5-cache/kde-base/kmines-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e3926ab89b2921d640733bb844ee0a9b
diff --git a/metadata/md5-cache/kde-base/kmix-4.7.4 b/metadata/md5-cache/kde-base/kmix-4.7.4
index cfc6a9f96fda..a4fafde83d3c 100644
--- a/metadata/md5-cache/kde-base/kmix-4.7.4
+++ b/metadata/md5-cache/kde-base/kmix-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8bb58673ab02e937b8d94efb64b6c030
diff --git a/metadata/md5-cache/kde-base/kmix-4.8.3 b/metadata/md5-cache/kde-base/kmix-4.8.3
index 6cfadc755298..65a024a61497 100644
--- a/metadata/md5-cache/kde-base/kmix-4.8.3
+++ b/metadata/md5-cache/kde-base/kmix-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4980362e66024ec3496ca64d38aec67f
diff --git a/metadata/md5-cache/kde-base/kmix-4.8.4 b/metadata/md5-cache/kde-base/kmix-4.8.4
index 58f38ea1ee72..47612a19eed8 100644
--- a/metadata/md5-cache/kde-base/kmix-4.8.4
+++ b/metadata/md5-cache/kde-base/kmix-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96604ee7aee10bd3f3531d14d9bad0e1
diff --git a/metadata/md5-cache/kde-base/kmousetool-4.7.4 b/metadata/md5-cache/kde-base/kmousetool-4.7.4
index a67379292dbd..5bc685033b12 100644
--- a/metadata/md5-cache/kde-base/kmousetool-4.7.4
+++ b/metadata/md5-cache/kde-base/kmousetool-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71c3e65c54cb3cc2aef3a220b6bfc9ed
diff --git a/metadata/md5-cache/kde-base/kmousetool-4.8.3 b/metadata/md5-cache/kde-base/kmousetool-4.8.3
index 9c679e5699e4..e7388b8dfda0 100644
--- a/metadata/md5-cache/kde-base/kmousetool-4.8.3
+++ b/metadata/md5-cache/kde-base/kmousetool-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kmousetool-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a17bb25e3f8563da254b83dec6fed38
diff --git a/metadata/md5-cache/kde-base/kmousetool-4.8.4 b/metadata/md5-cache/kde-base/kmousetool-4.8.4
index 9df17c281c4d..03bf5c7c8c6c 100644
--- a/metadata/md5-cache/kde-base/kmousetool-4.8.4
+++ b/metadata/md5-cache/kde-base/kmousetool-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kmousetool-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=93380e9518ce9cfba1ea10abee063208
diff --git a/metadata/md5-cache/kde-base/kmouth-4.7.4 b/metadata/md5-cache/kde-base/kmouth-4.7.4
index 8447eee9c906..b83ea3c0e3fa 100644
--- a/metadata/md5-cache/kde-base/kmouth-4.7.4
+++ b/metadata/md5-cache/kde-base/kmouth-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeaccessibility-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3eddf4bcdf970d9febc3d4cd7ca537e8
diff --git a/metadata/md5-cache/kde-base/kmouth-4.8.3 b/metadata/md5-cache/kde-base/kmouth-4.8.3
index f8493cae4ae5..43287159c787 100644
--- a/metadata/md5-cache/kde-base/kmouth-4.8.3
+++ b/metadata/md5-cache/kde-base/kmouth-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kmouth-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f5ffa93aea1770f4c3407976f593e363
diff --git a/metadata/md5-cache/kde-base/kmouth-4.8.4 b/metadata/md5-cache/kde-base/kmouth-4.8.4
index 6f4b891f1061..dcc30b553bf1 100644
--- a/metadata/md5-cache/kde-base/kmouth-4.8.4
+++ b/metadata/md5-cache/kde-base/kmouth-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kmouth-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ba115ef0769fc71705da8ae0857e184
diff --git a/metadata/md5-cache/kde-base/kmplot-4.7.4 b/metadata/md5-cache/kde-base/kmplot-4.7.4
index bdfc5702b9ec..be7ee940a6be 100644
--- a/metadata/md5-cache/kde-base/kmplot-4.7.4
+++ b/metadata/md5-cache/kde-base/kmplot-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kmplot-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=16d02bdb5376120755be68084fa7a89b
diff --git a/metadata/md5-cache/kde-base/kmplot-4.8.3 b/metadata/md5-cache/kde-base/kmplot-4.8.3
index 029d7bf20c9a..0e346dc698bb 100644
--- a/metadata/md5-cache/kde-base/kmplot-4.8.3
+++ b/metadata/md5-cache/kde-base/kmplot-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kmplot-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=50345d92108aef4152a6422ea0c8cb84
diff --git a/metadata/md5-cache/kde-base/kmplot-4.8.4 b/metadata/md5-cache/kde-base/kmplot-4.8.4
index 12335db122de..5eb3c7f0327b 100644
--- a/metadata/md5-cache/kde-base/kmplot-4.8.4
+++ b/metadata/md5-cache/kde-base/kmplot-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kmplot-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b38dc5256282366794f21fa74d05f91e
diff --git a/metadata/md5-cache/kde-base/knetattach-4.7.4 b/metadata/md5-cache/kde-base/knetattach-4.7.4
index 3a06ba88abb0..46f05a917603 100644
--- a/metadata/md5-cache/kde-base/knetattach-4.7.4
+++ b/metadata/md5-cache/kde-base/knetattach-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=70e68a0c792c04c9ce0348bc62411be2
diff --git a/metadata/md5-cache/kde-base/knetattach-4.8.3 b/metadata/md5-cache/kde-base/knetattach-4.8.3
index 57e4e5e4b252..3cbbcaa1f690 100644
--- a/metadata/md5-cache/kde-base/knetattach-4.8.3
+++ b/metadata/md5-cache/kde-base/knetattach-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fc49125d0fe343707a4ac0a132abbdb3
diff --git a/metadata/md5-cache/kde-base/knetattach-4.8.4 b/metadata/md5-cache/kde-base/knetattach-4.8.4
index 31e6d6401e78..01d54d683aed 100644
--- a/metadata/md5-cache/kde-base/knetattach-4.8.4
+++ b/metadata/md5-cache/kde-base/knetattach-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dfae03c9232a195fb89bedd2a6991147
diff --git a/metadata/md5-cache/kde-base/knetwalk-4.7.4 b/metadata/md5-cache/kde-base/knetwalk-4.7.4
index c042f4a80bfe..3b7f0521c228 100644
--- a/metadata/md5-cache/kde-base/knetwalk-4.7.4
+++ b/metadata/md5-cache/kde-base/knetwalk-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e8fb055f2dabad45f7aa0b568d7e8fa0
diff --git a/metadata/md5-cache/kde-base/knetwalk-4.8.3 b/metadata/md5-cache/kde-base/knetwalk-4.8.3
index cfae19620302..eafbdbb79476 100644
--- a/metadata/md5-cache/kde-base/knetwalk-4.8.3
+++ b/metadata/md5-cache/kde-base/knetwalk-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=af1a6fd4b66845c29ed0275afd384720
diff --git a/metadata/md5-cache/kde-base/knetwalk-4.8.4 b/metadata/md5-cache/kde-base/knetwalk-4.8.4
index de62ff92f8c5..37bc0bc28a47 100644
--- a/metadata/md5-cache/kde-base/knetwalk-4.8.4
+++ b/metadata/md5-cache/kde-base/knetwalk-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=21024337a2af785809f02871c1f6df34
diff --git a/metadata/md5-cache/kde-base/knewstuff-4.7.4 b/metadata/md5-cache/kde-base/knewstuff-4.7.4
index f883385c2c1e..ff8104ae973d 100644
--- a/metadata/md5-cache/kde-base/knewstuff-4.7.4
+++ b/metadata/md5-cache/kde-base/knewstuff-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8013120848b2dfaff35245b4a27c29d0
diff --git a/metadata/md5-cache/kde-base/knewstuff-4.8.3 b/metadata/md5-cache/kde-base/knewstuff-4.8.3
index 28429720334d..c79844b253be 100644
--- a/metadata/md5-cache/kde-base/knewstuff-4.8.3
+++ b/metadata/md5-cache/kde-base/knewstuff-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bb1f01d4e95595d4f7f835e70903d182
diff --git a/metadata/md5-cache/kde-base/knewstuff-4.8.4 b/metadata/md5-cache/kde-base/knewstuff-4.8.4
index d6c3b19e06d8..a44359c21b08 100644
--- a/metadata/md5-cache/kde-base/knewstuff-4.8.4
+++ b/metadata/md5-cache/kde-base/knewstuff-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4deef39af982fa953200e180cb0ba8a5
diff --git a/metadata/md5-cache/kde-base/knode-4.4.11.1 b/metadata/md5-cache/kde-base/knode-4.4.11.1
index b37851218af9..46fa73688dbe 100644
--- a/metadata/md5-cache/kde-base/knode-4.4.11.1
+++ b/metadata/md5-cache/kde-base/knode-4.4.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b31f7630a6a43eb8ffab3ab7f34faf3a
diff --git a/metadata/md5-cache/kde-base/knode-4.7.4 b/metadata/md5-cache/kde-base/knode-4.7.4
index 23065c0879be..6e561ee086a3 100644
--- a/metadata/md5-cache/kde-base/knode-4.7.4
+++ b/metadata/md5-cache/kde-base/knode-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a17b5586237c6c55265aadd436b2ffb6
diff --git a/metadata/md5-cache/kde-base/knode-4.8.3 b/metadata/md5-cache/kde-base/knode-4.8.3
index 10207278112c..cc51c23570f6 100644
--- a/metadata/md5-cache/kde-base/knode-4.8.3
+++ b/metadata/md5-cache/kde-base/knode-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=642f5fbd542fd844adab25d07b1e8ce7
diff --git a/metadata/md5-cache/kde-base/knode-4.8.4 b/metadata/md5-cache/kde-base/knode-4.8.4
index 10bc10c4d483..cf29a7261f80 100644
--- a/metadata/md5-cache/kde-base/knode-4.8.4
+++ b/metadata/md5-cache/kde-base/knode-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2dc89043a2f03e8d129e54e28e247697
diff --git a/metadata/md5-cache/kde-base/knotes-4.4.11.1 b/metadata/md5-cache/kde-base/knotes-4.4.11.1
index 2952d4c9e94a..e057e2152d3e 100644
--- a/metadata/md5-cache/kde-base/knotes-4.4.11.1
+++ b/metadata/md5-cache/kde-base/knotes-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dba9e5b5645fbe008d51283eb975dba3
diff --git a/metadata/md5-cache/kde-base/knotes-4.7.4 b/metadata/md5-cache/kde-base/knotes-4.7.4
index f7185e814a5e..65e5c6621731 100644
--- a/metadata/md5-cache/kde-base/knotes-4.7.4
+++ b/metadata/md5-cache/kde-base/knotes-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] kontact? ( >=kde-base/kontact-4.7.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ef37145ec103742e13143e5bb88b9b61
diff --git a/metadata/md5-cache/kde-base/knotes-4.8.3 b/metadata/md5-cache/kde-base/knotes-4.8.3
index 436f41ad942a..727e68559055 100644
--- a/metadata/md5-cache/kde-base/knotes-4.8.3
+++ b/metadata/md5-cache/kde-base/knotes-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] kontact? ( >=kde-base/kontact-4.8.3:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a9a433f56eb674a7abf957d9ac288a36
diff --git a/metadata/md5-cache/kde-base/knotes-4.8.4 b/metadata/md5-cache/kde-base/knotes-4.8.4
index 7e738f81feb5..166f5b25b5bc 100644
--- a/metadata/md5-cache/kde-base/knotes-4.8.4
+++ b/metadata/md5-cache/kde-base/knotes-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] kontact? ( >=kde-base/kontact-4.8.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6a292b2c1765c444fe6d638e7116bfce
diff --git a/metadata/md5-cache/kde-base/knotify-4.7.4 b/metadata/md5-cache/kde-base/knotify-4.7.4
index e399bd3a0d98..c9bf070ca266 100644
--- a/metadata/md5-cache/kde-base/knotify-4.7.4
+++ b/metadata/md5-cache/kde-base/knotify-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4eb2c608e697bcd8e4c2bb80f4ea069e
diff --git a/metadata/md5-cache/kde-base/knotify-4.8.3 b/metadata/md5-cache/kde-base/knotify-4.8.3
index 9e3470159706..d14e679f27c1 100644
--- a/metadata/md5-cache/kde-base/knotify-4.8.3
+++ b/metadata/md5-cache/kde-base/knotify-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=46a5457fab61caa54679b75b588a5d0d
diff --git a/metadata/md5-cache/kde-base/knotify-4.8.4 b/metadata/md5-cache/kde-base/knotify-4.8.4
index 2e4ec939cfdb..7bae565c31d3 100644
--- a/metadata/md5-cache/kde-base/knotify-4.8.4
+++ b/metadata/md5-cache/kde-base/knotify-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=809b69a08593f208af87ad44333f11bc
diff --git a/metadata/md5-cache/kde-base/kolf-4.7.4 b/metadata/md5-cache/kde-base/kolf-4.7.4
index bfc1ed6671b4..e0fc98940395 100644
--- a/metadata/md5-cache/kde-base/kolf-4.7.4
+++ b/metadata/md5-cache/kde-base/kolf-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a3512e733a1180b9915bc981bb8120d8
diff --git a/metadata/md5-cache/kde-base/kolf-4.8.3 b/metadata/md5-cache/kde-base/kolf-4.8.3
index 04eec2e1b1b4..1e22c0043bba 100644
--- a/metadata/md5-cache/kde-base/kolf-4.8.3
+++ b/metadata/md5-cache/kde-base/kolf-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e977d79ad91a42e1a4e8ddbf1ea4a5db
diff --git a/metadata/md5-cache/kde-base/kolf-4.8.4 b/metadata/md5-cache/kde-base/kolf-4.8.4
index 55004c6f765a..d04f20a2dda5 100644
--- a/metadata/md5-cache/kde-base/kolf-4.8.4
+++ b/metadata/md5-cache/kde-base/kolf-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f56774e81e732314d789f921b76895ac
diff --git a/metadata/md5-cache/kde-base/kollision-4.7.4 b/metadata/md5-cache/kde-base/kollision-4.7.4
index d59b55af4899..4e4f7d9e7eb9 100644
--- a/metadata/md5-cache/kde-base/kollision-4.7.4
+++ b/metadata/md5-cache/kde-base/kollision-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c6345cb6f4e0e39c5f633f01c23d244c
diff --git a/metadata/md5-cache/kde-base/kollision-4.8.3 b/metadata/md5-cache/kde-base/kollision-4.8.3
index 72b4f9cadfcf..d883d01a7ebc 100644
--- a/metadata/md5-cache/kde-base/kollision-4.8.3
+++ b/metadata/md5-cache/kde-base/kollision-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b1e4da921625c39d5a72b384bd53e8bf
diff --git a/metadata/md5-cache/kde-base/kollision-4.8.4 b/metadata/md5-cache/kde-base/kollision-4.8.4
index 8fcebd95ff70..9c832396e6e7 100644
--- a/metadata/md5-cache/kde-base/kollision-4.8.4
+++ b/metadata/md5-cache/kde-base/kollision-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1e8cdb3a6d167b5bff74b73feebf6ded
diff --git a/metadata/md5-cache/kde-base/kolourpaint-4.7.4 b/metadata/md5-cache/kde-base/kolourpaint-4.7.4
index 671d6f197847..90f909888390 100644
--- a/metadata/md5-cache/kde-base/kolourpaint-4.7.4
+++ b/metadata/md5-cache/kde-base/kolourpaint-4.7.4
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=media-libs/qimageblitz scanner? ( kde-base/ksaneplugin ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kolourpaint-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d6310889ab361b39f93171c57c045fa5
diff --git a/metadata/md5-cache/kde-base/kolourpaint-4.8.3 b/metadata/md5-cache/kde-base/kolourpaint-4.8.3
index a408e3f502a0..1da8f2a1aef5 100644
--- a/metadata/md5-cache/kde-base/kolourpaint-4.8.3
+++ b/metadata/md5-cache/kde-base/kolourpaint-4.8.3
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=media-libs/qimageblitz scanner? ( kde-base/ksaneplugin ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kolourpaint-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=91c489ca9d4d06623234651bca27c40e
diff --git a/metadata/md5-cache/kde-base/kolourpaint-4.8.4 b/metadata/md5-cache/kde-base/kolourpaint-4.8.4
index 07bed9ff7005..1e5d3e04664b 100644
--- a/metadata/md5-cache/kde-base/kolourpaint-4.8.4
+++ b/metadata/md5-cache/kde-base/kolourpaint-4.8.4
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=media-libs/qimageblitz scanner? ( kde-base/ksaneplugin ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kolourpaint-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4193ee4bb7406a6f9ed989a2bd3d328
diff --git a/metadata/md5-cache/kde-base/kommander-4.7.4 b/metadata/md5-cache/kde-base/kommander-4.7.4
index 9d65ede490e7..26570fec3ec4 100644
--- a/metadata/md5-cache/kde-base/kommander-4.7.4
+++ b/metadata/md5-cache/kde-base/kommander-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdewebdev-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f760e851a33e751810370a750d4789c9
diff --git a/metadata/md5-cache/kde-base/kommander-4.8.3 b/metadata/md5-cache/kde-base/kommander-4.8.3
index de1db3c09f55..ed0e1ab5b94f 100644
--- a/metadata/md5-cache/kde-base/kommander-4.8.3
+++ b/metadata/md5-cache/kde-base/kommander-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdewebdev-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4cd1f0676abea0ded05b480ded6c829d
diff --git a/metadata/md5-cache/kde-base/kommander-4.8.4 b/metadata/md5-cache/kde-base/kommander-4.8.4
index 1a82cba06094..f872b27202fd 100644
--- a/metadata/md5-cache/kde-base/kommander-4.8.4
+++ b/metadata/md5-cache/kde-base/kommander-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdewebdev-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e44ff5b55e687a54e6fc300e2fe6dddb
diff --git a/metadata/md5-cache/kde-base/kompare-4.7.4 b/metadata/md5-cache/kde-base/kompare-4.7.4
index 9670170c99d9..7c422d2be91b 100644
--- a/metadata/md5-cache/kde-base/kompare-4.7.4
+++ b/metadata/md5-cache/kde-base/kompare-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ac214af1d0b23fe1c5d48d28c0bf8f5d
diff --git a/metadata/md5-cache/kde-base/kompare-4.8.3 b/metadata/md5-cache/kde-base/kompare-4.8.3
index 43d92f82d2af..798ea8f62796 100644
--- a/metadata/md5-cache/kde-base/kompare-4.8.3
+++ b/metadata/md5-cache/kde-base/kompare-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a4f9325b37674eb4fc0ce7ff7aa4a27c
diff --git a/metadata/md5-cache/kde-base/kompare-4.8.4 b/metadata/md5-cache/kde-base/kompare-4.8.4
index 82af2abd040c..9577adc9d249 100644
--- a/metadata/md5-cache/kde-base/kompare-4.8.4
+++ b/metadata/md5-cache/kde-base/kompare-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=daeed7384c94bec70322587e2f128f20
diff --git a/metadata/md5-cache/kde-base/konq-plugins-4.7.4 b/metadata/md5-cache/kde-base/konq-plugins-4.7.4
index f3757d4cbf97..15b260d042c4 100644
--- a/metadata/md5-cache/kde-base/konq-plugins-4.7.4
+++ b/metadata/md5-cache/kde-base/konq-plugins-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.7.4:4[aqua=] >=kde-base/konqueror-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c17791c68b057a9084e0285659c02c43
diff --git a/metadata/md5-cache/kde-base/konq-plugins-4.8.3 b/metadata/md5-cache/kde-base/konq-plugins-4.8.3
index ae8ad039f0e2..f7d60d09e934 100644
--- a/metadata/md5-cache/kde-base/konq-plugins-4.8.3
+++ b/metadata/md5-cache/kde-base/konq-plugins-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.8.3:4[aqua=] >=kde-base/konqueror-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=49e3ba0f35d574957dd9f8bba41882de
diff --git a/metadata/md5-cache/kde-base/konq-plugins-4.8.4 b/metadata/md5-cache/kde-base/konq-plugins-4.8.4
index 02ae639216a8..cb53e2f9ddd9 100644
--- a/metadata/md5-cache/kde-base/konq-plugins-4.8.4
+++ b/metadata/md5-cache/kde-base/konq-plugins-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.8.4:4[aqua=] >=kde-base/konqueror-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c462ccdfaf1f04c7d412b738d062d166
diff --git a/metadata/md5-cache/kde-base/konqueror-4.7.4 b/metadata/md5-cache/kde-base/konqueror-4.7.4
index 36b3566a8f3b..70a78a077c54 100644
--- a/metadata/md5-cache/kde-base/konqueror-4.7.4
+++ b/metadata/md5-cache/kde-base/konqueror-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/kfind-4.7.4:4[aqua=] >=kde-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e86cba1a9d5ef3869f8bd51822f8fedd
diff --git a/metadata/md5-cache/kde-base/konqueror-4.8.3 b/metadata/md5-cache/kde-base/konqueror-4.8.3
index 431b007e0916..75cd24dba235 100644
--- a/metadata/md5-cache/kde-base/konqueror-4.8.3
+++ b/metadata/md5-cache/kde-base/konqueror-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/kfind-4.8.3:4[aqua=] >=kde-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=05cf3d04c5077a0c2a404413a202e852
diff --git a/metadata/md5-cache/kde-base/konqueror-4.8.4 b/metadata/md5-cache/kde-base/konqueror-4.8.4
index d708456f22b5..7a3ac319d50e 100644
--- a/metadata/md5-cache/kde-base/konqueror-4.8.4
+++ b/metadata/md5-cache/kde-base/konqueror-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/kfind-4.8.4:4[aqua=] >=kde-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2fda2be31b33c98af4e8c2aef55af6cb
diff --git a/metadata/md5-cache/kde-base/konquest-4.7.4 b/metadata/md5-cache/kde-base/konquest-4.7.4
index 5fe000fe267b..f04b7a71a5ae 100644
--- a/metadata/md5-cache/kde-base/konquest-4.7.4
+++ b/metadata/md5-cache/kde-base/konquest-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=beda2b02b9705cd82fa3ff564f87eb01
diff --git a/metadata/md5-cache/kde-base/konquest-4.8.3 b/metadata/md5-cache/kde-base/konquest-4.8.3
index 67540ee3bf0a..2494394eda28 100644
--- a/metadata/md5-cache/kde-base/konquest-4.8.3
+++ b/metadata/md5-cache/kde-base/konquest-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3c5dbfca121fa9f8cf781c25613f958a
diff --git a/metadata/md5-cache/kde-base/konquest-4.8.4 b/metadata/md5-cache/kde-base/konquest-4.8.4
index 7d683d4d6818..61bad9416952 100644
--- a/metadata/md5-cache/kde-base/konquest-4.8.4
+++ b/metadata/md5-cache/kde-base/konquest-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=57033b3ac942c5bbdaba5a2f6e91bb3b
diff --git a/metadata/md5-cache/kde-base/konsole-4.7.4-r1 b/metadata/md5-cache/kde-base/konsole-4.7.4-r1
index 7ab4ed8700e6..15f94f877c35 100644
--- a/metadata/md5-cache/kde-base/konsole-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/konsole-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/konsole-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bcf900e711efe004ba92c05da1021a35
diff --git a/metadata/md5-cache/kde-base/konsole-4.8.3 b/metadata/md5-cache/kde-base/konsole-4.8.3
index b32e70216cc6..44d2a5a3f225 100644
--- a/metadata/md5-cache/kde-base/konsole-4.8.3
+++ b/metadata/md5-cache/kde-base/konsole-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!aqua? ( >=kde-base/libkonq-4.8.3:4[aqua=] x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/konsole-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9cef7161acf929bc430c2fef7373a695
diff --git a/metadata/md5-cache/kde-base/konsole-4.8.4 b/metadata/md5-cache/kde-base/konsole-4.8.4
index a02339067141..1effda32231c 100644
--- a/metadata/md5-cache/kde-base/konsole-4.8.4
+++ b/metadata/md5-cache/kde-base/konsole-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!aqua? ( >=kde-base/libkonq-4.8.4:4[aqua=] x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/konsole-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bcfedad50a469ae38ade58c5b12d8072
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.4.11.1 b/metadata/md5-cache/kde-base/konsolekalendar-4.4.11.1
index d311c2322928..e379d23c3e49 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.4.11.1
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=127026b2207a3a9976e75c2ce9060951
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.7.4 b/metadata/md5-cache/kde-base/konsolekalendar-4.7.4
index 120ac3effc53..66bd5a8212eb 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.7.4
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d302801ea6b59722494f97a60482368
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.8.3 b/metadata/md5-cache/kde-base/konsolekalendar-4.8.3
index 746d3e9c3ea0..891c5f6f884f 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.8.3
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c92293915a3d8c3260e5cd7b45c209ec
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.8.4 b/metadata/md5-cache/kde-base/konsolekalendar-4.8.4
index e74b355f30a7..f94019862757 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.8.4
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3296de79bc19b4f8bcdecae116cad575
diff --git a/metadata/md5-cache/kde-base/kontact-4.4.11.1 b/metadata/md5-cache/kde-base/kontact-4.4.11.1
index 4d7bee98f6f8..f9bb2486baf4 100644
--- a/metadata/md5-cache/kde-base/kontact-4.4.11.1
+++ b/metadata/md5-cache/kde-base/kontact-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7cd598dc506064c9724da2d55242c496
diff --git a/metadata/md5-cache/kde-base/kontact-4.7.4 b/metadata/md5-cache/kde-base/kontact-4.7.4
index 31fe62aaee1c..1d7e25d2aac6 100644
--- a/metadata/md5-cache/kde-base/kontact-4.7.4
+++ b/metadata/md5-cache/kde-base/kontact-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b48ab28cf443c4f2eecf24f3492bb432
diff --git a/metadata/md5-cache/kde-base/kontact-4.8.3 b/metadata/md5-cache/kde-base/kontact-4.8.3
index 10eae76bce9b..ff8d9cc2404a 100644
--- a/metadata/md5-cache/kde-base/kontact-4.8.3
+++ b/metadata/md5-cache/kde-base/kontact-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=58f625bd865a7f745a55f40ceaf735d2
diff --git a/metadata/md5-cache/kde-base/kontact-4.8.4 b/metadata/md5-cache/kde-base/kontact-4.8.4
index f2d0c12a4485..98513ac698c0 100644
--- a/metadata/md5-cache/kde-base/kontact-4.8.4
+++ b/metadata/md5-cache/kde-base/kontact-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=abde1d4cc5ca189b3792d60158123642
diff --git a/metadata/md5-cache/kde-base/kopete-4.7.4 b/metadata/md5-cache/kde-base/kopete-4.7.4
index c4da8ac4af58..816cbb564bc8 100644
--- a/metadata/md5-cache/kde-base/kopete-4.7.4
+++ b/metadata/md5-cache/kde-base/kopete-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre >=kde-base/kdepimlibs-4.7.4:4[aqua=] media-libs/qimageb
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ae41064144311ebf233c80be170f135
diff --git a/metadata/md5-cache/kde-base/kopete-4.8.3 b/metadata/md5-cache/kde-base/kopete-4.8.3
index d3869d97eb23..1eadd7c75c5b 100644
--- a/metadata/md5-cache/kde-base/kopete-4.8.3
+++ b/metadata/md5-cache/kde-base/kopete-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre >=kde-base/kdepimlibs-4.8.3:4[aqua=] media-libs/qimageb
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4b082aec245c918e3e5b1533282edde3
diff --git a/metadata/md5-cache/kde-base/kopete-4.8.4 b/metadata/md5-cache/kde-base/kopete-4.8.4
index 22944b462d74..419e4a047262 100644
--- a/metadata/md5-cache/kde-base/kopete-4.8.4
+++ b/metadata/md5-cache/kde-base/kopete-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre >=kde-base/kdepimlibs-4.8.4:4[aqua=] media-libs/qimageb
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cb5eca4dc9163bcb1bef872174576d6b
diff --git a/metadata/md5-cache/kde-base/korganizer-4.4.11.1 b/metadata/md5-cache/kde-base/korganizer-4.4.11.1
index c6c96609b171..e83e642c7f33 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.4.11.1
+++ b/metadata/md5-cache/kde-base/korganizer-4.4.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] >=kde-base/libkdepim
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b3d0d5e9ef26d2ac71866d85ac6184bd
diff --git a/metadata/md5-cache/kde-base/korganizer-4.7.4 b/metadata/md5-cache/kde-base/korganizer-4.7.4
index a68c86d21888..a9332db425c9 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.7.4
+++ b/metadata/md5-cache/kde-base/korganizer-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=627d71763b7b93283199a8e04864665f
diff --git a/metadata/md5-cache/kde-base/korganizer-4.8.3 b/metadata/md5-cache/kde-base/korganizer-4.8.3
index 131eb7cc28c2..2c6be2c79d11 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.8.3
+++ b/metadata/md5-cache/kde-base/korganizer-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d3bd5031c70dc5ee016dd0b04437762e
diff --git a/metadata/md5-cache/kde-base/korganizer-4.8.4 b/metadata/md5-cache/kde-base/korganizer-4.8.4
index 1ab338d6b9c7..ac4dfdf23a11 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.8.4
+++ b/metadata/md5-cache/kde-base/korganizer-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop] >=kde-base/kdepim-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f49f6cdc9f3dafcf32af81fa60991471
diff --git a/metadata/md5-cache/kde-base/korundum-4.7.4 b/metadata/md5-cache/kde-base/korundum-4.7.4
index 05e77367c2a9..3f930c40089d 100644
--- a/metadata/md5-cache/kde-base/korundum-4.7.4
+++ b/metadata/md5-cache/kde-base/korundum-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/qtruby-4.7.4:4[aqua=] >=kde-base/smokekde-4.7.4:4[aqua=,akona
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/korundum-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=558d4e08191140b66fbdd4926163c230
diff --git a/metadata/md5-cache/kde-base/korundum-4.8.3 b/metadata/md5-cache/kde-base/korundum-4.8.3
index 869a0a71dad8..fd98d5fd39e4 100644
--- a/metadata/md5-cache/kde-base/korundum-4.8.3
+++ b/metadata/md5-cache/kde-base/korundum-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/qtruby-4.8.3:4[aqua=] >=kde-base/smokekde-4.8.3:4[aqua=,kate?
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/korundum-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=35359cb5ed2a6ead6d2ea8d716ba05c5
diff --git a/metadata/md5-cache/kde-base/korundum-4.8.4 b/metadata/md5-cache/kde-base/korundum-4.8.4
index f546e3061d50..20485a932e46 100644
--- a/metadata/md5-cache/kde-base/korundum-4.8.4
+++ b/metadata/md5-cache/kde-base/korundum-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/qtruby-4.8.4:4[aqua=] >=kde-base/smokekde-4.8.4:4[aqua=,kate?
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/korundum-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bc20e65d847217913cee563d42f49284
diff --git a/metadata/md5-cache/kde-base/kpasswdserver-4.7.4 b/metadata/md5-cache/kde-base/kpasswdserver-4.7.4
index fe77cdff6b63..484ffde0fee9 100644
--- a/metadata/md5-cache/kde-base/kpasswdserver-4.7.4
+++ b/metadata/md5-cache/kde-base/kpasswdserver-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a4fb6bd59d200f745741f4c0252a6cff
diff --git a/metadata/md5-cache/kde-base/kpasswdserver-4.8.3 b/metadata/md5-cache/kde-base/kpasswdserver-4.8.3
index 4bca0b811364..8d3f23a6f691 100644
--- a/metadata/md5-cache/kde-base/kpasswdserver-4.8.3
+++ b/metadata/md5-cache/kde-base/kpasswdserver-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=48a35f26b3bd0dc275b34f1159e2fd61
diff --git a/metadata/md5-cache/kde-base/kpasswdserver-4.8.4 b/metadata/md5-cache/kde-base/kpasswdserver-4.8.4
index 5f16c7b9fd52..1fe643b02172 100644
--- a/metadata/md5-cache/kde-base/kpasswdserver-4.8.4
+++ b/metadata/md5-cache/kde-base/kpasswdserver-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71af6ac19f7642179dfcb77f2a4f0974
diff --git a/metadata/md5-cache/kde-base/kpat-4.7.4 b/metadata/md5-cache/kde-base/kpat-4.7.4
index 14eca8548292..33dec58db279 100644
--- a/metadata/md5-cache/kde-base/kpat-4.7.4
+++ b/metadata/md5-cache/kde-base/kpat-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e84b6ba93ff7d7845e9db6d61a4d86cd
diff --git a/metadata/md5-cache/kde-base/kpat-4.8.3 b/metadata/md5-cache/kde-base/kpat-4.8.3
index 482ee52ac994..40ccda231795 100644
--- a/metadata/md5-cache/kde-base/kpat-4.8.3
+++ b/metadata/md5-cache/kde-base/kpat-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c10ab09e68a9d2303b75e63802fb7f41
diff --git a/metadata/md5-cache/kde-base/kpat-4.8.4 b/metadata/md5-cache/kde-base/kpat-4.8.4
index 884437b621b4..2a7dfd12c9a0 100644
--- a/metadata/md5-cache/kde-base/kpat-4.8.4
+++ b/metadata/md5-cache/kde-base/kpat-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9d69605cac688689f8ef874bb28e89a7
diff --git a/metadata/md5-cache/kde-base/kppp-4.7.4 b/metadata/md5-cache/kde-base/kppp-4.7.4
index 6d3b139d23fc..ebf8044d5096 100644
--- a/metadata/md5-cache/kde-base/kppp-4.7.4
+++ b/metadata/md5-cache/kde-base/kppp-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=325b4d66edf3f984df23fef5f354dfa8
diff --git a/metadata/md5-cache/kde-base/kppp-4.8.3 b/metadata/md5-cache/kde-base/kppp-4.8.3
index 3893ec5e8a7f..1ac58e2b5e26 100644
--- a/metadata/md5-cache/kde-base/kppp-4.8.3
+++ b/metadata/md5-cache/kde-base/kppp-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b87df554e4cd6a20281c827cf39ca74a
diff --git a/metadata/md5-cache/kde-base/kppp-4.8.4 b/metadata/md5-cache/kde-base/kppp-4.8.4
index 1f85286d08b1..03762fb68a22 100644
--- a/metadata/md5-cache/kde-base/kppp-4.8.4
+++ b/metadata/md5-cache/kde-base/kppp-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7e9b1aa349bf0ef99e3f15206b61e99a
diff --git a/metadata/md5-cache/kde-base/kquitapp-4.7.4 b/metadata/md5-cache/kde-base/kquitapp-4.7.4
index 56d0dfb876d6..5ccc81f17d81 100644
--- a/metadata/md5-cache/kde-base/kquitapp-4.7.4
+++ b/metadata/md5-cache/kde-base/kquitapp-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04e3699aa684de7ade355709ffe1a9ed
diff --git a/metadata/md5-cache/kde-base/kquitapp-4.8.3 b/metadata/md5-cache/kde-base/kquitapp-4.8.3
index e48a6a2bfd48..ae630730d2c6 100644
--- a/metadata/md5-cache/kde-base/kquitapp-4.8.3
+++ b/metadata/md5-cache/kde-base/kquitapp-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1177d218b4b83b5df824df703da41643
diff --git a/metadata/md5-cache/kde-base/kquitapp-4.8.4 b/metadata/md5-cache/kde-base/kquitapp-4.8.4
index aea355b93cee..7d709e3cea92 100644
--- a/metadata/md5-cache/kde-base/kquitapp-4.8.4
+++ b/metadata/md5-cache/kde-base/kquitapp-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ed9fee15e784bea3c8a209d1ad60c18c
diff --git a/metadata/md5-cache/kde-base/krdc-4.7.4 b/metadata/md5-cache/kde-base/krdc-4.7.4
index 12bccafc9ed2..188b124505f9 100644
--- a/metadata/md5-cache/kde-base/krdc-4.7.4
+++ b/metadata/md5-cache/kde-base/krdc-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) rdesktop? ( net-misc/rdesktop ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=74d740821be2f3cd870b54f1208f6346
diff --git a/metadata/md5-cache/kde-base/krdc-4.8.3 b/metadata/md5-cache/kde-base/krdc-4.8.3
index 4ee1b8eb7645..3bbdb1e6c4e6 100644
--- a/metadata/md5-cache/kde-base/krdc-4.8.3
+++ b/metadata/md5-cache/kde-base/krdc-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) rdesktop? ( net-misc/rdesktop ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f7de1e64e9da84e2ab27688adb1ac271
diff --git a/metadata/md5-cache/kde-base/krdc-4.8.4 b/metadata/md5-cache/kde-base/krdc-4.8.4
index 8841cca7896d..ba377f710dcc 100644
--- a/metadata/md5-cache/kde-base/krdc-4.8.4
+++ b/metadata/md5-cache/kde-base/krdc-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) rdesktop? ( net-misc/rdesktop ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e403fc3a27d51744ea91597e854a316
diff --git a/metadata/md5-cache/kde-base/kreadconfig-4.7.4 b/metadata/md5-cache/kde-base/kreadconfig-4.7.4
index 139f2a29e485..58f39d87acd5 100644
--- a/metadata/md5-cache/kde-base/kreadconfig-4.7.4
+++ b/metadata/md5-cache/kde-base/kreadconfig-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d2815418b4e3111933dd14a428c22dbf
diff --git a/metadata/md5-cache/kde-base/kreadconfig-4.8.3 b/metadata/md5-cache/kde-base/kreadconfig-4.8.3
index a67691335885..5969694c998c 100644
--- a/metadata/md5-cache/kde-base/kreadconfig-4.8.3
+++ b/metadata/md5-cache/kde-base/kreadconfig-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b433b1997b482af685cdef5030fd66c9
diff --git a/metadata/md5-cache/kde-base/kreadconfig-4.8.4 b/metadata/md5-cache/kde-base/kreadconfig-4.8.4
index 6dbeed857f7f..48b3c43cb8c0 100644
--- a/metadata/md5-cache/kde-base/kreadconfig-4.8.4
+++ b/metadata/md5-cache/kde-base/kreadconfig-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7d0e28d27fe53dd22473ba05d2e87906
diff --git a/metadata/md5-cache/kde-base/kremotecontrol-4.7.4 b/metadata/md5-cache/kde-base/kremotecontrol-4.7.4
index e5d5185425e8..314bfe885d71 100644
--- a/metadata/md5-cache/kde-base/kremotecontrol-4.7.4
+++ b/metadata/md5-cache/kde-base/kremotecontrol-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/solid-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0505a4ec47ed143f2041ea033455d37a
diff --git a/metadata/md5-cache/kde-base/kremotecontrol-4.8.3 b/metadata/md5-cache/kde-base/kremotecontrol-4.8.3
index e23a15b2ce06..891a560402f2 100644
--- a/metadata/md5-cache/kde-base/kremotecontrol-4.8.3
+++ b/metadata/md5-cache/kde-base/kremotecontrol-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/solid-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kremotecontrol-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5dececdbd6c5b4f6f30d0497c3a1b666
diff --git a/metadata/md5-cache/kde-base/kremotecontrol-4.8.4 b/metadata/md5-cache/kde-base/kremotecontrol-4.8.4
index 097b67f583fc..f66172f281e5 100644
--- a/metadata/md5-cache/kde-base/kremotecontrol-4.8.4
+++ b/metadata/md5-cache/kde-base/kremotecontrol-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/solid-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kremotecontrol-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6784c645518343f8e30f31c2c0aae0ae
diff --git a/metadata/md5-cache/kde-base/kreversi-4.7.4 b/metadata/md5-cache/kde-base/kreversi-4.7.4
index 4c9edcfd5932..ce364137f72a 100644
--- a/metadata/md5-cache/kde-base/kreversi-4.7.4
+++ b/metadata/md5-cache/kde-base/kreversi-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=07654bdc10a7ae0576fb98d2be3d59b0
diff --git a/metadata/md5-cache/kde-base/kreversi-4.8.3 b/metadata/md5-cache/kde-base/kreversi-4.8.3
index e333c6fc64ff..83592026b697 100644
--- a/metadata/md5-cache/kde-base/kreversi-4.8.3
+++ b/metadata/md5-cache/kde-base/kreversi-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ba73113b32df78086a6c69e95af6bde
diff --git a/metadata/md5-cache/kde-base/kreversi-4.8.4 b/metadata/md5-cache/kde-base/kreversi-4.8.4
index b7170c9addcb..78c6803b7aa6 100644
--- a/metadata/md5-cache/kde-base/kreversi-4.8.4
+++ b/metadata/md5-cache/kde-base/kreversi-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=94a69c3ee23a3ad10d0981e6dc21e812
diff --git a/metadata/md5-cache/kde-base/krfb-4.7.4 b/metadata/md5-cache/kde-base/krfb-4.7.4
index 2711399b8c37..20577b81ef95 100644
--- a/metadata/md5-cache/kde-base/krfb-4.7.4
+++ b/metadata/md5-cache/kde-base/krfb-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdenetwork-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d18a89cd7de7428e8b772c53d90a3e96
diff --git a/metadata/md5-cache/kde-base/krfb-4.8.3 b/metadata/md5-cache/kde-base/krfb-4.8.3
index 99c14e02be9f..dcd467b798ad 100644
--- a/metadata/md5-cache/kde-base/krfb-4.8.3
+++ b/metadata/md5-cache/kde-base/krfb-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdenetwork-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3a2d4e3a91dd07db24c65e97d72821dd
diff --git a/metadata/md5-cache/kde-base/krfb-4.8.4 b/metadata/md5-cache/kde-base/krfb-4.8.4
index 0a224ab255df..698c866f2c5a 100644
--- a/metadata/md5-cache/kde-base/krfb-4.8.4
+++ b/metadata/md5-cache/kde-base/krfb-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg !aqua? ( x11-libs/libXdamage ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdenetwork-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d637cf728fabb843fb9b0366ca56715
diff --git a/metadata/md5-cache/kde-base/krossjava-4.7.4 b/metadata/md5-cache/kde-base/krossjava-4.7.4
index 8f91c6b6aa46..0aff40b4b134 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 885228baf04e..926ccde00590 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a6856b2779b0ba0c244b72116599402a
diff --git a/metadata/md5-cache/kde-base/krossjava-4.8.4 b/metadata/md5-cache/kde-base/krossjava-4.8.4
index e47fb381d2cf..b19982ae5b43 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.8.4
+++ b/metadata/md5-cache/kde-base/krossjava-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kross-interpreters-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a351d3eff4f7cfac4c1248a865a48040
diff --git a/metadata/md5-cache/kde-base/krosspython-4.7.4 b/metadata/md5-cache/kde-base/krosspython-4.7.4
index 1b1dcef73166..33d32c1966c0 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.7.4
+++ b/metadata/md5-cache/kde-base/krosspython-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ca69434bcc5e8500be1078b56351c0fc
diff --git a/metadata/md5-cache/kde-base/krosspython-4.8.3 b/metadata/md5-cache/kde-base/krosspython-4.8.3
index 6117e48a91d7..f6f7838b9381 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.8.3
+++ b/metadata/md5-cache/kde-base/krosspython-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71dc3d66e3e50a64c153987e54d4694c
diff --git a/metadata/md5-cache/kde-base/krosspython-4.8.4 b/metadata/md5-cache/kde-base/krosspython-4.8.4
index 0bb460c6320b..a541f01c3256 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.8.4
+++ b/metadata/md5-cache/kde-base/krosspython-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kross-interpreters-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e7727b162508a698f95526d03939ec72
diff --git a/metadata/md5-cache/kde-base/krossruby-4.7.4 b/metadata/md5-cache/kde-base/krossruby-4.7.4
index 63dd88627246..6b0adec39db3 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.7.4
+++ b/metadata/md5-cache/kde-base/krossruby-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d4f0f0ec7e28bbf6ce9e2b1d3419f43
diff --git a/metadata/md5-cache/kde-base/krossruby-4.8.3 b/metadata/md5-cache/kde-base/krossruby-4.8.3
index 507d5c06a359..03eefc3c434a 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.8.3
+++ b/metadata/md5-cache/kde-base/krossruby-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=256ec151a44174c0079824fd6febeb56
diff --git a/metadata/md5-cache/kde-base/krossruby-4.8.4 b/metadata/md5-cache/kde-base/krossruby-4.8.4
index 7e9f6cdadf18..e45a221850a1 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.8.4
+++ b/metadata/md5-cache/kde-base/krossruby-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kdebindings-ruby:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kross-interpreters-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=256b7358e73aed74826e8f6c8ffaef94
diff --git a/metadata/md5-cache/kde-base/kruler-4.7.4 b/metadata/md5-cache/kde-base/kruler-4.7.4
index ec0e55f22328..588d53705513 100644
--- a/metadata/md5-cache/kde-base/kruler-4.7.4
+++ b/metadata/md5-cache/kde-base/kruler-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kruler-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0b39e7fa6c379420d505ace1988c678e
diff --git a/metadata/md5-cache/kde-base/kruler-4.8.3 b/metadata/md5-cache/kde-base/kruler-4.8.3
index 0ae409523176..ce09de399ce8 100644
--- a/metadata/md5-cache/kde-base/kruler-4.8.3
+++ b/metadata/md5-cache/kde-base/kruler-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kruler-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4d470c3358dffce34e02633d09eda293
diff --git a/metadata/md5-cache/kde-base/kruler-4.8.4 b/metadata/md5-cache/kde-base/kruler-4.8.4
index 63b5fd8b2a30..2ce7fac68021 100644
--- a/metadata/md5-cache/kde-base/kruler-4.8.4
+++ b/metadata/md5-cache/kde-base/kruler-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kruler-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f5904b31c72b29602043c7ec3fa23801
diff --git a/metadata/md5-cache/kde-base/krunner-4.7.4 b/metadata/md5-cache/kde-base/krunner-4.7.4
index f6400a27caa0..282a0142c75a 100644
--- a/metadata/md5-cache/kde-base/krunner-4.7.4
+++ b/metadata/md5-cache/kde-base/krunner-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcheckpass-4.7.4:4[aqua=] >=kde-base/kephal-4.7.4:4[aqua=] >=kde-base/ksmserver-4.7.4:4[aqua=] >=kde-base/ksysguard-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/libplasmagenericshell-4.7.4:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=751d1353bfea8b80565745f4729d63cc
diff --git a/metadata/md5-cache/kde-base/krunner-4.8.3 b/metadata/md5-cache/kde-base/krunner-4.8.3
index b063cda0f9da..47ca73a81372 100644
--- a/metadata/md5-cache/kde-base/krunner-4.8.3
+++ b/metadata/md5-cache/kde-base/krunner-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcheckpass-4.8.3:4[aqua=] >=kde-base/kephal-4.8.3:4[aqua=] >=kde-base/ksmserver-4.8.3:4[aqua=] >=kde-base/ksysguard-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/libplasmagenericshell-4.8.3:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ceeb6fe079b072a5c046b00b4a2cc80
diff --git a/metadata/md5-cache/kde-base/krunner-4.8.4 b/metadata/md5-cache/kde-base/krunner-4.8.4
index 275abc1229f0..f0629983d866 100644
--- a/metadata/md5-cache/kde-base/krunner-4.8.4
+++ b/metadata/md5-cache/kde-base/krunner-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcheckpass-4.8.4:4[aqua=] >=kde-base/kephal-4.8.4:4[aqua=] >=kde-base/ksmserver-4.8.4:4[aqua=] >=kde-base/ksysguard-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/libplasmagenericshell-4.8.4:4[aqua=] !aqua? ( x11-libs/libXcursor x11-libs/libXScrnSaver ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e3dae6f0e26ecf33d4284b2d9601c36b
diff --git a/metadata/md5-cache/kde-base/ksaneplugin-4.7.4 b/metadata/md5-cache/kde-base/ksaneplugin-4.7.4
index 44f9134e976b..a8d5ac495fa0 100644
--- a/metadata/md5-cache/kde-base/ksaneplugin-4.7.4
+++ b/metadata/md5-cache/kde-base/ksaneplugin-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libksane-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/ksaneplugin-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a3398702a7957e1c690f54e1e7fb1712
diff --git a/metadata/md5-cache/kde-base/ksaneplugin-4.8.3 b/metadata/md5-cache/kde-base/ksaneplugin-4.8.3
index 40400fc8416e..fe8458ff9805 100644
--- a/metadata/md5-cache/kde-base/ksaneplugin-4.8.3
+++ b/metadata/md5-cache/kde-base/ksaneplugin-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libksane-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/ksaneplugin-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3a226fc592df4e500785f84f470cd8c0
diff --git a/metadata/md5-cache/kde-base/ksaneplugin-4.8.4 b/metadata/md5-cache/kde-base/ksaneplugin-4.8.4
index 6bec78195589..e876356b5df8 100644
--- a/metadata/md5-cache/kde-base/ksaneplugin-4.8.4
+++ b/metadata/md5-cache/kde-base/ksaneplugin-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libksane-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/ksaneplugin-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61e0e0f707a50ee30a8feadd90f0946c
diff --git a/metadata/md5-cache/kde-base/kscd-4.7.4-r1 b/metadata/md5-cache/kde-base/kscd-4.7.4-r1
index 2b21c456e2c1..700a533bafd6 100644
--- a/metadata/md5-cache/kde-base/kscd-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/kscd-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.7.4:4[aqua=] >=kde-base/libkcompactdisc-4.7.4:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0ea0fdcdfff97bdc59a352d2cbe3c709
diff --git a/metadata/md5-cache/kde-base/kscd-4.8.3 b/metadata/md5-cache/kde-base/kscd-4.8.3
index 6c0274ff02d7..334fb908ee67 100644
--- a/metadata/md5-cache/kde-base/kscd-4.8.3
+++ b/metadata/md5-cache/kde-base/kscd-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.8.3:4[aqua=] >=kde-base/libkcompactdisc-4.8.3:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=05ab77e35ae808f9ee23a3599e0dd310
diff --git a/metadata/md5-cache/kde-base/kscd-4.8.4 b/metadata/md5-cache/kde-base/kscd-4.8.4
index 71b145f70579..bcec3ef78c3b 100644
--- a/metadata/md5-cache/kde-base/kscd-4.8.4
+++ b/metadata/md5-cache/kde-base/kscd-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.8.4:4[aqua=] >=kde-base/libkcompactdisc-4.8.4:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=065eaba9dac1392e64238b0a15a6dd36
diff --git a/metadata/md5-cache/kde-base/kscreensaver-4.7.4 b/metadata/md5-cache/kde-base/kscreensaver-4.7.4
index dac3f9359abf..090f66eb9608 100644
--- a/metadata/md5-cache/kde-base/kscreensaver-4.7.4
+++ b/metadata/md5-cache/kde-base/kscreensaver-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=kde-base/kcheckpass-4.7.4:4[aqua=] >=x11-libs/libxklavier-3.2 >=x11-libs/libXrandr-1.2.1 x11-libs/libXtst opengl? ( virtual/opengl ) pam? ( >=kde-base/kdebase-pam-7 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=44e9faaf9d14a8cfcbb35fa67efbe7ff
diff --git a/metadata/md5-cache/kde-base/kscreensaver-4.8.3 b/metadata/md5-cache/kde-base/kscreensaver-4.8.3
index db42c0092d00..bb221473b3df 100644
--- a/metadata/md5-cache/kde-base/kscreensaver-4.8.3
+++ b/metadata/md5-cache/kde-base/kscreensaver-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=kde-base/kcheckpass-4.8.3:4[aqua=] >=x11-libs/libxklavier-3.2 >=x11-libs/libXrandr-1.2.1 x11-libs/libXtst opengl? ( virtual/opengl ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=91a7114edcf5dd87c4292f1519968947
diff --git a/metadata/md5-cache/kde-base/kscreensaver-4.8.4 b/metadata/md5-cache/kde-base/kscreensaver-4.8.4
index f48a4c3d4727..712aaae126dc 100644
--- a/metadata/md5-cache/kde-base/kscreensaver-4.8.4
+++ b/metadata/md5-cache/kde-base/kscreensaver-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=kde-base/kcheckpass-4.8.4:4[aqua=] >=x11-libs/libxklavier-3.2 >=x11-libs/libXrandr-1.2.1 x11-libs/libXtst opengl? ( virtual/opengl ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8a66745a91ff2b7626f09ecb1a84fdd8
diff --git a/metadata/md5-cache/kde-base/kshisen-4.7.4 b/metadata/md5-cache/kde-base/kshisen-4.7.4
index 5c1dd31f4915..1f9dc144ca09 100644
--- a/metadata/md5-cache/kde-base/kshisen-4.7.4
+++ b/metadata/md5-cache/kde-base/kshisen-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=379b16fe068b7a739746faca0e77bbd4
diff --git a/metadata/md5-cache/kde-base/kshisen-4.8.3 b/metadata/md5-cache/kde-base/kshisen-4.8.3
index ec725dc679c8..224ce762e3fe 100644
--- a/metadata/md5-cache/kde-base/kshisen-4.8.3
+++ b/metadata/md5-cache/kde-base/kshisen-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=50b678a4d0b0f417f1ad25f91ba170d0
diff --git a/metadata/md5-cache/kde-base/kshisen-4.8.4 b/metadata/md5-cache/kde-base/kshisen-4.8.4
index 25601e1c5a85..60cf2c0c1e49 100644
--- a/metadata/md5-cache/kde-base/kshisen-4.8.4
+++ b/metadata/md5-cache/kde-base/kshisen-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkmahjongg-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f2ae450c3a5cc8321dd754b365002171
diff --git a/metadata/md5-cache/kde-base/ksirk-4.7.4 b/metadata/md5-cache/kde-base/ksirk-4.7.4
index ae95f2c785bf..13e09e7d0967 100644
--- a/metadata/md5-cache/kde-base/ksirk-4.7.4
+++ b/metadata/md5-cache/kde-base/ksirk-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a0151013d55bf047f688b6e0d5418990
diff --git a/metadata/md5-cache/kde-base/ksirk-4.8.3 b/metadata/md5-cache/kde-base/ksirk-4.8.3
index 8d803fa45543..72eedf844eda 100644
--- a/metadata/md5-cache/kde-base/ksirk-4.8.3
+++ b/metadata/md5-cache/kde-base/ksirk-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c1af381e3e4131e337c663b0d2c983dc
diff --git a/metadata/md5-cache/kde-base/ksirk-4.8.4 b/metadata/md5-cache/kde-base/ksirk-4.8.4
index c29e1fd1df32..bac414037dcf 100644
--- a/metadata/md5-cache/kde-base/ksirk-4.8.4
+++ b/metadata/md5-cache/kde-base/ksirk-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e1ba6da2e4bc5ed08e7075b211a69143
diff --git a/metadata/md5-cache/kde-base/ksmserver-4.7.4 b/metadata/md5-cache/kde-base/ksmserver-4.7.4
index e9a17a0250fb..4156435a2d32 100644
--- a/metadata/md5-cache/kde-base/ksmserver-4.7.4
+++ b/metadata/md5-cache/kde-base/ksmserver-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/solid-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1b5721087ce77595ea5049b1fa20841e
diff --git a/metadata/md5-cache/kde-base/ksmserver-4.8.3 b/metadata/md5-cache/kde-base/ksmserver-4.8.3
index 2612ad41a377..70f178fc147b 100644
--- a/metadata/md5-cache/kde-base/ksmserver-4.8.3
+++ b/metadata/md5-cache/kde-base/ksmserver-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/solid-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=88aca2e8b9d525f0ded169fc35444668
diff --git a/metadata/md5-cache/kde-base/ksmserver-4.8.4 b/metadata/md5-cache/kde-base/ksmserver-4.8.4
index e713abc16e63..7d01873dd085 100644
--- a/metadata/md5-cache/kde-base/ksmserver-4.8.4
+++ b/metadata/md5-cache/kde-base/ksmserver-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/solid-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=22d1a26eaca5e4c57119b5036e2f9e9e
diff --git a/metadata/md5-cache/kde-base/ksnapshot-4.7.4 b/metadata/md5-cache/kde-base/ksnapshot-4.7.4
index da97d49f6241..4333abf11ad7 100644
--- a/metadata/md5-cache/kde-base/ksnapshot-4.7.4
+++ b/metadata/md5-cache/kde-base/ksnapshot-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kipi? ( >=kde-base/libkipi-4.7.4:4[aqua=] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/ksnapshot-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=01f726ae6b946668ffbd1a055afe9257
diff --git a/metadata/md5-cache/kde-base/ksnapshot-4.8.3 b/metadata/md5-cache/kde-base/ksnapshot-4.8.3
index 83876db141dc..20bbba1c21df 100644
--- a/metadata/md5-cache/kde-base/ksnapshot-4.8.3
+++ b/metadata/md5-cache/kde-base/ksnapshot-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kipi? ( >=kde-base/libkipi-4.8.3:4[aqua=] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/ksnapshot-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0713382abe54153b85f765f78cd6dbb2
diff --git a/metadata/md5-cache/kde-base/ksnapshot-4.8.4 b/metadata/md5-cache/kde-base/ksnapshot-4.8.4
index 6b69887762fa..21e483867cb5 100644
--- a/metadata/md5-cache/kde-base/ksnapshot-4.8.4
+++ b/metadata/md5-cache/kde-base/ksnapshot-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kipi? ( >=kde-base/libkipi-4.8.4:4[aqua=] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/ksnapshot-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f32f61ba83e824aab1ac7ced40eb5344
diff --git a/metadata/md5-cache/kde-base/kspaceduel-4.7.4 b/metadata/md5-cache/kde-base/kspaceduel-4.7.4
index 7488b7326931..caac7ca63d55 100644
--- a/metadata/md5-cache/kde-base/kspaceduel-4.7.4
+++ b/metadata/md5-cache/kde-base/kspaceduel-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c7e1d371358d2147a51babb177501333
diff --git a/metadata/md5-cache/kde-base/kspaceduel-4.8.3 b/metadata/md5-cache/kde-base/kspaceduel-4.8.3
index a4665b406df0..dc3d9da2be57 100644
--- a/metadata/md5-cache/kde-base/kspaceduel-4.8.3
+++ b/metadata/md5-cache/kde-base/kspaceduel-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f2daecc208c01153c7752773cd7cd2dc
diff --git a/metadata/md5-cache/kde-base/kspaceduel-4.8.4 b/metadata/md5-cache/kde-base/kspaceduel-4.8.4
index b0bdbd22aa32..ef6f1d770ce8 100644
--- a/metadata/md5-cache/kde-base/kspaceduel-4.8.4
+++ b/metadata/md5-cache/kde-base/kspaceduel-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1dd671d8e7135a6c5ffa41d1bd0e076b
diff --git a/metadata/md5-cache/kde-base/ksplash-4.7.4 b/metadata/md5-cache/kde-base/ksplash-4.7.4
index 302f1fe85287..3343c233bc31 100644
--- a/metadata/md5-cache/kde-base/ksplash-4.7.4
+++ b/metadata/md5-cache/kde-base/ksplash-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8bace6c99d6312212794b079b395dff
diff --git a/metadata/md5-cache/kde-base/ksplash-4.8.3 b/metadata/md5-cache/kde-base/ksplash-4.8.3
index b0af2362a14e..b0b70831af40 100644
--- a/metadata/md5-cache/kde-base/ksplash-4.8.3
+++ b/metadata/md5-cache/kde-base/ksplash-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=454d43e2951ff803ab669d4fe1a0fd9f
diff --git a/metadata/md5-cache/kde-base/ksplash-4.8.4 b/metadata/md5-cache/kde-base/ksplash-4.8.4
index 00ceb1e30a15..e0ec9560d870 100644
--- a/metadata/md5-cache/kde-base/ksplash-4.8.4
+++ b/metadata/md5-cache/kde-base/ksplash-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bedbcfe500b4693292273e0b9a8d1c56
diff --git a/metadata/md5-cache/kde-base/ksquares-4.7.4 b/metadata/md5-cache/kde-base/ksquares-4.7.4
index 8ebd66e3b249..35d3a33da5c5 100644
--- a/metadata/md5-cache/kde-base/ksquares-4.7.4
+++ b/metadata/md5-cache/kde-base/ksquares-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=81f41b560785b2af17a1a28c451d3468
diff --git a/metadata/md5-cache/kde-base/ksquares-4.8.3 b/metadata/md5-cache/kde-base/ksquares-4.8.3
index 1b00fc3b6be5..a8ce65abe4ea 100644
--- a/metadata/md5-cache/kde-base/ksquares-4.8.3
+++ b/metadata/md5-cache/kde-base/ksquares-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b0878ee18d873945f787183d0ceb8634
diff --git a/metadata/md5-cache/kde-base/ksquares-4.8.4 b/metadata/md5-cache/kde-base/ksquares-4.8.4
index c85e6ec839ef..93a4e0f7c6f0 100644
--- a/metadata/md5-cache/kde-base/ksquares-4.8.4
+++ b/metadata/md5-cache/kde-base/ksquares-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games-ggz	1ff63c742d105768266d878da0c5c4e7	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eaf064896f512350e3df74bf8dd02a20
diff --git a/metadata/md5-cache/kde-base/kstars-4.7.4 b/metadata/md5-cache/kde-base/kstars-4.7.4
index 85136e444462..de327c0032db 100644
--- a/metadata/md5-cache/kde-base/kstars-4.7.4
+++ b/metadata/md5-cache/kde-base/kstars-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:2 >=kde-base/libkdeedu-4.7.4:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.6.2[fits?] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kstars-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c53e250187f2b8af8fa1d324d38717e4
diff --git a/metadata/md5-cache/kde-base/kstars-4.8.3 b/metadata/md5-cache/kde-base/kstars-4.8.3
index 98bab4d78e0b..74a5c6ff2f1f 100644
--- a/metadata/md5-cache/kde-base/kstars-4.8.3
+++ b/metadata/md5-cache/kde-base/kstars-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:2 >=kde-base/libkdeedu-4.8.3:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.6.2[fits?] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kstars-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cc578671c00ae7e0244cd5162fe7456d
diff --git a/metadata/md5-cache/kde-base/kstars-4.8.4 b/metadata/md5-cache/kde-base/kstars-4.8.4
index 0c89c46396c4..02f4ce0e7641 100644
--- a/metadata/md5-cache/kde-base/kstars-4.8.4
+++ b/metadata/md5-cache/kde-base/kstars-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:2 >=kde-base/libkdeedu-4.8.4:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.9.1 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kstars-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=716313335d55cdc55c83220386f5b0f9
diff --git a/metadata/md5-cache/kde-base/kstart-4.7.4 b/metadata/md5-cache/kde-base/kstart-4.7.4
index cb23c7fa3146..71c0d998deb4 100644
--- a/metadata/md5-cache/kde-base/kstart-4.7.4
+++ b/metadata/md5-cache/kde-base/kstart-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=882dd8e22d43869a47d02abdb8fd9750
diff --git a/metadata/md5-cache/kde-base/kstart-4.8.3 b/metadata/md5-cache/kde-base/kstart-4.8.3
index a3f9f6428e88..d7d2f7ce2957 100644
--- a/metadata/md5-cache/kde-base/kstart-4.8.3
+++ b/metadata/md5-cache/kde-base/kstart-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3c98f88dc85a3af9a704e6225ebcf0f1
diff --git a/metadata/md5-cache/kde-base/kstart-4.8.4 b/metadata/md5-cache/kde-base/kstart-4.8.4
index 2f353794e14e..237e3b8d9b80 100644
--- a/metadata/md5-cache/kde-base/kstart-4.8.4
+++ b/metadata/md5-cache/kde-base/kstart-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=49b54b34da9da253a90a0fb5ab16fd08
diff --git a/metadata/md5-cache/kde-base/kstartperf-4.7.4 b/metadata/md5-cache/kde-base/kstartperf-4.7.4
index d33e10eb5050..cb66a93c4530 100644
--- a/metadata/md5-cache/kde-base/kstartperf-4.7.4
+++ b/metadata/md5-cache/kde-base/kstartperf-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04390b9f08d649ca1087285f679586e2
diff --git a/metadata/md5-cache/kde-base/kstartperf-4.8.3 b/metadata/md5-cache/kde-base/kstartperf-4.8.3
index b1d981564484..86aa6aeb689d 100644
--- a/metadata/md5-cache/kde-base/kstartperf-4.8.3
+++ b/metadata/md5-cache/kde-base/kstartperf-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d9cf4e9c652512ae179dc8a1d45ad119
diff --git a/metadata/md5-cache/kde-base/kstartperf-4.8.4 b/metadata/md5-cache/kde-base/kstartperf-4.8.4
index eba97f4007a7..5601ef258f65 100644
--- a/metadata/md5-cache/kde-base/kstartperf-4.8.4
+++ b/metadata/md5-cache/kde-base/kstartperf-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=996ad23a5a02224987b61348cd8ce9fe
diff --git a/metadata/md5-cache/kde-base/kstartupconfig-4.7.4 b/metadata/md5-cache/kde-base/kstartupconfig-4.7.4
index 978d060be587..582b054ed14f 100644
--- a/metadata/md5-cache/kde-base/kstartupconfig-4.7.4
+++ b/metadata/md5-cache/kde-base/kstartupconfig-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e73ed99197285f6b2894b1df99d7a17b
diff --git a/metadata/md5-cache/kde-base/kstartupconfig-4.8.3 b/metadata/md5-cache/kde-base/kstartupconfig-4.8.3
index a6ab34601909..0777e1dd5606 100644
--- a/metadata/md5-cache/kde-base/kstartupconfig-4.8.3
+++ b/metadata/md5-cache/kde-base/kstartupconfig-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4e2b9575a57028c14fde1541699aaab4
diff --git a/metadata/md5-cache/kde-base/kstartupconfig-4.8.4 b/metadata/md5-cache/kde-base/kstartupconfig-4.8.4
index 8b30a229a944..dc96b2da620c 100644
--- a/metadata/md5-cache/kde-base/kstartupconfig-4.8.4
+++ b/metadata/md5-cache/kde-base/kstartupconfig-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=26ea5d3906a8d5518795a02cc6cf8b4a
diff --git a/metadata/md5-cache/kde-base/kstyles-4.7.4 b/metadata/md5-cache/kde-base/kstyles-4.7.4
index 5bc2e42d8c7e..08e17d6e8111 100644
--- a/metadata/md5-cache/kde-base/kstyles-4.7.4
+++ b/metadata/md5-cache/kde-base/kstyles-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/liboxygenstyle-4.7.4:4[aqua=] <x11-libs/qt-core-4.8.0 <x11-libs/qt-gui-4.8.0 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5dfae30761f3267b1979ff61a8f293a5
diff --git a/metadata/md5-cache/kde-base/kstyles-4.7.4-r10 b/metadata/md5-cache/kde-base/kstyles-4.7.4-r10
index c12a68e4f42a..f27381882be1 100644
--- a/metadata/md5-cache/kde-base/kstyles-4.7.4-r10
+++ b/metadata/md5-cache/kde-base/kstyles-4.7.4-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/liboxygenstyle-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.8.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.0:4[accessibility] >=x11-libs/qt-script-4.8.0:4 >=x11-libs/qt-sql-4.8.0:4[qt3support] >=x11-libs/qt-svg-4.8.0:4 >=x11-libs/qt-test-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bad29b4be4dc0ba7a6ea9cc011d97842
diff --git a/metadata/md5-cache/kde-base/kstyles-4.8.3 b/metadata/md5-cache/kde-base/kstyles-4.8.3
index 77db1533b40d..3d02ba7dff34 100644
--- a/metadata/md5-cache/kde-base/kstyles-4.8.3
+++ b/metadata/md5-cache/kde-base/kstyles-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/liboxygenstyle-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e3293d65ef56882dc91f77cb007c8924
diff --git a/metadata/md5-cache/kde-base/kstyles-4.8.4 b/metadata/md5-cache/kde-base/kstyles-4.8.4
index 717555672285..4cbdc3f2af26 100644
--- a/metadata/md5-cache/kde-base/kstyles-4.8.4
+++ b/metadata/md5-cache/kde-base/kstyles-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/liboxygenstyle-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=00deb13d8f2a40cf8206e7f7687e613f
diff --git a/metadata/md5-cache/kde-base/ksudoku-4.7.4 b/metadata/md5-cache/kde-base/ksudoku-4.7.4
index 0f908be567fb..cf666933ae3a 100644
--- a/metadata/md5-cache/kde-base/ksudoku-4.7.4
+++ b/metadata/md5-cache/kde-base/ksudoku-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=874aa133bd5dc62833965b6160a7c002
diff --git a/metadata/md5-cache/kde-base/ksudoku-4.8.3 b/metadata/md5-cache/kde-base/ksudoku-4.8.3
index f416737bb1ad..1c0a75f58b09 100644
--- a/metadata/md5-cache/kde-base/ksudoku-4.8.3
+++ b/metadata/md5-cache/kde-base/ksudoku-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=688cd538d3f9fabf6767984c613254d2
diff --git a/metadata/md5-cache/kde-base/ksudoku-4.8.4 b/metadata/md5-cache/kde-base/ksudoku-4.8.4
index 9737341d1448..269c5b877635 100644
--- a/metadata/md5-cache/kde-base/ksudoku-4.8.4
+++ b/metadata/md5-cache/kde-base/ksudoku-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=845f049932aac746b8a0dd269f436086
diff --git a/metadata/md5-cache/kde-base/ksysguard-4.7.4 b/metadata/md5-cache/kde-base/ksysguard-4.7.4
index 25bd0d7d2a3a..b7d729041851 100644
--- a/metadata/md5-cache/kde-base/ksysguard-4.7.4
+++ b/metadata/md5-cache/kde-base/ksysguard-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f9d73e806129e6f064cc5298bdd1a768
diff --git a/metadata/md5-cache/kde-base/ksysguard-4.8.3 b/metadata/md5-cache/kde-base/ksysguard-4.8.3
index dfe171ad7325..1b4ac43d7582 100644
--- a/metadata/md5-cache/kde-base/ksysguard-4.8.3
+++ b/metadata/md5-cache/kde-base/ksysguard-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=11340fe029b3aa2f933cd282d1b18167
diff --git a/metadata/md5-cache/kde-base/ksysguard-4.8.4 b/metadata/md5-cache/kde-base/ksysguard-4.8.4
index beb4873116fd..40566d8d71e8 100644
--- a/metadata/md5-cache/kde-base/ksysguard-4.8.4
+++ b/metadata/md5-cache/kde-base/ksysguard-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=98a0dbaceb11ad1b9340a86dd70f3aea
diff --git a/metadata/md5-cache/kde-base/ksystemlog-4.7.4 b/metadata/md5-cache/kde-base/ksystemlog-4.7.4
index 6f4aeb5e3f42..783c39147219 100644
--- a/metadata/md5-cache/kde-base/ksystemlog-4.7.4
+++ b/metadata/md5-cache/kde-base/ksystemlog-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeadmin-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aa01d15ec1b2b77d418e685ad75163f4
diff --git a/metadata/md5-cache/kde-base/ksystemlog-4.8.3 b/metadata/md5-cache/kde-base/ksystemlog-4.8.3
index 51468e914ea6..b89afba9a303 100644
--- a/metadata/md5-cache/kde-base/ksystemlog-4.8.3
+++ b/metadata/md5-cache/kde-base/ksystemlog-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeadmin-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d0f08a7a1a34b4344bcdd32ec694f45a
diff --git a/metadata/md5-cache/kde-base/ksystemlog-4.8.4 b/metadata/md5-cache/kde-base/ksystemlog-4.8.4
index 14e9da26ed8c..dfcb19056596 100644
--- a/metadata/md5-cache/kde-base/ksystemlog-4.8.4
+++ b/metadata/md5-cache/kde-base/ksystemlog-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeadmin-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6593eb7cc7fc7768a7077c7d053dd743
diff --git a/metadata/md5-cache/kde-base/ksystraycmd-4.7.4 b/metadata/md5-cache/kde-base/ksystraycmd-4.7.4
index 7af4d5b191aa..e4a77a8f40d5 100644
--- a/metadata/md5-cache/kde-base/ksystraycmd-4.7.4
+++ b/metadata/md5-cache/kde-base/ksystraycmd-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=35caa4df5ad02fab501bcf20c1090a18
diff --git a/metadata/md5-cache/kde-base/ksystraycmd-4.8.3 b/metadata/md5-cache/kde-base/ksystraycmd-4.8.3
index 4705d39d8faf..2d4bf6d17cab 100644
--- a/metadata/md5-cache/kde-base/ksystraycmd-4.8.3
+++ b/metadata/md5-cache/kde-base/ksystraycmd-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=814dd7fcbfd3c372bef645b97f260bdf
diff --git a/metadata/md5-cache/kde-base/ksystraycmd-4.8.4 b/metadata/md5-cache/kde-base/ksystraycmd-4.8.4
index 862fbb66f038..c71eefe5aa21 100644
--- a/metadata/md5-cache/kde-base/ksystraycmd-4.8.4
+++ b/metadata/md5-cache/kde-base/ksystraycmd-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a9f0aa904eee22ee1c492b1e5e7b692e
diff --git a/metadata/md5-cache/kde-base/kteatime-4.7.4 b/metadata/md5-cache/kde-base/kteatime-4.7.4
index 2054adf73606..a81b36e53a38 100644
--- a/metadata/md5-cache/kde-base/kteatime-4.7.4
+++ b/metadata/md5-cache/kde-base/kteatime-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdetoys-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6881dcccb636f91b6baa69613690cfee
diff --git a/metadata/md5-cache/kde-base/kteatime-4.8.3 b/metadata/md5-cache/kde-base/kteatime-4.8.3
index fcb428561506..30e159a33b47 100644
--- a/metadata/md5-cache/kde-base/kteatime-4.8.3
+++ b/metadata/md5-cache/kde-base/kteatime-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdetoys-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=14066c6a0c6f522b2153832073fb9255
diff --git a/metadata/md5-cache/kde-base/kteatime-4.8.4 b/metadata/md5-cache/kde-base/kteatime-4.8.4
index d61226e8b612..45e84cea5b66 100644
--- a/metadata/md5-cache/kde-base/kteatime-4.8.4
+++ b/metadata/md5-cache/kde-base/kteatime-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdetoys-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ba243eb87991905492cedcdb571946e2
diff --git a/metadata/md5-cache/kde-base/ktimer-4.7.4 b/metadata/md5-cache/kde-base/ktimer-4.7.4
index 1b503e9aafb8..3535a10cd770 100644
--- a/metadata/md5-cache/kde-base/ktimer-4.7.4
+++ b/metadata/md5-cache/kde-base/ktimer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=370b91cd37f43ad87557e1bcbb77e392
diff --git a/metadata/md5-cache/kde-base/ktimer-4.8.3 b/metadata/md5-cache/kde-base/ktimer-4.8.3
index d29466b45c0c..cbb3d50f200a 100644
--- a/metadata/md5-cache/kde-base/ktimer-4.8.3
+++ b/metadata/md5-cache/kde-base/ktimer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/ktimer-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=150dd79dd045fbae04d5d3342439acb0
diff --git a/metadata/md5-cache/kde-base/ktimer-4.8.4 b/metadata/md5-cache/kde-base/ktimer-4.8.4
index a1e4b99801f2..433a8c9a91e3 100644
--- a/metadata/md5-cache/kde-base/ktimer-4.8.4
+++ b/metadata/md5-cache/kde-base/ktimer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/ktimer-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=709a3d2cdcac07abe46dc7332633ba85
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.4.11.1 b/metadata/md5-cache/kde-base/ktimetracker-4.4.11.1
index 73aba9029176..6342d1eec182 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.4.11.1
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.4.11.1:4[aqua=] >=kde-base/kdepimlibs-4.6:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=] kontact? ( >=kde-base/kontact-4.4.11.1:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fc6a2cfcb142139104697fa2156f7b20
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.7.4 b/metadata/md5-cache/kde-base/ktimetracker-4.7.4
index 7665877f08a3..ecbe7fc8036c 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.7.4
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.7.4:4[aqua=] >=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/kdepim-common-libs-4.7.4:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] kontact? ( >=kde-base/kontact-4.7.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdepim-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a767570547ca4e9e01beac547477f8e7
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.8.3 b/metadata/md5-cache/kde-base/ktimetracker-4.8.3
index 5ef905b23373..cea9a985f5db 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.8.3
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.8.3:4[aqua=] >=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/kdepim-common-libs-4.8.3:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] kontact? ( >=kde-base/kontact-4.8.3:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdepim-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c98791a313ed3b4f95d9de87602f3928
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.8.4 b/metadata/md5-cache/kde-base/ktimetracker-4.8.4
index cf79ac0f1114..b45107f62718 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.8.4
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.8.4:4[aqua=] >=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/kdepim-common-libs-4.8.4:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] kontact? ( >=kde-base/kontact-4.8.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdepim-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ad76704d9339ea9e45e80de48ce81576
diff --git a/metadata/md5-cache/kde-base/ktimezoned-4.7.4 b/metadata/md5-cache/kde-base/ktimezoned-4.7.4
index 4e5c618b7472..e576fd126571 100644
--- a/metadata/md5-cache/kde-base/ktimezoned-4.7.4
+++ b/metadata/md5-cache/kde-base/ktimezoned-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c29892ac9a20f2309439d4932398d4c8
diff --git a/metadata/md5-cache/kde-base/ktimezoned-4.8.3 b/metadata/md5-cache/kde-base/ktimezoned-4.8.3
index 20f322eb390d..4e6974f1b387 100644
--- a/metadata/md5-cache/kde-base/ktimezoned-4.8.3
+++ b/metadata/md5-cache/kde-base/ktimezoned-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cf4d6d0b1277e580c0784e3e4b27d75e
diff --git a/metadata/md5-cache/kde-base/ktimezoned-4.8.4 b/metadata/md5-cache/kde-base/ktimezoned-4.8.4
index dcbe54fa7e59..3d597f9615b4 100644
--- a/metadata/md5-cache/kde-base/ktimezoned-4.8.4
+++ b/metadata/md5-cache/kde-base/ktimezoned-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2450d5c35620331efff41b1adb58d0d4
diff --git a/metadata/md5-cache/kde-base/ktouch-4.7.4 b/metadata/md5-cache/kde-base/ktouch-4.7.4
index 7029eee2a1ba..5864b36f0247 100644
--- a/metadata/md5-cache/kde-base/ktouch-4.7.4
+++ b/metadata/md5-cache/kde-base/ktouch-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/ktouch-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8456dc367658a59f1fb5f8d98b24be5a
diff --git a/metadata/md5-cache/kde-base/ktouch-4.8.3 b/metadata/md5-cache/kde-base/ktouch-4.8.3
index b12eaae4a959..5f4f2f406097 100644
--- a/metadata/md5-cache/kde-base/ktouch-4.8.3
+++ b/metadata/md5-cache/kde-base/ktouch-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/ktouch-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f0974974fada2185d10b95527a996abb
diff --git a/metadata/md5-cache/kde-base/ktouch-4.8.4 b/metadata/md5-cache/kde-base/ktouch-4.8.4
index 6b3849b19ca2..f003eb6910c2 100644
--- a/metadata/md5-cache/kde-base/ktouch-4.8.4
+++ b/metadata/md5-cache/kde-base/ktouch-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/ktouch-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=81f595c918a96cd481e2618fe7856e53
diff --git a/metadata/md5-cache/kde-base/ktraderclient-4.7.4 b/metadata/md5-cache/kde-base/ktraderclient-4.7.4
index 45ea3f5c1357..40a813788ad1 100644
--- a/metadata/md5-cache/kde-base/ktraderclient-4.7.4
+++ b/metadata/md5-cache/kde-base/ktraderclient-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e82655f636c91274884dbcf9774da7af
diff --git a/metadata/md5-cache/kde-base/ktraderclient-4.8.3 b/metadata/md5-cache/kde-base/ktraderclient-4.8.3
index 618bafd51a83..1a7b1c56dafc 100644
--- a/metadata/md5-cache/kde-base/ktraderclient-4.8.3
+++ b/metadata/md5-cache/kde-base/ktraderclient-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=27eb2fe51c5a00f7434465a7b8364c7e
diff --git a/metadata/md5-cache/kde-base/ktraderclient-4.8.4 b/metadata/md5-cache/kde-base/ktraderclient-4.8.4
index 21cac938d4b1..24ca1f58fe0e 100644
--- a/metadata/md5-cache/kde-base/ktraderclient-4.8.4
+++ b/metadata/md5-cache/kde-base/ktraderclient-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7b25cf448045d4323bb86b996d2843e6
diff --git a/metadata/md5-cache/kde-base/ktron-4.7.4 b/metadata/md5-cache/kde-base/ktron-4.7.4
index 6b972a63dcca..5c0e8d9d61c0 100644
--- a/metadata/md5-cache/kde-base/ktron-4.7.4
+++ b/metadata/md5-cache/kde-base/ktron-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96dcdefd4c5a41ac86958ce0c3b36699
diff --git a/metadata/md5-cache/kde-base/ktron-4.8.3 b/metadata/md5-cache/kde-base/ktron-4.8.3
index 36fbae2ba3ae..98b163e82525 100644
--- a/metadata/md5-cache/kde-base/ktron-4.8.3
+++ b/metadata/md5-cache/kde-base/ktron-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=03831b094c88104f5f6a0442814445cf
diff --git a/metadata/md5-cache/kde-base/ktron-4.8.4 b/metadata/md5-cache/kde-base/ktron-4.8.4
index 4cde9158559d..7deedde0a2d9 100644
--- a/metadata/md5-cache/kde-base/ktron-4.8.4
+++ b/metadata/md5-cache/kde-base/ktron-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d4fd079f2fbe0eb55911a5321165f666
diff --git a/metadata/md5-cache/kde-base/ktuberling-4.7.4 b/metadata/md5-cache/kde-base/ktuberling-4.7.4
index 3a8fb8881728..8bdcc2accdd1 100644
--- a/metadata/md5-cache/kde-base/ktuberling-4.7.4
+++ b/metadata/md5-cache/kde-base/ktuberling-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=26835eb1d1b5673544ccf93a4ed09c22
diff --git a/metadata/md5-cache/kde-base/ktuberling-4.8.3 b/metadata/md5-cache/kde-base/ktuberling-4.8.3
index 41e54b391266..06c48c8910a7 100644
--- a/metadata/md5-cache/kde-base/ktuberling-4.8.3
+++ b/metadata/md5-cache/kde-base/ktuberling-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=beb034f71497767dabb0e8839ba95c80
diff --git a/metadata/md5-cache/kde-base/ktuberling-4.8.4 b/metadata/md5-cache/kde-base/ktuberling-4.8.4
index c6f3a9ce56af..9ae5e8080bea 100644
--- a/metadata/md5-cache/kde-base/ktuberling-4.8.4
+++ b/metadata/md5-cache/kde-base/ktuberling-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d62aca080105ce92a6eedd0b40216e95
diff --git a/metadata/md5-cache/kde-base/kturtle-4.7.4 b/metadata/md5-cache/kde-base/kturtle-4.7.4
index 0e24ea9c5a48..c47eb0d53dbf 100644
--- a/metadata/md5-cache/kde-base/kturtle-4.7.4
+++ b/metadata/md5-cache/kde-base/kturtle-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kturtle-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fd9a9ba1758b7b354a86d3bbc5392e72
diff --git a/metadata/md5-cache/kde-base/kturtle-4.8.3 b/metadata/md5-cache/kde-base/kturtle-4.8.3
index 7c0faddf1e71..54beffd3db70 100644
--- a/metadata/md5-cache/kde-base/kturtle-4.8.3
+++ b/metadata/md5-cache/kde-base/kturtle-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kturtle-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b6ab30df53a1ddb5743c2ae7ea1c5e07
diff --git a/metadata/md5-cache/kde-base/kturtle-4.8.4 b/metadata/md5-cache/kde-base/kturtle-4.8.4
index 414c37a39652..d9e1bded4206 100644
--- a/metadata/md5-cache/kde-base/kturtle-4.8.4
+++ b/metadata/md5-cache/kde-base/kturtle-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kturtle-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=db7382dc8415f1df805df6ef727f976d
diff --git a/metadata/md5-cache/kde-base/ktux-4.7.4 b/metadata/md5-cache/kde-base/ktux-4.7.4
index 7c651988b9b2..f459b927fec7 100644
--- a/metadata/md5-cache/kde-base/ktux-4.7.4
+++ b/metadata/md5-cache/kde-base/ktux-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdetoys-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6c7ce708e373cfbb6718ce3ce1e6bd2b
diff --git a/metadata/md5-cache/kde-base/ktux-4.8.3 b/metadata/md5-cache/kde-base/ktux-4.8.3
index 8fc27e691270..a548bfe2555e 100644
--- a/metadata/md5-cache/kde-base/ktux-4.8.3
+++ b/metadata/md5-cache/kde-base/ktux-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdetoys-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e5deecb53106e5c36a49db8577f13d5a
diff --git a/metadata/md5-cache/kde-base/ktux-4.8.4 b/metadata/md5-cache/kde-base/ktux-4.8.4
index 9418266560ed..fa73a1fc5597 100644
--- a/metadata/md5-cache/kde-base/ktux-4.8.4
+++ b/metadata/md5-cache/kde-base/ktux-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdetoys-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d05a63a57da9854491dc0c03159ce9d2
diff --git a/metadata/md5-cache/kde-base/kubrick-4.7.4 b/metadata/md5-cache/kde-base/kubrick-4.7.4
index 736457d8c488..95bf59eb44ba 100644
--- a/metadata/md5-cache/kde-base/kubrick-4.7.4
+++ b/metadata/md5-cache/kde-base/kubrick-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=baf93ce5af19d612f692f58f742970b2
diff --git a/metadata/md5-cache/kde-base/kubrick-4.8.3 b/metadata/md5-cache/kde-base/kubrick-4.8.3
index 376283db1c3d..d88fba7ceed1 100644
--- a/metadata/md5-cache/kde-base/kubrick-4.8.3
+++ b/metadata/md5-cache/kde-base/kubrick-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=549bd367ac37da8ff48ecad7b0b23c6e
diff --git a/metadata/md5-cache/kde-base/kubrick-4.8.4 b/metadata/md5-cache/kde-base/kubrick-4.8.4
index 048222e16760..cdeac2a531fa 100644
--- a/metadata/md5-cache/kde-base/kubrick-4.8.4
+++ b/metadata/md5-cache/kde-base/kubrick-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d5a16e72845929e0d567327019d0504f
diff --git a/metadata/md5-cache/kde-base/kuiserver-4.7.4 b/metadata/md5-cache/kde-base/kuiserver-4.7.4
index 7be57c2aaf2d..388f061ba12a 100644
--- a/metadata/md5-cache/kde-base/kuiserver-4.7.4
+++ b/metadata/md5-cache/kde-base/kuiserver-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a00101308eb75082e7fc14209822233a
diff --git a/metadata/md5-cache/kde-base/kuiserver-4.8.3 b/metadata/md5-cache/kde-base/kuiserver-4.8.3
index 8e84a673298d..11732a8a31ed 100644
--- a/metadata/md5-cache/kde-base/kuiserver-4.8.3
+++ b/metadata/md5-cache/kde-base/kuiserver-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c31ac1f5d408be48bf53200e12c6fd65
diff --git a/metadata/md5-cache/kde-base/kuiserver-4.8.4 b/metadata/md5-cache/kde-base/kuiserver-4.8.4
index b4994a24ec48..da52268a38da 100644
--- a/metadata/md5-cache/kde-base/kuiserver-4.8.4
+++ b/metadata/md5-cache/kde-base/kuiserver-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=50c3c7a880c18c8c32d2b6b065271986
diff --git a/metadata/md5-cache/kde-base/kuiviewer-4.7.4 b/metadata/md5-cache/kde-base/kuiviewer-4.7.4
index 29fb902bef87..d909baf88f1f 100644
--- a/metadata/md5-cache/kde-base/kuiviewer-4.7.4
+++ b/metadata/md5-cache/kde-base/kuiviewer-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7d859fd1079c6cae4524ab24fdcdf097
diff --git a/metadata/md5-cache/kde-base/kuiviewer-4.8.3 b/metadata/md5-cache/kde-base/kuiviewer-4.8.3
index 3ee2e3d0c0bf..7fac188d75a7 100644
--- a/metadata/md5-cache/kde-base/kuiviewer-4.8.3
+++ b/metadata/md5-cache/kde-base/kuiviewer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=326cf23d525cd7dfd3e4c535421b173d
diff --git a/metadata/md5-cache/kde-base/kuiviewer-4.8.4 b/metadata/md5-cache/kde-base/kuiviewer-4.8.4
index 355edcf920ff..5513d6b46b28 100644
--- a/metadata/md5-cache/kde-base/kuiviewer-4.8.4
+++ b/metadata/md5-cache/kde-base/kuiviewer-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=959fd387a4bc14fb8bf91c8f5a81afa1
diff --git a/metadata/md5-cache/kde-base/kurifilter-plugins-4.7.4 b/metadata/md5-cache/kde-base/kurifilter-plugins-4.7.4
index ce85d61ee798..de646bb195ab 100644
--- a/metadata/md5-cache/kde-base/kurifilter-plugins-4.7.4
+++ b/metadata/md5-cache/kde-base/kurifilter-plugins-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=519cfe0b80f936bca039c8490412cbbb
diff --git a/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.3 b/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.3
index 9377ef9a1a85..4881e4827db9 100644
--- a/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.3
+++ b/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=64f9cdcc5ab2b9bfa0b19e69a09a1a1a
diff --git a/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.4 b/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.4
index 6abe681512a5..b1368f3d5b5e 100644
--- a/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.4
+++ b/metadata/md5-cache/kde-base/kurifilter-plugins-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5346459c504eb76970ce4aa614a35482
diff --git a/metadata/md5-cache/kde-base/kuser-4.7.4 b/metadata/md5-cache/kde-base/kuser-4.7.4
index 5e1f08efe663..e7444196253f 100644
--- a/metadata/md5-cache/kde-base/kuser-4.7.4
+++ b/metadata/md5-cache/kde-base/kuser-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.7.4:4[aqua=] >=kde-base/knotify-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeadmin-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04567fea719078ca2766f69ed5840220
diff --git a/metadata/md5-cache/kde-base/kuser-4.8.3 b/metadata/md5-cache/kde-base/kuser-4.8.3
index a9cf40168547..9c3f2b807cd0 100644
--- a/metadata/md5-cache/kde-base/kuser-4.8.3
+++ b/metadata/md5-cache/kde-base/kuser-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.3:4[aqua=] >=kde-base/knotify-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeadmin-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a4852963bdfb073e06af56ef2224701c
diff --git a/metadata/md5-cache/kde-base/kuser-4.8.4 b/metadata/md5-cache/kde-base/kuser-4.8.4
index 0f560a1d3d33..9c63bae91b26 100644
--- a/metadata/md5-cache/kde-base/kuser-4.8.4
+++ b/metadata/md5-cache/kde-base/kuser-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.8.4:4[aqua=] >=kde-base/knotify-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeadmin-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=de70b3e912f37f66b0fa4f4cec61f108
diff --git a/metadata/md5-cache/kde-base/kwallet-4.7.4 b/metadata/md5-cache/kde-base/kwallet-4.7.4
index a129b7cf66e9..5253db949121 100644
--- a/metadata/md5-cache/kde-base/kwallet-4.7.4
+++ b/metadata/md5-cache/kde-base/kwallet-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=264fa1d5ce7ca77cdac252b707ae56ba
diff --git a/metadata/md5-cache/kde-base/kwallet-4.8.3 b/metadata/md5-cache/kde-base/kwallet-4.8.3
index 9920f34d52d8..dce48e7bf639 100644
--- a/metadata/md5-cache/kde-base/kwallet-4.8.3
+++ b/metadata/md5-cache/kde-base/kwallet-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kwallet-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e12f04e3b788dec6d7271a6494229f84
diff --git a/metadata/md5-cache/kde-base/kwallet-4.8.4 b/metadata/md5-cache/kde-base/kwallet-4.8.4
index 924c2e993eee..a4c5254db4a0 100644
--- a/metadata/md5-cache/kde-base/kwallet-4.8.4
+++ b/metadata/md5-cache/kde-base/kwallet-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kwallet-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3e5600c7e2dbc186881a8900ef556118
diff --git a/metadata/md5-cache/kde-base/kwalletd-4.7.4 b/metadata/md5-cache/kde-base/kwalletd-4.7.4
index 05eea1004f03..f56af223f783 100644
--- a/metadata/md5-cache/kde-base/kwalletd-4.7.4
+++ b/metadata/md5-cache/kde-base/kwalletd-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ff9ba1b711d26e0eaafd1f626b61b37c
diff --git a/metadata/md5-cache/kde-base/kwalletd-4.8.3 b/metadata/md5-cache/kde-base/kwalletd-4.8.3
index 85b846109a9c..b03ed1b0839c 100644
--- a/metadata/md5-cache/kde-base/kwalletd-4.8.3
+++ b/metadata/md5-cache/kde-base/kwalletd-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b942fc81c6fc8ecd75340ace60bff16e
diff --git a/metadata/md5-cache/kde-base/kwalletd-4.8.4 b/metadata/md5-cache/kde-base/kwalletd-4.8.4
index 55c9edd8693e..ad220517f8e4 100644
--- a/metadata/md5-cache/kde-base/kwalletd-4.8.4
+++ b/metadata/md5-cache/kde-base/kwalletd-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ba3b2495e3f6298650e229806b9ef64c
diff --git a/metadata/md5-cache/kde-base/kwin-4.7.4 b/metadata/md5-cache/kde-base/kwin-4.7.4
index d527f58eb3df..a923a0db6a0a 100644
--- a/metadata/md5-cache/kde-base/kwin-4.7.4
+++ b/metadata/md5-cache/kde-base/kwin-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kephal-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=]
 REQUIRED_USE=opengl? ( !gles ) gles? ( !opengl )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bc88716b827d64633c55916c0bb46945
diff --git a/metadata/md5-cache/kde-base/kwin-4.8.3 b/metadata/md5-cache/kde-base/kwin-4.8.3
index c2d36e2810cb..edbadcc6e71b 100644
--- a/metadata/md5-cache/kde-base/kwin-4.8.3
+++ b/metadata/md5-cache/kde-base/kwin-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kactivities-4.8.3:4[aqua=] >=kde-base/kdelibs-4.8.3:4[aqua=,o
 REQUIRED_USE=!opengl? ( gles ) !gles? ( opengl )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=959c34af7de8a25a6c31e0689273385c
diff --git a/metadata/md5-cache/kde-base/kwin-4.8.4 b/metadata/md5-cache/kde-base/kwin-4.8.4
index a6161f6147b5..a1306a7bad52 100644
--- a/metadata/md5-cache/kde-base/kwin-4.8.4
+++ b/metadata/md5-cache/kde-base/kwin-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kactivities-4.8.4:4[aqua=] >=kde-base/kdelibs-4.8.4:4[aqua=,o
 REQUIRED_USE=!opengl? ( gles ) !gles? ( opengl )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3582233f797732d6042dffe5a5a439fd
diff --git a/metadata/md5-cache/kde-base/kwordquiz-4.7.4 b/metadata/md5-cache/kde-base/kwordquiz-4.7.4
index 23433b01c70c..2176bb627e56 100644
--- a/metadata/md5-cache/kde-base/kwordquiz-4.7.4
+++ b/metadata/md5-cache/kde-base/kwordquiz-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kwordquiz-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ed9ebb54e1cfe0d507cf792b0e14c83e
diff --git a/metadata/md5-cache/kde-base/kwordquiz-4.8.3 b/metadata/md5-cache/kde-base/kwordquiz-4.8.3
index c0463ca27f10..e7b5b464572a 100644
--- a/metadata/md5-cache/kde-base/kwordquiz-4.8.3
+++ b/metadata/md5-cache/kde-base/kwordquiz-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kwordquiz-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=13995fe6c4e059c0c7f78047d67e9ff8
diff --git a/metadata/md5-cache/kde-base/kwordquiz-4.8.4 b/metadata/md5-cache/kde-base/kwordquiz-4.8.4
index 6130181bac85..93a5fea7d514 100644
--- a/metadata/md5-cache/kde-base/kwordquiz-4.8.4
+++ b/metadata/md5-cache/kde-base/kwordquiz-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kwordquiz-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=89e124187601ec2d57a6430ae00daef9
diff --git a/metadata/md5-cache/kde-base/kwrite-4.7.4 b/metadata/md5-cache/kde-base/kwrite-4.7.4
index 5a2a7ec722d0..c7c8fa9ca7e1 100644
--- a/metadata/md5-cache/kde-base/kwrite-4.7.4
+++ b/metadata/md5-cache/kde-base/kwrite-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/katepart-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kate-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dcccef1ee461985a2d77100ad4b6833f
diff --git a/metadata/md5-cache/kde-base/kwrite-4.8.3 b/metadata/md5-cache/kde-base/kwrite-4.8.3
index b86a772740c9..6f96504e618c 100644
--- a/metadata/md5-cache/kde-base/kwrite-4.8.3
+++ b/metadata/md5-cache/kde-base/kwrite-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/katepart-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kate-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cb2e020d92df31d3bd5991393d6f0610
diff --git a/metadata/md5-cache/kde-base/kwrite-4.8.4 b/metadata/md5-cache/kde-base/kwrite-4.8.4
index aa9f702fa3a9..edf06f7a4723 100644
--- a/metadata/md5-cache/kde-base/kwrite-4.8.4
+++ b/metadata/md5-cache/kde-base/kwrite-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/katepart-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kate-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cfaf89a9ff5b9111459d043c5fdba295
diff --git a/metadata/md5-cache/kde-base/kwrited-4.7.4 b/metadata/md5-cache/kde-base/kwrited-4.7.4
index 2d4f1d9f14ed..c5b7b4841458 100644
--- a/metadata/md5-cache/kde-base/kwrited-4.7.4
+++ b/metadata/md5-cache/kde-base/kwrited-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libutempter-1.1.5 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=56f75e95af7d2ff0127346cb34e4a7e9
diff --git a/metadata/md5-cache/kde-base/kwrited-4.8.3 b/metadata/md5-cache/kde-base/kwrited-4.8.3
index bb1a3b50c35b..3d1d06ee269c 100644
--- a/metadata/md5-cache/kde-base/kwrited-4.8.3
+++ b/metadata/md5-cache/kde-base/kwrited-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libutempter-1.1.5 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71f57629f2f7e59da79564b53ac3208d
diff --git a/metadata/md5-cache/kde-base/kwrited-4.8.4 b/metadata/md5-cache/kde-base/kwrited-4.8.4
index aad04fd35648..ecfa9e24420a 100644
--- a/metadata/md5-cache/kde-base/kwrited-4.8.4
+++ b/metadata/md5-cache/kde-base/kwrited-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libutempter-1.1.5 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4cd3097f62d3f845545d121cbe41654
diff --git a/metadata/md5-cache/kde-base/libkcddb-4.7.4 b/metadata/md5-cache/kde-base/libkcddb-4.7.4
index 6e96fee6aea9..cac8f648449d 100644
--- a/metadata/md5-cache/kde-base/libkcddb-4.7.4
+++ b/metadata/md5-cache/kde-base/libkcddb-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=musicbrainz? ( media-libs/musicbrainz:3 ) >=kde-base/oxygen-icons-4.7.4:
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=55e6113ec03190c757c85c48620b6343
diff --git a/metadata/md5-cache/kde-base/libkcddb-4.8.3 b/metadata/md5-cache/kde-base/libkcddb-4.8.3
index b3919875aa8a..ab9569be0570 100644
--- a/metadata/md5-cache/kde-base/libkcddb-4.8.3
+++ b/metadata/md5-cache/kde-base/libkcddb-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=musicbrainz? ( media-libs/musicbrainz:3 ) >=kde-base/oxygen-icons-4.8.3:
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=24fa73123d175d287b8539caa50d2196
diff --git a/metadata/md5-cache/kde-base/libkcddb-4.8.4 b/metadata/md5-cache/kde-base/libkcddb-4.8.4
index b5c5d2ea1fc7..ffa87f73b341 100644
--- a/metadata/md5-cache/kde-base/libkcddb-4.8.4
+++ b/metadata/md5-cache/kde-base/libkcddb-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=musicbrainz? ( media-libs/musicbrainz:3 ) !<kde-base/kscd-4.8.4:4 >=kde-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=76fc1344d38dc37eca5a99dd16304c88
diff --git a/metadata/md5-cache/kde-base/libkcompactdisc-4.7.4 b/metadata/md5-cache/kde-base/libkcompactdisc-4.7.4
index baa29c7fdb3c..a541758052f5 100644
--- a/metadata/md5-cache/kde-base/libkcompactdisc-4.7.4
+++ b/metadata/md5-cache/kde-base/libkcompactdisc-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a2f52b19d12e8454a563364010e29fc
diff --git a/metadata/md5-cache/kde-base/libkcompactdisc-4.8.3 b/metadata/md5-cache/kde-base/libkcompactdisc-4.8.3
index 54fd26a8d894..82bf644edd9e 100644
--- a/metadata/md5-cache/kde-base/libkcompactdisc-4.8.3
+++ b/metadata/md5-cache/kde-base/libkcompactdisc-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=70341870be097b0cb0eb80fc3a6cf6ae
diff --git a/metadata/md5-cache/kde-base/libkcompactdisc-4.8.4 b/metadata/md5-cache/kde-base/libkcompactdisc-4.8.4
index bd6d8d0c014e..52ec18c7d35d 100644
--- a/metadata/md5-cache/kde-base/libkcompactdisc-4.8.4
+++ b/metadata/md5-cache/kde-base/libkcompactdisc-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6b3e32e6a197e3973a8e948dbea7196c
diff --git a/metadata/md5-cache/kde-base/libkdcraw-4.7.4 b/metadata/md5-cache/kde-base/libkdcraw-4.7.4
index dcb39639179c..d6d2139af2f8 100644
--- a/metadata/md5-cache/kde-base/libkdcraw-4.7.4
+++ b/metadata/md5-cache/kde-base/libkdcraw-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/libkdcraw-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c34ae0a4f6ea21781db3697192dc315d
diff --git a/metadata/md5-cache/kde-base/libkdcraw-4.8.3 b/metadata/md5-cache/kde-base/libkdcraw-4.8.3
index ea30fcc25879..1aadd4e5fff9 100644
--- a/metadata/md5-cache/kde-base/libkdcraw-4.8.3
+++ b/metadata/md5-cache/kde-base/libkdcraw-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/libkdcraw-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=482e5371814de5b48d12a7e3e5b88d28
diff --git a/metadata/md5-cache/kde-base/libkdcraw-4.8.4 b/metadata/md5-cache/kde-base/libkdcraw-4.8.4
index 486df9e15eae..eb18d6272c81 100644
--- a/metadata/md5-cache/kde-base/libkdcraw-4.8.4
+++ b/metadata/md5-cache/kde-base/libkdcraw-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/libkdcraw-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d595d138f5baf76d349cb8594ddc16a0
diff --git a/metadata/md5-cache/kde-base/libkdeedu-4.7.4 b/metadata/md5-cache/kde-base/libkdeedu-4.7.4
index 0ffa25251535..dcb1d3249a61 100644
--- a/metadata/md5-cache/kde-base/libkdeedu-4.7.4
+++ b/metadata/md5-cache/kde-base/libkdeedu-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/p
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/libkdeedu-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cfa8f9720a526c5146944e44af7c1e86
diff --git a/metadata/md5-cache/kde-base/libkdeedu-4.8.3 b/metadata/md5-cache/kde-base/libkdeedu-4.8.3
index 6518ac5c4325..5a1c9a5481a9 100644
--- a/metadata/md5-cache/kde-base/libkdeedu-4.8.3
+++ b/metadata/md5-cache/kde-base/libkdeedu-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/p
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/libkdeedu-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9e933198d1f5cbb799385a749814fafe
diff --git a/metadata/md5-cache/kde-base/libkdeedu-4.8.4 b/metadata/md5-cache/kde-base/libkdeedu-4.8.4
index 236763d71cd4..28fffcec6a79 100644
--- a/metadata/md5-cache/kde-base/libkdeedu-4.8.4
+++ b/metadata/md5-cache/kde-base/libkdeedu-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kvtml-data:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/p
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/libkdeedu-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7e3583c83c0139b609ea89aeb9dab08f
diff --git a/metadata/md5-cache/kde-base/libkdegames-4.7.4 b/metadata/md5-cache/kde-base/libkdegames-4.7.4
index 42afc9140b6b..e74ab91ed01b 100644
--- a/metadata/md5-cache/kde-base/libkdegames-4.7.4
+++ b/metadata/md5-cache/kde-base/libkdegames-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/ggz-client-libs-0.0.14 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=11fedeb75df988547f8af26a56b3188a
diff --git a/metadata/md5-cache/kde-base/libkdegames-4.8.3 b/metadata/md5-cache/kde-base/libkdegames-4.8.3
index 6ff76f86cd22..c71b5a171590 100644
--- a/metadata/md5-cache/kde-base/libkdegames-4.8.3
+++ b/metadata/md5-cache/kde-base/libkdegames-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/ggz-client-libs-0.0.14 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=95acbd3370b0fb64f491f15a4122460c
diff --git a/metadata/md5-cache/kde-base/libkdegames-4.8.4 b/metadata/md5-cache/kde-base/libkdegames-4.8.4
index 868fc7166c91..fc3656df206d 100644
--- a/metadata/md5-cache/kde-base/libkdegames-4.8.4
+++ b/metadata/md5-cache/kde-base/libkdegames-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/ggz-client-libs-0.0.14 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5240a5f54382a63c8c3feb9be3322f7d
diff --git a/metadata/md5-cache/kde-base/libkdepim-4.4.11.1 b/metadata/md5-cache/kde-base/libkdepim-4.4.11.1
index 693d4cfe096c..b576da30c870 100644
--- a/metadata/md5-cache/kde-base/libkdepim-4.4.11.1
+++ b/metadata/md5-cache/kde-base/libkdepim-4.4.11.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdepimlibs-4.6:4[aqua=,semantic-desktop] !kde-base/kode:4 >=k
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d20a2b5380c89a3e0213c939302a2e1
diff --git a/metadata/md5-cache/kde-base/libkexiv2-4.7.4 b/metadata/md5-cache/kde-base/libkexiv2-4.7.4
index 5f603311e6f8..545a32ca6d83 100644
--- a/metadata/md5-cache/kde-base/libkexiv2-4.7.4
+++ b/metadata/md5-cache/kde-base/libkexiv2-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/libkexiv2-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bcf69b46d9df6ccbb8a1142e9551ed03
diff --git a/metadata/md5-cache/kde-base/libkexiv2-4.8.3 b/metadata/md5-cache/kde-base/libkexiv2-4.8.3
index e40d38980b5e..b1ea2878792a 100644
--- a/metadata/md5-cache/kde-base/libkexiv2-4.8.3
+++ b/metadata/md5-cache/kde-base/libkexiv2-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/libkexiv2-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7355bdaff46c58dc1aa9c1502aae7455
diff --git a/metadata/md5-cache/kde-base/libkexiv2-4.8.4 b/metadata/md5-cache/kde-base/libkexiv2-4.8.4
index 3ce525edf203..e2bd4abd62b8 100644
--- a/metadata/md5-cache/kde-base/libkexiv2-4.8.4
+++ b/metadata/md5-cache/kde-base/libkexiv2-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.20 media-libs/lcms:0 virtual/jpeg >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/libkexiv2-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5da86f203ac4fc93c5499272ef64c674
diff --git a/metadata/md5-cache/kde-base/libkipi-4.7.4 b/metadata/md5-cache/kde-base/libkipi-4.7.4
index 6c8c839399c0..0e557d5c3171 100644
--- a/metadata/md5-cache/kde-base/libkipi-4.7.4
+++ b/metadata/md5-cache/kde-base/libkipi-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/libkipi-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c0a435db090dc1c603e47c8bc67eb5e2
diff --git a/metadata/md5-cache/kde-base/libkipi-4.8.3 b/metadata/md5-cache/kde-base/libkipi-4.8.3
index d1ef995f6926..d89194fdcc69 100644
--- a/metadata/md5-cache/kde-base/libkipi-4.8.3
+++ b/metadata/md5-cache/kde-base/libkipi-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/libkipi-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4c0bb9bf20aab38f7c1f58dc81102927
diff --git a/metadata/md5-cache/kde-base/libkipi-4.8.4 b/metadata/md5-cache/kde-base/libkipi-4.8.4
index 3a954ca81603..8f7755b97799 100644
--- a/metadata/md5-cache/kde-base/libkipi-4.8.4
+++ b/metadata/md5-cache/kde-base/libkipi-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/libkipi-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=60dcf8bdeb06a52eaf2fa45c385b4a51
diff --git a/metadata/md5-cache/kde-base/libkleo-4.4.11.1 b/metadata/md5-cache/kde-base/libkleo-4.4.11.1
index 0901ef36d96b..bad555aa9998 100644
--- a/metadata/md5-cache/kde-base/libkleo-4.4.11.1
+++ b/metadata/md5-cache/kde-base/libkleo-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=kde-base/kdepimlibs-4.6:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=57a3c0bfc8d4a44457ed1d77ba643829
diff --git a/metadata/md5-cache/kde-base/libkmahjongg-4.7.4 b/metadata/md5-cache/kde-base/libkmahjongg-4.7.4
index e55734153a1c..2e3fcf34caa6 100644
--- a/metadata/md5-cache/kde-base/libkmahjongg-4.7.4
+++ b/metadata/md5-cache/kde-base/libkmahjongg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2d85f0339d569fcea91b21d21c07fad8
diff --git a/metadata/md5-cache/kde-base/libkmahjongg-4.8.3 b/metadata/md5-cache/kde-base/libkmahjongg-4.8.3
index 126da69f647a..cba0deccf709 100644
--- a/metadata/md5-cache/kde-base/libkmahjongg-4.8.3
+++ b/metadata/md5-cache/kde-base/libkmahjongg-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ef9630c075de8b910abca09be74ca04a
diff --git a/metadata/md5-cache/kde-base/libkmahjongg-4.8.4 b/metadata/md5-cache/kde-base/libkmahjongg-4.8.4
index bd0119532d91..56ea71fae3e7 100644
--- a/metadata/md5-cache/kde-base/libkmahjongg-4.8.4
+++ b/metadata/md5-cache/kde-base/libkmahjongg-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1b862866f8d6efc2e115d566e5da603d
diff --git a/metadata/md5-cache/kde-base/libkonq-4.7.4 b/metadata/md5-cache/kde-base/libkonq-4.7.4
index ab414d8bfc12..ae9eabf46bcb 100644
--- a/metadata/md5-cache/kde-base/libkonq-4.7.4
+++ b/metadata/md5-cache/kde-base/libkonq-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=df3ea468e6275fec1de6eb3287c52839
diff --git a/metadata/md5-cache/kde-base/libkonq-4.8.3 b/metadata/md5-cache/kde-base/libkonq-4.8.3
index e44d175370af..6e249aa714c4 100644
--- a/metadata/md5-cache/kde-base/libkonq-4.8.3
+++ b/metadata/md5-cache/kde-base/libkonq-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9844cbf271f658a71f8cd36ea740fc73
diff --git a/metadata/md5-cache/kde-base/libkonq-4.8.4 b/metadata/md5-cache/kde-base/libkonq-4.8.4
index b66df9bfd43a..46e290845dba 100644
--- a/metadata/md5-cache/kde-base/libkonq-4.8.4
+++ b/metadata/md5-cache/kde-base/libkonq-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f11a9c135d9e51fccd92134c188f206c
diff --git a/metadata/md5-cache/kde-base/libkpgp-4.4.11.1 b/metadata/md5-cache/kde-base/libkpgp-4.4.11.1
index e5a3f77e2912..4c5337b8a6a3 100644
--- a/metadata/md5-cache/kde-base/libkpgp-4.4.11.1
+++ b/metadata/md5-cache/kde-base/libkpgp-4.4.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4.11.1:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4.11.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdepim-4.4.11.1/src/kdepim-4.4.11.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=858b392dda73c5ad3ea44aed6e624726
diff --git a/metadata/md5-cache/kde-base/libksane-4.7.4 b/metadata/md5-cache/kde-base/libksane-4.7.4
index 48a1e318d125..43f976533856 100644
--- a/metadata/md5-cache/kde-base/libksane-4.7.4
+++ b/metadata/md5-cache/kde-base/libksane-4.7.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-gfx/sane-backends >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/libksane-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=795195edb9c4ce6d7db80a28ec13da56
diff --git a/metadata/md5-cache/kde-base/libksane-4.8.3 b/metadata/md5-cache/kde-base/libksane-4.8.3
index 180df55d1e12..9b4c377847ae 100644
--- a/metadata/md5-cache/kde-base/libksane-4.8.3
+++ b/metadata/md5-cache/kde-base/libksane-4.8.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-gfx/sane-backends >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/libksane-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e50e9ea42c12c58854b92b261fc4e410
diff --git a/metadata/md5-cache/kde-base/libksane-4.8.4 b/metadata/md5-cache/kde-base/libksane-4.8.4
index 06a0e4ba54c3..62098b30f324 100644
--- a/metadata/md5-cache/kde-base/libksane-4.8.4
+++ b/metadata/md5-cache/kde-base/libksane-4.8.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-gfx/sane-backends >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/libksane-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=65d6d3998675a815553742c75299599a
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r1 b/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r1
index a4c1d82191db..7f3ef6d119f3 100644
--- a/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9611bc5ed7fef77484665091f440ca89
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r2 b/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r2
index e8d82482cd2c..ff0be92fc39c 100644
--- a/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r2
+++ b/metadata/md5-cache/kde-base/libkworkspace-4.7.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a84fcd699edd630c39340bfbf6e74a09
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.8.3 b/metadata/md5-cache/kde-base/libkworkspace-4.8.3
index aa5c967da03d..5f2d8f9c439c 100644
--- a/metadata/md5-cache/kde-base/libkworkspace-4.8.3
+++ b/metadata/md5-cache/kde-base/libkworkspace-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2104e8b6f7895a6817a9e4b0fddbbbee
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.8.4 b/metadata/md5-cache/kde-base/libkworkspace-4.8.4
index 9c8a5749cc61..ae4e3c359703 100644
--- a/metadata/md5-cache/kde-base/libkworkspace-4.8.4
+++ b/metadata/md5-cache/kde-base/libkworkspace-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/libXcomposite >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b6b94b0d95b938d1eb00927afbab2f70
diff --git a/metadata/md5-cache/kde-base/liboxygenstyle-4.7.4 b/metadata/md5-cache/kde-base/liboxygenstyle-4.7.4
index 20d196505376..dfeadbb85d11 100644
--- a/metadata/md5-cache/kde-base/liboxygenstyle-4.7.4
+++ b/metadata/md5-cache/kde-base/liboxygenstyle-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5dd2d61b707a5abc161b609028eb91fb
diff --git a/metadata/md5-cache/kde-base/liboxygenstyle-4.8.3 b/metadata/md5-cache/kde-base/liboxygenstyle-4.8.3
index f2fd0c98c16b..7fbdee182d50 100644
--- a/metadata/md5-cache/kde-base/liboxygenstyle-4.8.3
+++ b/metadata/md5-cache/kde-base/liboxygenstyle-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96de4cd350d2045e92f66be9531e7bb6
diff --git a/metadata/md5-cache/kde-base/liboxygenstyle-4.8.4 b/metadata/md5-cache/kde-base/liboxygenstyle-4.8.4
index 500b4e23df86..021c0733ffd5 100644
--- a/metadata/md5-cache/kde-base/liboxygenstyle-4.8.4
+++ b/metadata/md5-cache/kde-base/liboxygenstyle-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a8cb4ee48357437a0ac924ecef407e8
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.7.4 b/metadata/md5-cache/kde-base/libplasmaclock-4.7.4
index 0c02f02fa4b8..300bc9934c0f 100644
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.7.4
+++ b/metadata/md5-cache/kde-base/libplasmaclock-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.7.4:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.7.4:4[aqua=] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=88cc8f6ae60f2508f8f98a9ecd795094
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.8.3 b/metadata/md5-cache/kde-base/libplasmaclock-4.8.3
index a249de4716d0..328f6ef45e4b 100644
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.8.3
+++ b/metadata/md5-cache/kde-base/libplasmaclock-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.8.3:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.8.3:4[aqua=] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3b7a10f14de9e854bc0c82233ea6fabd
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.8.4 b/metadata/md5-cache/kde-base/libplasmaclock-4.8.4
index 247ccddc8009..b51790beeb09 100644
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.8.4
+++ b/metadata/md5-cache/kde-base/libplasmaclock-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.8.4:4[aqua=] holidays? ( >=kde-base/kdepimlibs-4.8.4:4[aqua=] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=930dd46969cd02b1e3335a852529445b
diff --git a/metadata/md5-cache/kde-base/libplasmagenericshell-4.7.4 b/metadata/md5-cache/kde-base/libplasmagenericshell-4.7.4
index d9be3f65400d..de785845a2f3 100644
--- a/metadata/md5-cache/kde-base/libplasmagenericshell-4.7.4
+++ b/metadata/md5-cache/kde-base/libplasmagenericshell-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8110467639629d39589250bda63b179
diff --git a/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.3 b/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.3
index 1636757fc4a4..24a4191c0d87 100644
--- a/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.3
+++ b/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fe699f6077715f8b98cb34cfcc079f52
diff --git a/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.4 b/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.4
index cfce5155bd7c..4fd7f62b419a 100644
--- a/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.4
+++ b/metadata/md5-cache/kde-base/libplasmagenericshell-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c7794f2a689b138b549d1f6b5f5138f4
diff --git a/metadata/md5-cache/kde-base/libtaskmanager-4.7.4 b/metadata/md5-cache/kde-base/libtaskmanager-4.7.4
index 736fb29ac67d..158e055a6378 100644
--- a/metadata/md5-cache/kde-base/libtaskmanager-4.7.4
+++ b/metadata/md5-cache/kde-base/libtaskmanager-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=93b9d7c96da62c9cfabda3f0c7fc8978
diff --git a/metadata/md5-cache/kde-base/libtaskmanager-4.8.3 b/metadata/md5-cache/kde-base/libtaskmanager-4.8.3
index 1650bfbba42b..0bb58e45ae60 100644
--- a/metadata/md5-cache/kde-base/libtaskmanager-4.8.3
+++ b/metadata/md5-cache/kde-base/libtaskmanager-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.3:4[aqua=] >=kde-base/kephal-4.8.3:4[aqua=] >=kde-base/ksysguard-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=36b43b88705b1f279120e6855dbbedcc
diff --git a/metadata/md5-cache/kde-base/libtaskmanager-4.8.4 b/metadata/md5-cache/kde-base/libtaskmanager-4.8.4
index 25e0e20fbe47..a21896bc15ad 100644
--- a/metadata/md5-cache/kde-base/libtaskmanager-4.8.4
+++ b/metadata/md5-cache/kde-base/libtaskmanager-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.4:4[aqua=] >=kde-base/kephal-4.8.4:4[aqua=] >=kde-base/ksysguard-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cd4f67001a25deb7f206176f1c961ce2
diff --git a/metadata/md5-cache/kde-base/lokalize-4.7.4 b/metadata/md5-cache/kde-base/lokalize-4.7.4
index 1c7bc4d51773..45f1b11f791e 100644
--- a/metadata/md5-cache/kde-base/lokalize-4.7.4
+++ b/metadata/md5-cache/kde-base/lokalize-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/hunspell-1.2.8 >=x11-libs/qt-sql-4.5.0:4[sqlite] semantic-desktop? ( dev-libs/soprano ) >=kde-base/kdesdk-strigi-analyzer-4.7.4:4[aqua=] >=kde-base/krosspython-4.7.4:4[aqua=] >=kde-base/pykde4-4.7.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c7c70501523e9830816821e69a134d4b
diff --git a/metadata/md5-cache/kde-base/lokalize-4.8.3 b/metadata/md5-cache/kde-base/lokalize-4.8.3
index f31b97e029bd..ffd85efd75d8 100644
--- a/metadata/md5-cache/kde-base/lokalize-4.8.3
+++ b/metadata/md5-cache/kde-base/lokalize-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/hunspell-1.2.8 >=x11-libs/qt-sql-4.5.0:4[sqlite] semantic-desktop? ( dev-libs/soprano ) >=kde-base/kdesdk-strigi-analyzer-4.8.3:4[aqua=] >=kde-base/krosspython-4.8.3:4[aqua=] >=kde-base/pykde4-4.8.3:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f9c7a87936167e9db4635212567ce874
diff --git a/metadata/md5-cache/kde-base/lokalize-4.8.4 b/metadata/md5-cache/kde-base/lokalize-4.8.4
index 88bf0ff59354..4d5d35c6f7a0 100644
--- a/metadata/md5-cache/kde-base/lokalize-4.8.4
+++ b/metadata/md5-cache/kde-base/lokalize-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/hunspell-1.2.8 >=x11-libs/qt-sql-4.5.0:4[sqlite] semantic-desktop? ( >=dev-libs/soprano-2.7.6 ) >=kde-base/kdesdk-strigi-analyzer-4.8.4:4[aqua=] >=kde-base/krosspython-4.8.4:4[aqua=] >=kde-base/pykde4-4.8.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=771ff8e3d82e72c0f8414f80afb48fab
diff --git a/metadata/md5-cache/kde-base/lskat-4.7.4 b/metadata/md5-cache/kde-base/lskat-4.7.4
index 15d16dc4ba35..53e467555c8b 100644
--- a/metadata/md5-cache/kde-base/lskat-4.7.4
+++ b/metadata/md5-cache/kde-base/lskat-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=730ab4957bc6300f7cea2217a1f31425
diff --git a/metadata/md5-cache/kde-base/lskat-4.8.3 b/metadata/md5-cache/kde-base/lskat-4.8.3
index 445c9420e849..2a4748a4267e 100644
--- a/metadata/md5-cache/kde-base/lskat-4.8.3
+++ b/metadata/md5-cache/kde-base/lskat-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ced47433ef97784b531b8e0c3df061c
diff --git a/metadata/md5-cache/kde-base/lskat-4.8.4 b/metadata/md5-cache/kde-base/lskat-4.8.4
index 8f98f90fbab2..936211e5838e 100644
--- a/metadata/md5-cache/kde-base/lskat-4.8.4
+++ b/metadata/md5-cache/kde-base/lskat-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] selinux? ( sec-policy/selinux-games ) >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5798347fdf50507548a90a85d7bf5af4
diff --git a/metadata/md5-cache/kde-base/marble-4.7.4 b/metadata/md5-cache/kde-base/marble-4.7.4
index e0808c8e42a6..da65fdd28f59 100644
--- a/metadata/md5-cache/kde-base/marble-4.7.4
+++ b/metadata/md5-cache/kde-base/marble-4.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=plasma? ( kde )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/marble-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9992a23665b83a4c2b13bda748412cae
diff --git a/metadata/md5-cache/kde-base/marble-4.8.3 b/metadata/md5-cache/kde-base/marble-4.8.3
index ff7d213162dc..6f9beb070b24 100644
--- a/metadata/md5-cache/kde-base/marble-4.8.3
+++ b/metadata/md5-cache/kde-base/marble-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( >=dev-python/PyQt4-4
 REQUIRED_USE=plasma? ( kde ) python? ( kde )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/marble-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=196807570b4a22eb80a1d5f571a63443
diff --git a/metadata/md5-cache/kde-base/marble-4.8.4 b/metadata/md5-cache/kde-base/marble-4.8.4
index 00334c0d439b..fa6294c57661 100644
--- a/metadata/md5-cache/kde-base/marble-4.8.4
+++ b/metadata/md5-cache/kde-base/marble-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( >=dev-python/PyQt4-4
 REQUIRED_USE=plasma? ( kde ) python? ( kde )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/marble-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f8da40954e7b7b63a259f4d28031da00
diff --git a/metadata/md5-cache/kde-base/mplayerthumbs-4.7.4 b/metadata/md5-cache/kde-base/mplayerthumbs-4.7.4
index 06a78d2dfd84..e4f740d1b1c1 100644
--- a/metadata/md5-cache/kde-base/mplayerthumbs-4.7.4
+++ b/metadata/md5-cache/kde-base/mplayerthumbs-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-base/dolphin-4.7.4:4[aqua=] >=kde-base/konqueror-4.7.4:4[aqua=] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdemultimedia-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f4a7293595ea7430ac0ff0ae0f5e6273
diff --git a/metadata/md5-cache/kde-base/mplayerthumbs-4.8.3 b/metadata/md5-cache/kde-base/mplayerthumbs-4.8.3
index 443db019ae15..bba31e38d8bc 100644
--- a/metadata/md5-cache/kde-base/mplayerthumbs-4.8.3
+++ b/metadata/md5-cache/kde-base/mplayerthumbs-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-base/dolphin-4.8.3:4[aqua=] >=kde-base/konqueror-4.8.3:4[aqua=] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdemultimedia-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3c6792489b8808b8428fe4c3d4ce7767
diff --git a/metadata/md5-cache/kde-base/mplayerthumbs-4.8.4 b/metadata/md5-cache/kde-base/mplayerthumbs-4.8.4
index d0ae5188cdc7..50851aa14afe 100644
--- a/metadata/md5-cache/kde-base/mplayerthumbs-4.8.4
+++ b/metadata/md5-cache/kde-base/mplayerthumbs-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-base/dolphin-4.8.4:4[aqua=] >=kde-base/konqueror-4.8.4:4[aqua=] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdemultimedia-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8b158cb8ab809f96db349d67a01d05e2
diff --git a/metadata/md5-cache/kde-base/nepomuk-4.7.4 b/metadata/md5-cache/kde-base/nepomuk-4.7.4
index 090b74e53697..0f51190bf8fb 100644
--- a/metadata/md5-cache/kde-base/nepomuk-4.7.4
+++ b/metadata/md5-cache/kde-base/nepomuk-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-misc/strigi-0.6.3[dbus,qt4] >=dev-libs/soprano-2.6.51[dbus,raptor,
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=daa02ba6237af400b87bd892dd72e376
diff --git a/metadata/md5-cache/kde-base/nepomuk-4.8.3 b/metadata/md5-cache/kde-base/nepomuk-4.8.3
index 544fb888a586..58b86c128fcb 100644
--- a/metadata/md5-cache/kde-base/nepomuk-4.8.3
+++ b/metadata/md5-cache/kde-base/nepomuk-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-misc/strigi-0.7.7[dbus,qt4] >=dev-libs/soprano-2.7.3[dbus,raptor,r
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=645c56ea07d30ba7f2453428fa083afd
diff --git a/metadata/md5-cache/kde-base/nepomuk-4.8.4 b/metadata/md5-cache/kde-base/nepomuk-4.8.4
index ba8e26528291..e9e2e11594a8 100644
--- a/metadata/md5-cache/kde-base/nepomuk-4.8.4
+++ b/metadata/md5-cache/kde-base/nepomuk-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-misc/strigi-0.7.7[dbus,qt4] >=dev-libs/soprano-2.7.6[dbus,raptor,r
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0d87a35d855ac0d6db6b49abd5e9eb67
diff --git a/metadata/md5-cache/kde-base/nsplugins-4.7.4 b/metadata/md5-cache/kde-base/nsplugins-4.7.4
index 8215b005ae50..a50724ea2951 100644
--- a/metadata/md5-cache/kde-base/nsplugins-4.7.4
+++ b/metadata/md5-cache/kde-base/nsplugins-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-base/konqueror-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ba83a1a60449e9afe5526330d81318b
diff --git a/metadata/md5-cache/kde-base/nsplugins-4.8.3 b/metadata/md5-cache/kde-base/nsplugins-4.8.3
index 79083ad972f9..2d2d17f01339 100644
--- a/metadata/md5-cache/kde-base/nsplugins-4.8.3
+++ b/metadata/md5-cache/kde-base/nsplugins-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-base/konqueror-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=49d8cb56bb507a110681e3cde6fdabbd
diff --git a/metadata/md5-cache/kde-base/nsplugins-4.8.4 b/metadata/md5-cache/kde-base/nsplugins-4.8.4
index eb6ada44cf87..15269cb1441c 100644
--- a/metadata/md5-cache/kde-base/nsplugins-4.8.4
+++ b/metadata/md5-cache/kde-base/nsplugins-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-base/konqueror-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7be1e2f80708c88078d7311a2518a840
diff --git a/metadata/md5-cache/kde-base/okteta-4.7.4 b/metadata/md5-cache/kde-base/okteta-4.7.4
index f1d109c6c3ec..1136e0586e9b 100644
--- a/metadata/md5-cache/kde-base/okteta-4.7.4
+++ b/metadata/md5-cache/kde-base/okteta-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=02927af826109fb2adc5d41deda304d5
diff --git a/metadata/md5-cache/kde-base/okteta-4.8.3 b/metadata/md5-cache/kde-base/okteta-4.8.3
index 3c21cf685bf4..aa9ff15acafa 100644
--- a/metadata/md5-cache/kde-base/okteta-4.8.3
+++ b/metadata/md5-cache/kde-base/okteta-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0c7228bc45648eb05199201b5cd150ad
diff --git a/metadata/md5-cache/kde-base/okteta-4.8.4 b/metadata/md5-cache/kde-base/okteta-4.8.4
index 3e29a2f57f19..59845996ed7a 100644
--- a/metadata/md5-cache/kde-base/okteta-4.8.4
+++ b/metadata/md5-cache/kde-base/okteta-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=02944b1c60d7a9f46ec83e81f47b5731
diff --git a/metadata/md5-cache/kde-base/okular-4.7.4 b/metadata/md5-cache/kde-base/okular-4.7.4
index 15548314b5d1..c85513d55212 100644
--- a/metadata/md5-cache/kde-base/okular-4.7.4
+++ b/metadata/md5-cache/kde-base/okular-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] ) postscript? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/okular-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=967c4dadc3a37832066873a647f81af2
diff --git a/metadata/md5-cache/kde-base/okular-4.8.3 b/metadata/md5-cache/kde-base/okular-4.8.3
index ef4bcc82c6d6..d70a6f5cf2d8 100644
--- a/metadata/md5-cache/kde-base/okular-4.8.3
+++ b/metadata/md5-cache/kde-base/okular-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] ) postscript? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/okular-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7b79d43e5d42071959e41776e4125b1e
diff --git a/metadata/md5-cache/kde-base/okular-4.8.4 b/metadata/md5-cache/kde-base/okular-4.8.4
index d32abac00f03..944bb4a90093 100644
--- a/metadata/md5-cache/kde-base/okular-4.8.4
+++ b/metadata/md5-cache/kde-base/okular-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2 ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] ) postscript? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/okular-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=16370d6bdf48270996b3af29610d3595
diff --git a/metadata/md5-cache/kde-base/oxygen-icons-4.7.4 b/metadata/md5-cache/kde-base/oxygen-icons-4.7.4
index a84194f5b9d8..32e1984a6841 100644
--- a/metadata/md5-cache/kde-base/oxygen-icons-4.7.4
+++ b/metadata/md5-cache/kde-base/oxygen-icons-4.7.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=4
 SRC_URI=!bindist? ( http://dev.gentoo.org/~alexxy/distfiles/oxygen-icons-4.7.4.tar.xz ) bindist? ( mirror://kde/stable/4.7.4/src/oxygen-icons-4.7.4.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3741ad5abe75ba88a4306d44a33e9180
diff --git a/metadata/md5-cache/kde-base/oxygen-icons-4.8.3 b/metadata/md5-cache/kde-base/oxygen-icons-4.8.3
index 82c08af5e676..50cde8756131 100644
--- a/metadata/md5-cache/kde-base/oxygen-icons-4.8.3
+++ b/metadata/md5-cache/kde-base/oxygen-icons-4.8.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linu
 LICENSE=LGPL-3
 SLOT=4
 SRC_URI=!bindist? ( http://dev.gentoo.org/~johu/distfiles/oxygen-icons-4.8.3.repacked.tar.xz ) bindist? ( mirror://kde/stable/4.8.3/src/oxygen-icons-4.8.3.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=37cf3d5dcda20b39c967f405feb8c2c6
diff --git a/metadata/md5-cache/kde-base/oxygen-icons-4.8.4 b/metadata/md5-cache/kde-base/oxygen-icons-4.8.4
index 476a7da391b7..cb05ff3040fe 100644
--- a/metadata/md5-cache/kde-base/oxygen-icons-4.8.4
+++ b/metadata/md5-cache/kde-base/oxygen-icons-4.8.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-li
 LICENSE=LGPL-3
 SLOT=4
 SRC_URI=!bindist? ( http://dev.gentoo.org/~dilfridge/distfiles/oxygen-icons-4.8.1.repacked.tar.xz ) bindist? ( mirror://kde/stable/4.8.1/src/oxygen-icons-4.8.1.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d83a5ac8be76f584b4c9af57f22cf5d0
diff --git a/metadata/md5-cache/kde-base/palapeli-4.7.4 b/metadata/md5-cache/kde-base/palapeli-4.7.4
index a1fc18b7f29b..257d8a0a5900 100644
--- a/metadata/md5-cache/kde-base/palapeli-4.7.4
+++ b/metadata/md5-cache/kde-base/palapeli-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=kde-base/libkdegames-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegames-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=62884a27e12b699b1b59729da5ad0dbe
diff --git a/metadata/md5-cache/kde-base/palapeli-4.8.3 b/metadata/md5-cache/kde-base/palapeli-4.8.3
index c0313809b38e..c4e5ee6353a7 100644
--- a/metadata/md5-cache/kde-base/palapeli-4.8.3
+++ b/metadata/md5-cache/kde-base/palapeli-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=kde-base/libkdegames-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegames-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ee3c5a2b5200bcfc15b0608f301978ec
diff --git a/metadata/md5-cache/kde-base/palapeli-4.8.4 b/metadata/md5-cache/kde-base/palapeli-4.8.4
index f6514cc213aa..5d76dc27c471 100644
--- a/metadata/md5-cache/kde-base/palapeli-4.8.4
+++ b/metadata/md5-cache/kde-base/palapeli-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=kde-base/libkdegames-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegames-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5b06065412471eced8208bb16b40facb
diff --git a/metadata/md5-cache/kde-base/parley-4.7.4 b/metadata/md5-cache/kde-base/parley-4.7.4
index d0952c2c3fdd..8c32b2c4f68b 100644
--- a/metadata/md5-cache/kde-base/parley-4.7.4
+++ b/metadata/md5-cache/kde-base/parley-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/parley-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5fac8a29c5859db5a6dd4f44d719faff
diff --git a/metadata/md5-cache/kde-base/parley-4.8.3 b/metadata/md5-cache/kde-base/parley-4.8.3
index 593f93bbfac0..c517f2bdcb75 100644
--- a/metadata/md5-cache/kde-base/parley-4.8.3
+++ b/metadata/md5-cache/kde-base/parley-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/parley-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ac0360fc2eea6f1c05a37803746c7dd2
diff --git a/metadata/md5-cache/kde-base/parley-4.8.4 b/metadata/md5-cache/kde-base/parley-4.8.4
index 47761c368c11..d3849afa2f33 100644
--- a/metadata/md5-cache/kde-base/parley-4.8.4
+++ b/metadata/md5-cache/kde-base/parley-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/parley-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ebfd0449f850cd2eb6b2558010039060
diff --git a/metadata/md5-cache/kde-base/perlkde-4.7.4 b/metadata/md5-cache/kde-base/perlkde-4.7.4
index 530105ab4f15..b203e75e07fb 100644
--- a/metadata/md5-cache/kde-base/perlkde-4.7.4
+++ b/metadata/md5-cache/kde-base/perlkde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.7.4:4[aqua=] >=kde-base/smokekde-4.7.4:4[aqua=,akonadi?,attica?,kate?,okular?,semantic-desktop=] semantic-desktop? ( >=dev-libs/soprano-2.6.51 ) !kde-base/kdebindings-perl:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/perlkde-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=836258ba724ddb32a071c238ab7ae7fc
diff --git a/metadata/md5-cache/kde-base/perlkde-4.8.3 b/metadata/md5-cache/kde-base/perlkde-4.8.3
index 1ee258041828..51ef46ccefd1 100644
--- a/metadata/md5-cache/kde-base/perlkde-4.8.3
+++ b/metadata/md5-cache/kde-base/perlkde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.8.3:4[aqua=] >=kde-base/smokekde-4.8.3:4[aqua=,attica?,kate?,okular?,semantic-desktop=] semantic-desktop? ( >=dev-libs/soprano-2.6.51 ) !kde-base/kdebindings-perl:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/perlkde-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bad3551825a0158cdc82292ccb4d1d8c
diff --git a/metadata/md5-cache/kde-base/perlkde-4.8.4 b/metadata/md5-cache/kde-base/perlkde-4.8.4
index 62dcce79cf5d..76cf1e0e05da 100644
--- a/metadata/md5-cache/kde-base/perlkde-4.8.4
+++ b/metadata/md5-cache/kde-base/perlkde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.8.4:4[aqua=] >=kde-base/smokekde-4.8.4:4[aqua=,attica?,kate?,okular?,semantic-desktop=] semantic-desktop? ( >=dev-libs/soprano-2.7.6 ) !kde-base/kdebindings-perl:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/perlkde-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51180c3a49c95fbc523a8462fba5edd9
diff --git a/metadata/md5-cache/kde-base/perlqt-4.7.4 b/metadata/md5-cache/kde-base/perlqt-4.7.4
index 955e616fd530..f3165127d24e 100644
--- a/metadata/md5-cache/kde-base/perlqt-4.7.4
+++ b/metadata/md5-cache/kde-base/perlqt-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.7.4:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] !kde-base/kdebindings-perl:4 declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/perlqt-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=304c249cdf2852b09cb3ad071f80c24a
diff --git a/metadata/md5-cache/kde-base/perlqt-4.8.3 b/metadata/md5-cache/kde-base/perlqt-4.8.3
index 229a16fb0722..78a96e1afb56 100644
--- a/metadata/md5-cache/kde-base/perlqt-4.8.3
+++ b/metadata/md5-cache/kde-base/perlqt-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.8.3:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] !kde-base/kdebindings-perl:4 declarative? ( >=x11-libs/qt-declarative-4.7.4:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.4:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.4:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/perlqt-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c2dad838db1800118f8ddc7e6e6acdd8
diff --git a/metadata/md5-cache/kde-base/perlqt-4.8.4 b/metadata/md5-cache/kde-base/perlqt-4.8.4
index 2e5942df0e0f..ad87d5537c8f 100644
--- a/metadata/md5-cache/kde-base/perlqt-4.8.4
+++ b/metadata/md5-cache/kde-base/perlqt-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.8.4:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] !kde-base/kdebindings-perl:4 declarative? ( >=x11-libs/qt-declarative-4.7.4:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.4:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.4:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/perlqt-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1b167afa4ad4a3e9b1a362796b44ffa9
diff --git a/metadata/md5-cache/kde-base/phonon-kde-4.7.4 b/metadata/md5-cache/kde-base/phonon-kde-4.7.4
index efed92962a92..1e7581555df4 100644
--- a/metadata/md5-cache/kde-base/phonon-kde-4.7.4
+++ b/metadata/md5-cache/kde-base/phonon-kde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d319628ebabc6fbfbaa638401e84d7e8
diff --git a/metadata/md5-cache/kde-base/phonon-kde-4.8.3 b/metadata/md5-cache/kde-base/phonon-kde-4.8.3
index 0ff704d6dd85..323c14cd0a4a 100644
--- a/metadata/md5-cache/kde-base/phonon-kde-4.8.3
+++ b/metadata/md5-cache/kde-base/phonon-kde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d64249825530ae8518ed39421d27023
diff --git a/metadata/md5-cache/kde-base/phonon-kde-4.8.4 b/metadata/md5-cache/kde-base/phonon-kde-4.8.4
index 1cf920bbc97c..cd5bdd5ba749 100644
--- a/metadata/md5-cache/kde-base/phonon-kde-4.8.4
+++ b/metadata/md5-cache/kde-base/phonon-kde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=48c6489ce1e5f705684aa540bf1a0ecb
diff --git a/metadata/md5-cache/kde-base/plasma-apps-4.7.4 b/metadata/md5-cache/kde-base/plasma-apps-4.7.4
index 069352905cc4..531bd03176f7 100644
--- a/metadata/md5-cache/kde-base/plasma-apps-4.7.4
+++ b/metadata/md5-cache/kde-base/plasma-apps-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-baseapps-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=32bb0ee1bd4be82b5614401870cd4dc1
diff --git a/metadata/md5-cache/kde-base/plasma-apps-4.8.3 b/metadata/md5-cache/kde-base/plasma-apps-4.8.3
index 2e612b5dcf94..279aca370769 100644
--- a/metadata/md5-cache/kde-base/plasma-apps-4.8.3
+++ b/metadata/md5-cache/kde-base/plasma-apps-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-baseapps-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=da12a03ef83634abec3e9725570f11c6
diff --git a/metadata/md5-cache/kde-base/plasma-apps-4.8.4 b/metadata/md5-cache/kde-base/plasma-apps-4.8.4
index 110395cd26df..aa75f8978117 100644
--- a/metadata/md5-cache/kde-base/plasma-apps-4.8.4
+++ b/metadata/md5-cache/kde-base/plasma-apps-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-baseapps-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a8f854a5ba22f7eda20124ac30117afa
diff --git a/metadata/md5-cache/kde-base/plasma-runtime-4.7.4 b/metadata/md5-cache/kde-base/plasma-runtime-4.7.4
index f1105e4ee9e7..889de153c05b 100644
--- a/metadata/md5-cache/kde-base/plasma-runtime-4.7.4
+++ b/metadata/md5-cache/kde-base/plasma-runtime-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/plasma-workspace-4.4.50:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] >=x11-libs/qt-declarative-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4b00f8a643408d913b5b5b41a9f82e3d
diff --git a/metadata/md5-cache/kde-base/plasma-runtime-4.8.3 b/metadata/md5-cache/kde-base/plasma-runtime-4.8.3
index 9bf84e2c889c..9f89a2e58e63 100644
--- a/metadata/md5-cache/kde-base/plasma-runtime-4.8.3
+++ b/metadata/md5-cache/kde-base/plasma-runtime-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/plasma-workspace-4.4.50:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] >=x11-libs/qt-declarative-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3d0a59c287f4767fc510d61ea8dff5fa
diff --git a/metadata/md5-cache/kde-base/plasma-runtime-4.8.4 b/metadata/md5-cache/kde-base/plasma-runtime-4.8.4
index d48ca832ef80..951f3c7f8dca 100644
--- a/metadata/md5-cache/kde-base/plasma-runtime-4.8.4
+++ b/metadata/md5-cache/kde-base/plasma-runtime-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/plasma-workspace-4.4.50:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] >=x11-libs/qt-declarative-4.7.4:4 dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=16cc4daded1fd97f171292f13f04ecd8
diff --git a/metadata/md5-cache/kde-base/plasma-workspace-4.7.4 b/metadata/md5-cache/kde-base/plasma-workspace-4.7.4
index 31490c6a9510..76f2f4e12c5d 100644
--- a/metadata/md5-cache/kde-base/plasma-workspace-4.7.4
+++ b/metadata/md5-cache/kde-base/plasma-workspace-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.7.4:4[aqua=] >=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.7.4:4[aqua=] >=kde-base/ksysguard-4.7.4:4[aqua=] >=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/libplasmagenericshell-4.7.4:4[aqua=] >=kde-base/libtaskmanager-4.7.4:4[aqua=] >=kde-base/solid-4.7.4:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) gps? ( >=sci-geosciences/gpsd-2.37 ) python? ( >=dev-python/PyQt4-4.4.0[X] >=dev-python/sip-4.7.1 >=kde-base/pykde4-4.7.4:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.7.4:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.7.4:4[aqua=,-holidays] ) xinerama? ( x11-libs/libXinerama ) >=kde-base/activitymanager-4.7.4:4[aqua=] >=kde-base/plasma-runtime-4.7.4:4[aqua=] python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=369bb70623772e8b1b5525411690b775
diff --git a/metadata/md5-cache/kde-base/plasma-workspace-4.8.3 b/metadata/md5-cache/kde-base/plasma-workspace-4.8.3
index 740f5f175e93..d912c57163c8 100644
--- a/metadata/md5-cache/kde-base/plasma-workspace-4.8.3
+++ b/metadata/md5-cache/kde-base/plasma-workspace-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.3:4[aqua=] >=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.8.3:4[aqua=] >=kde-base/ksysguard-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/libplasmagenericshell-4.8.3:4[aqua=] >=kde-base/libtaskmanager-4.8.3:4[aqua=] >=kde-base/solid-4.8.3:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) gps? ( >=sci-geosciences/gpsd-2.37 ) python? ( >=dev-python/PyQt4-4.4.0[X] >=dev-python/sip-4.7.1 >=kde-base/pykde4-4.8.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.8.3:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.8.3:4[aqua=,-holidays] ) >=kde-base/plasma-runtime-4.8.3:4[aqua=] python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b19b5af5c93cc1a268f75911cb5e2a58
diff --git a/metadata/md5-cache/kde-base/plasma-workspace-4.8.4 b/metadata/md5-cache/kde-base/plasma-workspace-4.8.4
index 02d0717c688c..9cb2e66e694c 100644
--- a/metadata/md5-cache/kde-base/plasma-workspace-4.8.4
+++ b/metadata/md5-cache/kde-base/plasma-workspace-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.4:4[aqua=] >=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/kephal-4.8.4:4[aqua=] >=kde-base/ksysguard-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/libplasmagenericshell-4.8.4:4[aqua=] >=kde-base/libtaskmanager-4.8.4:4[aqua=] >=kde-base/solid-4.8.4:4[aqua=] x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) gps? ( >=sci-geosciences/gpsd-2.37 ) python? ( >=dev-python/PyQt4-4.4.0[X] >=dev-python/sip-4.7.1 >=kde-base/pykde4-4.8.4:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) rss? ( >=kde-base/kdepimlibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/libplasmaclock-4.8.4:4[aqua=,holidays] ) !rss? ( >=kde-base/libplasmaclock-4.8.4:4[aqua=,-holidays] ) >=kde-base/plasma-runtime-4.8.4:4[aqua=] python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cd5414ee0db35513d6b7cdad4cd5d3ee
diff --git a/metadata/md5-cache/kde-base/powerdevil-4.7.4 b/metadata/md5-cache/kde-base/powerdevil-4.7.4
index 1b753ae9e3b4..7c095d01094e 100644
--- a/metadata/md5-cache/kde-base/powerdevil-4.7.4
+++ b/metadata/md5-cache/kde-base/powerdevil-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.7.4:4[aqua=] >=kde-base/solid-4.7.4:4[aqua=] pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1bd85f43c91245b5fea09c6db5521244
diff --git a/metadata/md5-cache/kde-base/powerdevil-4.8.3 b/metadata/md5-cache/kde-base/powerdevil-4.8.3
index 30be7319a567..ab331e67e53f 100644
--- a/metadata/md5-cache/kde-base/powerdevil-4.8.3
+++ b/metadata/md5-cache/kde-base/powerdevil-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.3:4[aqua=] >=kde-base/libkworkspace-4.8.3:4[aqua=] >=kde-base/solid-4.8.3:4[aqua=] pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7318bb65710a28fe005a151c25918c31
diff --git a/metadata/md5-cache/kde-base/powerdevil-4.8.4 b/metadata/md5-cache/kde-base/powerdevil-4.8.4
index e93a8758ed6d..31114f84c423 100644
--- a/metadata/md5-cache/kde-base/powerdevil-4.8.4
+++ b/metadata/md5-cache/kde-base/powerdevil-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.8.4:4[aqua=] >=kde-base/libkworkspace-4.8.4:4[aqua=] >=kde-base/solid-4.8.4:4[aqua=] pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=627edffee7765113a6004782212ab46a
diff --git a/metadata/md5-cache/kde-base/printer-applet-4.7.4 b/metadata/md5-cache/kde-base/printer-applet-4.7.4
index 0a085588cd13..85b6090444b5 100644
--- a/metadata/md5-cache/kde-base/printer-applet-4.7.4
+++ b/metadata/md5-cache/kde-base/printer-applet-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.7.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=df12b402b61e1e91bae1c19f3540a868
diff --git a/metadata/md5-cache/kde-base/printer-applet-4.8.3 b/metadata/md5-cache/kde-base/printer-applet-4.8.3
index fa81ac76f245..6c1bca88e2ca 100644
--- a/metadata/md5-cache/kde-base/printer-applet-4.8.3
+++ b/metadata/md5-cache/kde-base/printer-applet-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.8.3:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/printer-applet-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4c9f9740640b1f4e3b73fb668030f66c
diff --git a/metadata/md5-cache/kde-base/printer-applet-4.8.4 b/metadata/md5-cache/kde-base/printer-applet-4.8.4
index 450816db20db..7b94a476c7f6 100644
--- a/metadata/md5-cache/kde-base/printer-applet-4.8.4
+++ b/metadata/md5-cache/kde-base/printer-applet-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=kde-base/pykde4-4.8.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/printer-applet-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=911322111491a1adf20701faf66d07aa
diff --git a/metadata/md5-cache/kde-base/pykde4-4.7.4 b/metadata/md5-cache/kde-base/pykde4-4.7.4
index b85e99355ff1..913078e808ad 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.7.4
+++ b/metadata/md5-cache/kde-base/pykde4-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.7.4:4[aqua=,opengl,semantic-desktop=] semantic-desktop? ( >=kde-base/kdepimlibs-4.7.4:4[aqua=,semantic-desktop] ) aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] ) !aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] ) || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-3.2*[threads] =dev-lang/python-3.1*[threads] =dev-lang/python-2.7*[threads] =dev-lang/python-2.6*[threads] =dev-lang/python-2.5*[threads] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/pykde4-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2cdb09f24b2ef5907e06bed9fc68531c
diff --git a/metadata/md5-cache/kde-base/pykde4-4.8.3 b/metadata/md5-cache/kde-base/pykde4-4.8.3
index fc9bfe880f63..42a124bbec4e 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.8.3
+++ b/metadata/md5-cache/kde-base/pykde4-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.8.3:4[aqua=,opengl,seman
 REQUIRED_USE=test? ( semantic-desktop )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/pykde4-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e71a450157ec0218c933c1feae4f9fbe
diff --git a/metadata/md5-cache/kde-base/pykde4-4.8.4 b/metadata/md5-cache/kde-base/pykde4-4.8.4
index d891a78f542c..a87d6bd764be 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.8.4
+++ b/metadata/md5-cache/kde-base/pykde4-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/sip-4.12.3-r2 >=kde-base/kdelibs-4.8.4:4[aqua=,opengl,seman
 REQUIRED_USE=test? ( semantic-desktop )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/pykde4-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c68ca1fbd5ee1ea045db0ae9ce3d0810
diff --git a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.7.4 b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.7.4
index d23f02d0a964..f999f98a4f21 100644
--- a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.7.4
+++ b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8ad192792fb47e06428938ad4d066098
diff --git a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.3 b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.3
index 3a4c0f41c58d..7c059c67f3aa 100644
--- a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.3
+++ b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5651ccc420fce4f45ca889d7c5aef3a8
diff --git a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.4 b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.4
index b0dd5459b113..8aea0b4c51c7 100644
--- a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.4
+++ b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f786c52fe7406e7f6af248feabc40b45
diff --git a/metadata/md5-cache/kde-base/qtruby-4.7.4 b/metadata/md5-cache/kde-base/qtruby-4.7.4
index f54f5308b302..00911389ff76 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.7.4
+++ b/metadata/md5-cache/kde-base/qtruby-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/smokeqt-4.7.4:4[aqua=,declarative?,opengl,phonon?,qscintilla?
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/qtruby-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=17dd811c6e164619d977d018a48e81fe
diff --git a/metadata/md5-cache/kde-base/qtruby-4.8.3 b/metadata/md5-cache/kde-base/qtruby-4.8.3
index 58b3b690d65b..3e68db4fec7b 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.8.3
+++ b/metadata/md5-cache/kde-base/qtruby-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/smokeqt-4.8.3:4[aqua=,declarative?,opengl,phonon?,qscintilla?
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/qtruby-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2c71b47cd03d2329899f96b5a21acfd5
diff --git a/metadata/md5-cache/kde-base/qtruby-4.8.4 b/metadata/md5-cache/kde-base/qtruby-4.8.4
index 45113d42ba71..d364adac70ac 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.8.4
+++ b/metadata/md5-cache/kde-base/qtruby-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/smokeqt-4.8.4:4[aqua=,declarative?,opengl,phonon?,qscintilla?
 REQUIRED_USE=|| ( ruby_targets_ruby18 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/qtruby-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0ca53b9022e82531b306f35001d0b994
diff --git a/metadata/md5-cache/kde-base/qyoto-4.7.4 b/metadata/md5-cache/kde-base/qyoto-4.7.4
index c0fd61530dd4..8522405394b6 100644
--- a/metadata/md5-cache/kde-base/qyoto-4.7.4
+++ b/metadata/md5-cache/kde-base/qyoto-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/smokeqt-4.7.4:4[aqua=,opengl,phonon?,qscintilla?,webkit?] !kde-base/kdebindings-csharp:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/qyoto-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d2aa8a67ccbcba8f93b71654da97461
diff --git a/metadata/md5-cache/kde-base/qyoto-4.8.3 b/metadata/md5-cache/kde-base/qyoto-4.8.3
index 9c2629b15ebe..65fdc022aac5 100644
--- a/metadata/md5-cache/kde-base/qyoto-4.8.3
+++ b/metadata/md5-cache/kde-base/qyoto-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/smokeqt-4.8.3:4[aqua=,opengl,phonon?,qscintilla?,webkit?] !kde-base/kdebindings-csharp:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/qyoto-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5251016f0752a46d8def2e6f1fb5ea3b
diff --git a/metadata/md5-cache/kde-base/qyoto-4.8.4 b/metadata/md5-cache/kde-base/qyoto-4.8.4
index 3eb807e825fe..bd38d3bd183b 100644
--- a/metadata/md5-cache/kde-base/qyoto-4.8.4
+++ b/metadata/md5-cache/kde-base/qyoto-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/smokeqt-4.8.4:4[aqua=,opengl,phonon?,qscintilla?,webkit?] !kde-base/kdebindings-csharp:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/qyoto-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2255dbf3ec7fe65e48a5f839a7724597
diff --git a/metadata/md5-cache/kde-base/renamedlg-plugins-4.7.4 b/metadata/md5-cache/kde-base/renamedlg-plugins-4.7.4
index 1cb8cd9ffa44..8071993f64a5 100644
--- a/metadata/md5-cache/kde-base/renamedlg-plugins-4.7.4
+++ b/metadata/md5-cache/kde-base/renamedlg-plugins-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e06b02d9644fa78ca66bb3f1babfa2b2
diff --git a/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.3 b/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.3
index b755d06dd0f2..587159bccb3b 100644
--- a/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.3
+++ b/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=45e83501602396690d641f94aae06ef8
diff --git a/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.4 b/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.4
index ec077221f6ea..35d9935406f5 100644
--- a/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.4
+++ b/metadata/md5-cache/kde-base/renamedlg-plugins-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c591b3641be9b2aa2423431ad10da43c
diff --git a/metadata/md5-cache/kde-base/rocs-4.7.4 b/metadata/md5-cache/kde-base/rocs-4.7.4
index 4032e2498f95..85689baff1c3 100644
--- a/metadata/md5-cache/kde-base/rocs-4.7.4
+++ b/metadata/md5-cache/kde-base/rocs-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/rocs-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=13a0434bb74a2c323dad35cec74073b4
diff --git a/metadata/md5-cache/kde-base/rocs-4.8.3 b/metadata/md5-cache/kde-base/rocs-4.8.3
index 20613ce7ec88..c873158b943e 100644
--- a/metadata/md5-cache/kde-base/rocs-4.8.3
+++ b/metadata/md5-cache/kde-base/rocs-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.43 >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? (
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/rocs-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0284f9601147433f442614ae10282635
diff --git a/metadata/md5-cache/kde-base/rocs-4.8.4 b/metadata/md5-cache/kde-base/rocs-4.8.4
index 0e44b6b74218..1903db53c427 100644
--- a/metadata/md5-cache/kde-base/rocs-4.8.4
+++ b/metadata/md5-cache/kde-base/rocs-4.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.43 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? (
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/rocs-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d6998e645f6fd2a8a373510b018a476c
diff --git a/metadata/md5-cache/kde-base/smokegen-4.7.4-r1 b/metadata/md5-cache/kde-base/smokegen-4.7.4-r1
index 51efa1a479b2..9ecee238e285 100644
--- a/metadata/md5-cache/kde-base/smokegen-4.7.4-r1
+++ b/metadata/md5-cache/kde-base/smokegen-4.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4[aqua=] !kde-base/smoke:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/smokegen-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=084b03d39eadfde3dbdba28237b9d553
diff --git a/metadata/md5-cache/kde-base/smokegen-4.8.3 b/metadata/md5-cache/kde-base/smokegen-4.8.3
index 6bb2e1f43867..abc0f47d705e 100644
--- a/metadata/md5-cache/kde-base/smokegen-4.8.3
+++ b/metadata/md5-cache/kde-base/smokegen-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4[aqua=] !kde-base/smoke:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/smokegen-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0de0e95ed96f9939227b0dc2cc25bfa7
diff --git a/metadata/md5-cache/kde-base/smokegen-4.8.4 b/metadata/md5-cache/kde-base/smokegen-4.8.4
index cfe5a873f94b..f77930cceb43 100644
--- a/metadata/md5-cache/kde-base/smokegen-4.8.4
+++ b/metadata/md5-cache/kde-base/smokegen-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4[aqua=] !kde-base/smoke:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/smokegen-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8a946da4b6a1c86f5dfeb85434a84283
diff --git a/metadata/md5-cache/kde-base/smokekde-4.7.4 b/metadata/md5-cache/kde-base/smokekde-4.7.4
index ae4518da2acd..9df7cd7d7ce6 100644
--- a/metadata/md5-cache/kde-base/smokekde-4.7.4
+++ b/metadata/md5-cache/kde-base/smokekde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.7.4:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.7.4:4[aqua=] akonadi? ( >=kde-base/kdepimlibs-4.7.4:4[aqua=] ) attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.7.4:4[aqua=] ) okular? ( >=kde-base/okular-4.7.4:4[aqua=] ) !kde-base/smoke:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/smokekde-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d0b262c74c6192ad9f2533b309c34b99
diff --git a/metadata/md5-cache/kde-base/smokekde-4.8.3 b/metadata/md5-cache/kde-base/smokekde-4.8.3
index e6ecdccd862c..bfd1fe8c6750 100644
--- a/metadata/md5-cache/kde-base/smokekde-4.8.3
+++ b/metadata/md5-cache/kde-base/smokekde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.8.3:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.8.3:4[aqua=] attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.8.3:4[aqua=] ) okular? ( >=kde-base/okular-4.8.3:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepimlibs-4.8.3:4[aqua=] ) !kde-base/smoke:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/smokekde-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=47bf2553013aa3a83fdf4e508e3ba4d5
diff --git a/metadata/md5-cache/kde-base/smokekde-4.8.4 b/metadata/md5-cache/kde-base/smokekde-4.8.4
index 403620a09677..ad15a7a2f914 100644
--- a/metadata/md5-cache/kde-base/smokekde-4.8.4
+++ b/metadata/md5-cache/kde-base/smokekde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.8.4:4[aqua=,semantic-desktop=] >=kde-base/smokeqt-4.8.4:4[aqua=] attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.8.4:4[aqua=] ) okular? ( >=kde-base/okular-4.8.4:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepimlibs-4.8.4:4[aqua=] ) !kde-base/smoke:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/smokekde-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fddbe5899963a10cba294f27da4b6dfa
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.7.4 b/metadata/md5-cache/kde-base/smokeqt-4.7.4
index 6100584c60be..dc285ab5a5aa 100644
--- a/metadata/md5-cache/kde-base/smokeqt-4.7.4
+++ b/metadata/md5-cache/kde-base/smokeqt-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/smokegen-4.7.4:4[aqua=] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-test:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla ) qwt? ( x11-libs/qwt:5 ) webkit? ( x11-libs/qt-webkit:4 ) !kde-base/smoke:4 declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/smokeqt-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=704f14c23453880069570577f382d459
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.8.3 b/metadata/md5-cache/kde-base/smokeqt-4.8.3
index 4d01b57a7b69..d849054679be 100644
--- a/metadata/md5-cache/kde-base/smokeqt-4.8.3
+++ b/metadata/md5-cache/kde-base/smokeqt-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/smokegen-4.8.3:4[aqua=] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-test:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla ) qwt? ( x11-libs/qwt:5 ) webkit? ( x11-libs/qt-webkit:4 ) !kde-base/smoke:4 declarative? ( >=x11-libs/qt-declarative-4.7.4:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.4:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.4:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/smokeqt-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=810a2797f4186a01833135f4909091ff
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.8.4 b/metadata/md5-cache/kde-base/smokeqt-4.8.4
index 2402cc75f82e..461d0e06418a 100644
--- a/metadata/md5-cache/kde-base/smokeqt-4.8.4
+++ b/metadata/md5-cache/kde-base/smokeqt-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/smokegen-4.8.4:4[aqua=] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-test:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla ) qwt? ( x11-libs/qwt:5 ) webkit? ( x11-libs/qt-webkit:4 ) !kde-base/smoke:4 declarative? ( >=x11-libs/qt-declarative-4.7.4:4 ) qthelp? ( >=x11-libs/qt-assistant-4.7.4:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.4:4 )
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/smokeqt-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8d71a3fbf6d16b4d4f825dfc9ebf1472
diff --git a/metadata/md5-cache/kde-base/solid-4.7.4 b/metadata/md5-cache/kde-base/solid-4.7.4
index e0c79797e117..7c4733764b23 100644
--- a/metadata/md5-cache/kde-base/solid-4.7.4
+++ b/metadata/md5-cache/kde-base/solid-4.7.4
@@ -10,5 +10,5 @@ PDEPEND=bluetooth? ( net-wireless/bluedevil )
 RDEPEND=networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.7.4:4[aqua=] >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=45cb8e157e6605a821596d13ed5d580f
diff --git a/metadata/md5-cache/kde-base/solid-4.8.3 b/metadata/md5-cache/kde-base/solid-4.8.3
index 71ac606d6378..ff5c8984286c 100644
--- a/metadata/md5-cache/kde-base/solid-4.8.3
+++ b/metadata/md5-cache/kde-base/solid-4.8.3
@@ -10,5 +10,5 @@ PDEPEND=bluetooth? ( net-wireless/bluedevil )
 RDEPEND=networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.8.3:4[aqua=] >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a3b2d114764b8971cb6445386daff0dd
diff --git a/metadata/md5-cache/kde-base/solid-4.8.4 b/metadata/md5-cache/kde-base/solid-4.8.4
index c2157e91e6e6..09ce62fa9035 100644
--- a/metadata/md5-cache/kde-base/solid-4.8.4
+++ b/metadata/md5-cache/kde-base/solid-4.8.4
@@ -10,5 +10,5 @@ PDEPEND=bluetooth? ( net-wireless/bluedevil )
 RDEPEND=networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.8.4:4[aqua=] >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3df7336b675c198b8fd7e9298f5f27fa
diff --git a/metadata/md5-cache/kde-base/solid-runtime-4.7.4 b/metadata/md5-cache/kde-base/solid-runtime-4.7.4
index 198ccdcdc35e..996edbad495c 100644
--- a/metadata/md5-cache/kde-base/solid-runtime-4.7.4
+++ b/metadata/md5-cache/kde-base/solid-runtime-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/solid-4.4.50:4 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a686d19fe2b388a5a5ad93957f9afc17
diff --git a/metadata/md5-cache/kde-base/solid-runtime-4.8.3 b/metadata/md5-cache/kde-base/solid-runtime-4.8.3
index 850bfd9dbe36..feb82c89c03c 100644
--- a/metadata/md5-cache/kde-base/solid-runtime-4.8.3
+++ b/metadata/md5-cache/kde-base/solid-runtime-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/solid-4.4.50:4 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-runtime-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c28b2071dbc05d988b85b9b7357bcf1b
diff --git a/metadata/md5-cache/kde-base/solid-runtime-4.8.4 b/metadata/md5-cache/kde-base/solid-runtime-4.8.4
index 4adcd9f51546..2710f61f05ac 100644
--- a/metadata/md5-cache/kde-base/solid-runtime-4.8.4
+++ b/metadata/md5-cache/kde-base/solid-runtime-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<=kde-base/solid-4.4.50:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-runtime-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=317f32420907c26a551fa7b6e8691656
diff --git a/metadata/md5-cache/kde-base/step-4.7.4 b/metadata/md5-cache/kde-base/step-4.7.4
index a4294be5dc71..064fb8b7d717 100644
--- a/metadata/md5-cache/kde-base/step-4.7.4
+++ b/metadata/md5-cache/kde-base/step-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/eigen-2.0.3:2 sci-libs/cln >=sci-mathematics/gmm-3.0 gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/step-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6db1e205550b31e22d8a626b39a3a895
diff --git a/metadata/md5-cache/kde-base/step-4.8.3 b/metadata/md5-cache/kde-base/step-4.8.3
index 91dad51541a0..b47286946843 100644
--- a/metadata/md5-cache/kde-base/step-4.8.3
+++ b/metadata/md5-cache/kde-base/step-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/eigen-2.0.3:2 sci-libs/cln >=sci-mathematics/gmm-3.0 gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/step-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=28c71d4f143a5bf1519e2f86894ddb83
diff --git a/metadata/md5-cache/kde-base/step-4.8.4 b/metadata/md5-cache/kde-base/step-4.8.4
index 43f8e6648bd9..890469d4f4f7 100644
--- a/metadata/md5-cache/kde-base/step-4.8.4
+++ b/metadata/md5-cache/kde-base/step-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/eigen-2.0.3:2 sci-libs/cln >=sci-mathematics/gmm-3.0 gsl? ( >=sci-libs/gsl-1.9-r1 ) qalculate? ( >=sci-libs/libqalculate-0.9.5 ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/step-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2129140bf05890d0830ae011084986e0
diff --git a/metadata/md5-cache/kde-base/superkaramba-4.7.4 b/metadata/md5-cache/kde-base/superkaramba-4.7.4
index f65895de93a3..a9cd23e30169 100644
--- a/metadata/md5-cache/kde-base/superkaramba-4.7.4
+++ b/metadata/md5-cache/kde-base/superkaramba-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/qimageblitz python? ( >=kde-base/pykde4-4.7.4:4[aqua=] ) python? ( >=kde-base/krosspython-4.7.4:4[aqua=] ) python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=feced6a94b86f036db119053f5591832
diff --git a/metadata/md5-cache/kde-base/superkaramba-4.8.3 b/metadata/md5-cache/kde-base/superkaramba-4.8.3
index 5206dcf132db..13f307f804e0 100644
--- a/metadata/md5-cache/kde-base/superkaramba-4.8.3
+++ b/metadata/md5-cache/kde-base/superkaramba-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/qimageblitz python? ( >=kde-base/pykde4-4.8.3:4[aqua=] ) python? ( >=kde-base/krosspython-4.8.3:4[aqua=] ) python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/superkaramba-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d4459456d0f4deff814a1fd4d5b939e4
diff --git a/metadata/md5-cache/kde-base/superkaramba-4.8.4 b/metadata/md5-cache/kde-base/superkaramba-4.8.4
index 56198e7eb54f..bec00bb77568 100644
--- a/metadata/md5-cache/kde-base/superkaramba-4.8.4
+++ b/metadata/md5-cache/kde-base/superkaramba-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/qimageblitz python? ( >=kde-base/pykde4-4.8.4:4[aqua=] ) python? ( >=kde-base/krosspython-4.8.4:4[aqua=] ) python? ( =dev-lang/python-2* ) >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/superkaramba-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=babcc979573aaf9e75783417b62f1a04
diff --git a/metadata/md5-cache/kde-base/svgpart-4.7.4 b/metadata/md5-cache/kde-base/svgpart-4.7.4
index 1432d2a306d5..c8d455ce072b 100644
--- a/metadata/md5-cache/kde-base/svgpart-4.7.4
+++ b/metadata/md5-cache/kde-base/svgpart-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/svgpart-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a252c5d4f4f2a8c613839773d5c04d08
diff --git a/metadata/md5-cache/kde-base/svgpart-4.8.3 b/metadata/md5-cache/kde-base/svgpart-4.8.3
index 084e60dd68a9..a9603df71c51 100644
--- a/metadata/md5-cache/kde-base/svgpart-4.8.3
+++ b/metadata/md5-cache/kde-base/svgpart-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/svgpart-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=57d6288451837bd43eaeff39528eb470
diff --git a/metadata/md5-cache/kde-base/svgpart-4.8.4 b/metadata/md5-cache/kde-base/svgpart-4.8.4
index 0cff2ab46b3b..b07054972589 100644
--- a/metadata/md5-cache/kde-base/svgpart-4.8.4
+++ b/metadata/md5-cache/kde-base/svgpart-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/svgpart-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e74006499456be34e481c0817d65cf85
diff --git a/metadata/md5-cache/kde-base/sweeper-4.7.4 b/metadata/md5-cache/kde-base/sweeper-4.7.4
index 1f73bb7f73c3..fea9d77dc7a8 100644
--- a/metadata/md5-cache/kde-base/sweeper-4.7.4
+++ b/metadata/md5-cache/kde-base/sweeper-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeutils-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=586304fe05cf94a06ec184a2b48664b7
diff --git a/metadata/md5-cache/kde-base/sweeper-4.8.3 b/metadata/md5-cache/kde-base/sweeper-4.8.3
index c976a6aaa519..1354334bc92a 100644
--- a/metadata/md5-cache/kde-base/sweeper-4.8.3
+++ b/metadata/md5-cache/kde-base/sweeper-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/sweeper-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0c6f071a7c7ce8e912d325f0e51f4d5c
diff --git a/metadata/md5-cache/kde-base/sweeper-4.8.4 b/metadata/md5-cache/kde-base/sweeper-4.8.4
index 6425c1b331f6..32890a62520d 100644
--- a/metadata/md5-cache/kde-base/sweeper-4.8.4
+++ b/metadata/md5-cache/kde-base/sweeper-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/sweeper-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d17188c50719c9fdb8ebac496ce6c14b
diff --git a/metadata/md5-cache/kde-base/system-config-printer-kde-4.7.4 b/metadata/md5-cache/kde-base/system-config-printer-kde-4.7.4
index 44d1cd2012be..fa482fee5b78 100644
--- a/metadata/md5-cache/kde-base/system-config-printer-kde-4.7.4
+++ b/metadata/md5-cache/kde-base/system-config-printer-kde-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.7.4:4[aqua=] net-print/cups[dbus] =dev-lang/python-2* >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdeadmin-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eaab21f009cc60dbea13e27c5467d79f
diff --git a/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.3 b/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.3
index a0b80e9927f7..449ea64b5ac9 100644
--- a/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.3
+++ b/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.8.3:4[aqua=] net-print/cups[dbus] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdeadmin-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d42f32031fdf4a2de59a1d35a7ebceb4
diff --git a/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.4 b/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.4
index eb30c0853e79..e636dce3bedf 100644
--- a/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.4
+++ b/metadata/md5-cache/kde-base/system-config-printer-kde-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/system-config-printer-common-1.2.2 >=dev-python/pycups-1.9.49 >=kde-base/pykde4-4.8.4:4[aqua=] net-print/cups[dbus] =dev-lang/python-2* >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdeadmin-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0e3ca48103bbf63b70562403e3e3867e
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.7.4 b/metadata/md5-cache/kde-base/systemsettings-4.7.4
index 84170447e104..88ba9c25e641 100644
--- a/metadata/md5-cache/kde-base/systemsettings-4.7.4
+++ b/metadata/md5-cache/kde-base/systemsettings-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 >=kde-base/libkworkspace-4.7.4:4[aqua=] media-libs/fontc
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kde-workspace-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4191590bbf5ea2d2da53cfd8fb062971
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.8.3 b/metadata/md5-cache/kde-base/systemsettings-4.8.3
index 122b89933c90..ded7ab1d4b17 100644
--- a/metadata/md5-cache/kde-base/systemsettings-4.8.3
+++ b/metadata/md5-cache/kde-base/systemsettings-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 >=kde-base/libkworkspace-4.8.3:4[aqua=] media-libs/fontc
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kde-workspace-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7ca3cf37686715c8aa8bb45777c3ccb6
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.8.4 b/metadata/md5-cache/kde-base/systemsettings-4.8.4
index 51dc4958a44e..38edff490421 100644
--- a/metadata/md5-cache/kde-base/systemsettings-4.8.4
+++ b/metadata/md5-cache/kde-base/systemsettings-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=kde-base/libkworkspace-4.8.4:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( virtual/libusb:0 ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kde-gtk-config ) !<kde-base/kdeaccessibility-colorschemes-4.6.50:4 >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.4:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=] >=media-libs/qimageblitz-0.0.4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kde-workspace-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c07abb7b333ac5913e1b6ba1f74551ae
diff --git a/metadata/md5-cache/kde-base/thumbnailers-4.7.4 b/metadata/md5-cache/kde-base/thumbnailers-4.7.4
index eb8ea89ade24..1f11a32719a4 100644
--- a/metadata/md5-cache/kde-base/thumbnailers-4.7.4
+++ b/metadata/md5-cache/kde-base/thumbnailers-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdcraw-4.7.4:4[aqua=] >=kde-base/libkexiv2-4.7.4:4[aqua=] media-libs/lcms:0 >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdegraphics-thumbnailers-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bbb47b0439aa9e4a0239fe3c4e824fd7
diff --git a/metadata/md5-cache/kde-base/thumbnailers-4.8.3 b/metadata/md5-cache/kde-base/thumbnailers-4.8.3
index 80f9c7b3b1bd..00e7a3219201 100644
--- a/metadata/md5-cache/kde-base/thumbnailers-4.8.3
+++ b/metadata/md5-cache/kde-base/thumbnailers-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdcraw-4.8.3:4[aqua=] >=kde-base/libkexiv2-4.8.3:4[aqua=] media-libs/lcms:0 >=kde-base/oxygen-icons-4.8.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdegraphics-thumbnailers-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=825b1e9d02bd728b6ba518e7084b545d
diff --git a/metadata/md5-cache/kde-base/thumbnailers-4.8.4 b/metadata/md5-cache/kde-base/thumbnailers-4.8.4
index f2454cf8b41c..6cdb2e0bafbf 100644
--- a/metadata/md5-cache/kde-base/thumbnailers-4.8.4
+++ b/metadata/md5-cache/kde-base/thumbnailers-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdcraw-4.8.4:4[aqua=] >=kde-base/libkexiv2-4.8.4:4[aqua=] media-libs/lcms:0 >=kde-base/oxygen-icons-4.8.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdegraphics-thumbnailers-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6abf7d2f47a00ddbc74b12a1eae5f493
diff --git a/metadata/md5-cache/kde-base/umbrello-4.7.4 b/metadata/md5-cache/kde-base/umbrello-4.7.4
index db487567506d..ad9eebbb575a 100644
--- a/metadata/md5-cache/kde-base/umbrello-4.7.4
+++ b/metadata/md5-cache/kde-base/umbrello-4.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.7.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kdesdk-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=563e1b188720fbf23836871d90d8b573
diff --git a/metadata/md5-cache/kde-base/umbrello-4.8.3 b/metadata/md5-cache/kde-base/umbrello-4.8.3
index 895bba83e793..068d835d6854 100644
--- a/metadata/md5-cache/kde-base/umbrello-4.8.3
+++ b/metadata/md5-cache/kde-base/umbrello-4.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.8.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.3:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kdesdk-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d5c1e4ae1c3c79c53c7837c618b07a72
diff --git a/metadata/md5-cache/kde-base/umbrello-4.8.4 b/metadata/md5-cache/kde-base/umbrello-4.8.4
index 4e970ccb2428..0db47ae547b7 100644
--- a/metadata/md5-cache/kde-base/umbrello-4.8.4
+++ b/metadata/md5-cache/kde-base/umbrello-4.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.8.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.8.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.4/src/kdesdk-4.8.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8b6e4fb9394a6237a78321f057c2d82
diff --git a/metadata/md5-cache/kde-misc/adjustableclock-2.6.1 b/metadata/md5-cache/kde-misc/adjustableclock-2.6.1
index 318571444257..dae9f694b19f 100644
--- a/metadata/md5-cache/kde-misc/adjustableclock-2.6.1
+++ b/metadata/md5-cache/kde-misc/adjustableclock-2.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libplasmaclock-4.4:4[aqua=] >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/92825-adjustableclock-2.6.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=07eac2a9d3c7f67ff376f599f6f48df9
diff --git a/metadata/md5-cache/kde-misc/adjustableclock-3.0 b/metadata/md5-cache/kde-misc/adjustableclock-3.0
index 04cc43c62d28..489481f10ade 100644
--- a/metadata/md5-cache/kde-misc/adjustableclock-3.0
+++ b/metadata/md5-cache/kde-misc/adjustableclock-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libplasmaclock-4.4:4[aqua=] >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/92825-adjustableclock-3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=205ad41cfe4d7ebe029fa0fd19c873b5
diff --git a/metadata/md5-cache/kde-misc/adjustableclock-3.1 b/metadata/md5-cache/kde-misc/adjustableclock-3.1
index 3fc729f375d4..dbfe150c2ad9 100644
--- a/metadata/md5-cache/kde-misc/adjustableclock-3.1
+++ b/metadata/md5-cache/kde-misc/adjustableclock-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libplasmaclock-4.4:4[aqua=] >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/92825-adjustableclock-3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d6fc31ff9a6ae8f2304631d0466c5cf
diff --git a/metadata/md5-cache/kde-misc/akonadi-facebook-0_p20120222 b/metadata/md5-cache/kde-misc/akonadi-facebook-0_p20120222
index a0fb3c1ca599..d6abbcedc2e8 100644
--- a/metadata/md5-cache/kde-misc/akonadi-facebook-0_p20120222
+++ b/metadata/md5-cache/kde-misc/akonadi-facebook-0_p20120222
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/boost dev-libs/libxslt dev-libs/qjson >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/akonadi-facebook-0_p20120222.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e223a189940bbd6fa4f544b0f7440ce3
diff --git a/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20120222 b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20120222
index 43a00747b0ca..415dfef83d4c 100644
--- a/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20120222
+++ b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20120222
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/akonadi-git-resource-0_p20120222.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b9b6bc0de7719f57c5ee9a4e7afe68a2
diff --git a/metadata/md5-cache/kde-misc/akonadi-google-0.3.1 b/metadata/md5-cache/kde-misc/akonadi-google-0.3.1
index 7eae9c07358b..5ad91531df70 100644
--- a/metadata/md5-cache/kde-misc/akonadi-google-0.3.1
+++ b/metadata/md5-cache/kde-misc/akonadi-google-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/libxslt dev-libs/qjson oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) !>=kde-base/kdepim-runtime-4.8.50 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.progdan.cz/wp-content/uploads/akonadi-google-0.3.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=53d24eba4bfccda8f03c93e834c966a7
diff --git a/metadata/md5-cache/kde-misc/akonadi-google-20120619 b/metadata/md5-cache/kde-misc/akonadi-google-20120619
index 92ec8bfc0505..650514c5c118 100644
--- a/metadata/md5-cache/kde-misc/akonadi-google-20120619
+++ b/metadata/md5-cache/kde-misc/akonadi-google-20120619
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/libxslt dev-libs/qjson net-libs/libkgapi oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) !>=kde-base/kdepim-runtime-4.8.50 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/akonadi-google-20120619.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ce2cdfc7a71fb3805884dc327eab2310
diff --git a/metadata/md5-cache/kde-misc/basket-1.81 b/metadata/md5-cache/kde-misc/basket-1.81
index f2e6ce8a5242..fe4a7943332e 100644
--- a/metadata/md5-cache/kde-misc/basket-1.81
+++ b/metadata/md5-cache/kde-misc/basket-1.81
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] media-libs/qimageblitz crypt? ( >=app-crypt/gpgme-1.0 ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://basket.kde.org/downloads/basket-1.81.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a908111ef92f4aceff018aba8e49a8c1
diff --git a/metadata/md5-cache/kde-misc/bkodama-0.3.1 b/metadata/md5-cache/kde-misc/bkodama-0.3.1
index 74e408767fbe..0e63c9120258 100644
--- a/metadata/md5-cache/kde-misc/bkodama-0.3.1
+++ b/metadata/md5-cache/kde-misc/bkodama-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/106528-bkodama-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=54209c458b9555ac9eec6c89dafb4537
diff --git a/metadata/md5-cache/kde-misc/colibri-0.2.2 b/metadata/md5-cache/kde-misc/colibri-0.2.2
index 9d0906c66155..7ca0e7718a29 100644
--- a/metadata/md5-cache/kde-misc/colibri-0.2.2
+++ b/metadata/md5-cache/kde-misc/colibri-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/117147-colibri-0.2.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=410a59235400e15c4da1ce2a3f4f9a40
diff --git a/metadata/md5-cache/kde-misc/customizable-weather-1.5.14 b/metadata/md5-cache/kde-misc/customizable-weather-1.5.14
index 4b47a015a8ee..cef0d7ab8455 100644
--- a/metadata/md5-cache/kde-misc/customizable-weather-1.5.14
+++ b/metadata/md5-cache/kde-misc/customizable-weather-1.5.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.5.14.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c0c9f62b13738428b4b0851c0e5a8360
diff --git a/metadata/md5-cache/kde-misc/customizable-weather-1.6.2 b/metadata/md5-cache/kde-misc/customizable-weather-1.6.2
index f7de01659cb7..64a09e665730 100644
--- a/metadata/md5-cache/kde-misc/customizable-weather-1.6.2
+++ b/metadata/md5-cache/kde-misc/customizable-weather-1.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.6.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=33389f8a4658c03441897ffeef0742eb
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc38 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc38
index b5aea2819330..886a97d8d6cc 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc38
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc38
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc38 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc38.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eab1f237a2f00e45c1c8f6aaca31eb28
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc43 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc43
index f669733c968d..a8e34b6521bb 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc43
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc43
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc43 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc43.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d5b2dc3f1a60b43d91d9be6c1ac36ff8
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc53 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc53
index 6d9027c0521e..e48c88800c92 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc53
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc53
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc53 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc53.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=69ba5dd7626bd91be7679a11c74e7882
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc59 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc59
index e93b9b5fb864..e6a30b1c5748 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc59
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc59
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc59 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc59.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e945fbfec9b715326be6aaac55159e73
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc76 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc76
index f1ed9f1863f5..c368c879794a 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc76
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc76
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc76 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc76.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c6915047af1cb09bfe35947cd7c84100
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc77 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc77
index 40050a2b1364..2ec1030f8f83 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc77
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc77
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc77 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc77.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ffc2b8cc0ea28104b895f17d69dcf15c
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc80 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc80
index a858597a36ec..2193e7a652f4 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc80
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc80
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc80 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc80.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ea6224b791bd567e74656e5464c46a18
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc87 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc87
index e634c0a12382..8317a4c636a4 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc87
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc87
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc87 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc87.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=debccdbb08134a2c37c350a1feb023c2
diff --git a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc90 b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc90
index 15a62847c91a..54719aa83602 100644
--- a/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc90
+++ b/metadata/md5-cache/kde-misc/entropy-kioslaves-1.0_rc90
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/sulfur-1.0_rc90 >=kde-base/oxygen-icons-4.2:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.2:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc90.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2fe12708b2ea4d028ff770b532a57141
diff --git a/metadata/md5-cache/kde-misc/eventlist-0.5.96 b/metadata/md5-cache/kde-misc/eventlist-0.5.96
index c4e51b95836d..d83712391100 100644
--- a/metadata/md5-cache/kde-misc/eventlist-0.5.96
+++ b/metadata/md5-cache/kde-misc/eventlist-0.5.96
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] || ( ( >=kde-base/akonadi-4.4:4[aqua=] ) ( >=kde-base/kdepim-common-libs-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.5.96.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fdb9242272a6b6e533325e4881a6e002
diff --git a/metadata/md5-cache/kde-misc/eventlist-0.6 b/metadata/md5-cache/kde-misc/eventlist-0.6
index ad2ee1ccfde3..10fb8a294708 100644
--- a/metadata/md5-cache/kde-misc/eventlist-0.6
+++ b/metadata/md5-cache/kde-misc/eventlist-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] || ( ( >=kde-base/akonadi-4.4:4[aqua=] ) ( >=kde-base/kdepim-common-libs-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51eb06cca052104573f36dcc719bb25c
diff --git a/metadata/md5-cache/kde-misc/fancytasks-1.1.0 b/metadata/md5-cache/kde-misc/fancytasks-1.1.0
index 5f7255f6bdd7..23dc635c122b 100644
--- a/metadata/md5-cache/kde-misc/fancytasks-1.1.0
+++ b/metadata/md5-cache/kde-misc/fancytasks-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nds(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/99737-fancytasks-1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ec4e15942ff193b4aaa0966fb05622f0
diff --git a/metadata/md5-cache/kde-misc/fancytasks-1.1.2 b/metadata/md5-cache/kde-misc/fancytasks-1.1.2
index 45a969b11c7d..0a2e9a2cf98f 100644
--- a/metadata/md5-cache/kde-misc/fancytasks-1.1.2
+++ b/metadata/md5-cache/kde-misc/fancytasks-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_km(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nds(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/99737-fancytasks-1.1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6c3e57f68a4af2d95efd00c6ad0df7b2
diff --git a/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4 b/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
index 6e4060b938b3..9cce8b31cb17 100644
--- a/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
+++ b/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/99617-gx_mail_notify-0.4.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ccfc1a6ba585f4b8dc8ca48ab1caabb
diff --git a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3 b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3
index cb3f095be657..bf717aabf3da 100644
--- a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3
+++ b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] app-laptop/hdapsd >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/103481-hdaps_monitor-0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=47f724c066ca71df1c2f603c67781f83
diff --git a/metadata/md5-cache/kde-misc/kbiff-4.0 b/metadata/md5-cache/kde-misc/kbiff-4.0
index bf956c28365e..262c585a186d 100644
--- a/metadata/md5-cache/kde-misc/kbiff-4.0
+++ b/metadata/md5-cache/kde-misc/kbiff-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://prdownloads.sourceforge.net/kbiff/kbiff-4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1359dd2f480fad3d4bcad7df29264d38
diff --git a/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845 b/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
index 6495f46a73dc..a7229ff89be4 100644
--- a/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
+++ b/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/kbstateapplet-0_p1268845.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=18c4955bef2a6887f84e459d9deefdbe
diff --git a/metadata/md5-cache/kde-misc/kcaldav-1.2.0 b/metadata/md5-cache/kde-misc/kcaldav-1.2.0
index 3c98edd34ed8..18852bf0c60b 100644
--- a/metadata/md5-cache/kde-misc/kcaldav-1.2.0
+++ b/metadata/md5-cache/kde-misc/kcaldav-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcaldav >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kcaldav.googlecode.com/files/kcaldav-1.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e11295464e9616c9d88ec151e46a071e
diff --git a/metadata/md5-cache/kde-misc/kcm-grub2-0.5.8 b/metadata/md5-cache/kde-misc/kcm-grub2-0.5.8
index 84804dcdf621..55771c070708 100644
--- a/metadata/md5-cache/kde-misc/kcm-grub2-0.5.8
+++ b/metadata/md5-cache/kde-misc/kcm-grub2-0.5.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=] hwinfo? ( sys-apps/hwinfo ) imagemagick? ( media-gfx/imagemagick ) packagekit? ( app-admin/packagekit-qt4 ) >=kde-base/kcmshell-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kcm-grub2/0.5.8/kcm-grub2-0.5.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=55c635924c4249eec7af19046b579826
diff --git a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.1-r3 b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.1-r3
index b6d44be98660..436b63f65469 100644
--- a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.1-r3
+++ b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=<net-firewall/ufw-0.31 sys-auth/polkit-kde-agent >=kde-base/kcmshell-4.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://craigd.wikispaces.com/file/view/kcm_ufw-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bfeee881db288d88f6946016160830a2
diff --git a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3 b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3
index ec5bcf712f68..f27ac41452fa 100644
--- a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3
+++ b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-firewall/ufw-0.31 sys-auth/polkit-kde-agent >=kde-base/kcmshell-4.4:4[aqua=] =dev-lang/python-2* >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://craigd.wikispaces.com/file/view/kcm_ufw-0.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f043c949930cf020a10fba84aa01637d
diff --git a/metadata/md5-cache/kde-misc/kcm_touchpad-0.3.1 b/metadata/md5-cache/kde-misc/kcm_touchpad-0.3.1
index a804c0934a63..3ffe1f0ff642 100644
--- a/metadata/md5-cache/kde-misc/kcm_touchpad-0.3.1
+++ b/metadata/md5-cache/kde-misc/kcm_touchpad-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXi >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://github.com/mishaaq/kcm_touchpad/tarball/kcm_touchpad-0.3.1 -> mishaaq-kcm_touchpad-00370b5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e2bd1036f72d3b0a4389dacb06dfe448
diff --git a/metadata/md5-cache/kde-misc/kcollectd-0.9 b/metadata/md5-cache/kde-misc/kcollectd-0.9
index e055b35eabdf..ea628f3ccdaf 100644
--- a/metadata/md5-cache/kde-misc/kcollectd-0.9
+++ b/metadata/md5-cache/kde-misc/kcollectd-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost net-analyzer/rrdtool || ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd/kcollectd-0.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d238816ec11a38aab60f4948b1ca89a9
diff --git a/metadata/md5-cache/kde-misc/kcometen4-1.0.7 b/metadata/md5-cache/kde-misc/kcometen4-1.0.7
index 73e8f5f66d8f..961602302644 100644
--- a/metadata/md5-cache/kde-misc/kcometen4-1.0.7
+++ b/metadata/md5-cache/kde-misc/kcometen4-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.4:4[aqua=,opengl] media-libs/libart_lgpl virtual/opengl >=kde-base/oxygen-icons-4.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/87586-kcometen4-1.0.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=748f8a6b28bff62bf859bb5cde3ca351
diff --git a/metadata/md5-cache/kde-misc/kde-gtk-config-1.7 b/metadata/md5-cache/kde-misc/kde-gtk-config-1.7
index cfe3fbb3ecec..6d489ab383d8 100644
--- a/metadata/md5-cache/kde-misc/kde-gtk-config-1.7
+++ b/metadata/md5-cache/kde-misc/kde-gtk-config-1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=] !kde-misc/kcm_gtk >=kde-base/kcmshell-4.6:4[aqua=] >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_eu(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_gl(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_id(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ru(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/chakra/chakra-gtk-config-1.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8309cb17764a393464ca8acade3560c6
diff --git a/metadata/md5-cache/kde-misc/kde-gtk-config-2.0 b/metadata/md5-cache/kde-misc/kde-gtk-config-2.0
index 98f93434ac7f..aa6d22c81dc8 100644
--- a/metadata/md5-cache/kde-misc/kde-gtk-config-2.0
+++ b/metadata/md5-cache/kde-misc/kde-gtk-config-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib x11-libs/gtk+:2 x11-libs/gtk+:3 !kde-misc/kcm_gtk >=kde-base/kcmshell-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_id(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kde-gtk-config/2.0/src/kde-gtk-config-2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0c8e0b612d7621135bd719065331e667
diff --git a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4 b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
index 7351f0633c50..7497eabfeb35 100644
--- a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
+++ b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2 LGPL-2
 RDEPEND=app-admin/sudo >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://launchpad.net/kdesudo/3.x/3.4.2.4/+download/kdesudo-3.4.2.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2d6fc313e70bf8189fee81a9cf4e4900
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.96 b/metadata/md5-cache/kde-misc/kdiff3-0.9.96
index 8ee693bb8f30..ea28e1314b0d 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.96
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.96
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.4.0 >=x11-libs/qt-gui-4.4.0 kde? ( >=kde-base/kdeli
 RESTRICT=!kde? ( test )
 SLOT=4
 SRC_URI=mirror://sourceforge/kdiff3/kdiff3-0.9.96.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=768396e799823e50bc634687702bedb1
diff --git a/metadata/md5-cache/kde-misc/kdirstat-2.7.3 b/metadata/md5-cache/kde-misc/kdirstat-2.7.3
index 11ddece8506f..b05c2697cd3b 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-2.7.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-2.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-base/libkonq:4 sys-libs/zlib >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-2.7.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=77c2126dd61453442d0bfad048df7cf2
diff --git a/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8 b/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
index 51c27f36cb62..29cb638efd95 100644
--- a/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
+++ b/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdm-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/102760-KdmThemeGenerator.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3076653b406fb9927575520c7ac1ad21
diff --git a/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5 b/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
index d186c72b6806..3f984b5db463 100644
--- a/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
+++ b/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( <sys-boot/grub-1 sys-boot/grub-static ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kgrubeditor/KGRUBEditor-0.8.5-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9767fcad32847701558e52cf01450990
diff --git a/metadata/md5-cache/kde-misc/kgtk-0.10.1 b/metadata/md5-cache/kde-misc/kgtk-0.10.1
index 376357a55f4b..682cacf5e2b1 100644
--- a/metadata/md5-cache/kde-misc/kgtk-0.10.1
+++ b/metadata/md5-cache/kde-misc/kgtk-0.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/qt-gui:4 >=kde-base/kdebase-startkde-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://home.freeuk.com/cpdrummond/KGtk-0.10.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8b9e2cfa3b5b8c94227acb530ec79a1c
diff --git a/metadata/md5-cache/kde-misc/kgtk-0.11.0 b/metadata/md5-cache/kde-misc/kgtk-0.11.0
index 66b4019e0ae7..0fce7ddab4e2 100644
--- a/metadata/md5-cache/kde-misc/kgtk-0.11.0
+++ b/metadata/md5-cache/kde-misc/kgtk-0.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) x11-libs/gdk-pixbuf x11-libs/qt-core:4 x11-libs/qt-gui:4 >=kde-base/kdebase-startkde-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/36077-KGtk-0.11.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9734700269c5cb7697c697cda80e6db9
diff --git a/metadata/md5-cache/kde-misc/kio-ftps-0.2 b/metadata/md5-cache/kde-misc/kio-ftps-0.2
index 9f88a29d6dae..f4a0ae5be23a 100644
--- a/metadata/md5-cache/kde-misc/kio-ftps-0.2
+++ b/metadata/md5-cache/kde-misc/kio-ftps-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-base/konqueror-4.4:4[aqua=] >=kde-base/dolphin-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://berlios/kasablanca/kio-ftps-0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d8b382a565bbee706b8202edfc9537d7
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3
index 75cf3302701d..4708926e3517 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/mlocate >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aeb8477999c3b0a1f08a890dd1f9d12d
diff --git a/metadata/md5-cache/kde-misc/kio-slp-0_p20120621 b/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
index 668be89c067a..02d0680d0fe6 100644
--- a/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
+++ b/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=net-libs/openslp >=kde-base/oxygen-icons-4.4:4[aqua=] opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~creffett/kio-slp-0_p20120621.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1489662f5e86aade4ad01492677c0d63
diff --git a/metadata/md5-cache/kde-misc/kio-upnp-ms-1.0.0_p20110602 b/metadata/md5-cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
index 23aec6c0527f..8c601237cd5d 100644
--- a/metadata/md5-cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
+++ b/metadata/md5-cache/kde-misc/kio-upnp-ms-1.0.0_p20110602
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-base/kdelibs x11-libs/qt-core media-libs/herqq >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://gentoo/kio-upnp-ms-1.0.0_p20110602.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=96797620381f2b1d2f6217e5003aeb14
diff --git a/metadata/md5-cache/kde-misc/kio_gopher-0.1.3 b/metadata/md5-cache/kde-misc/kio_gopher-0.1.3
index 1a37abccf40b..eaca61243320 100644
--- a/metadata/md5-cache/kde-misc/kio_gopher-0.1.3
+++ b/metadata/md5-cache/kde-misc/kio_gopher-0.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/konqueror-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_rw(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/Attic/4.4.0/src/extragear/kio_gopher-0.1.3-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ff536814e0b59dc96fdab100d4750ab5
diff --git a/metadata/md5-cache/kde-misc/kio_gopher-0.1.4 b/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
index 8e1e4c85cf41..748ced689f49 100644
--- a/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
+++ b/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/konqueror-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_rw(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/extragear/kio-gopher-0.1.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=99d4e742ead4b8373bb0d1d42399e1c6
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-0.9.5_p20120530 b/metadata/md5-cache/kde-misc/kolor-manager-0.9.5_p20120530
index 704308f88282..a7dc9d1ee0e5 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-0.9.5_p20120530
+++ b/metadata/md5-cache/kde-misc/kolor-manager-0.9.5_p20120530
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/oyranos-0.4.0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/kolor-manager-0.9.5_p20120530.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=29f18234b90c130fdc35fd128e4eb27d
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-0_p20120210 b/metadata/md5-cache/kde-misc/kolor-manager-0_p20120210
index 3d1bf94adea2..70d97a7ecdf4 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-0_p20120210
+++ b/metadata/md5-cache/kde-misc/kolor-manager-0_p20120210
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=media-libs/oyranos >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/kolor-manager-0_p20120210.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6f39033a4dd9f4f3302f126fb959ae37
diff --git a/metadata/md5-cache/kde-misc/kookie-0.1.1 b/metadata/md5-cache/kde-misc/kookie-0.1.1
index 7a8bbeb4b238..414c126fcaf8 100644
--- a/metadata/md5-cache/kde-misc/kookie-0.1.1
+++ b/metadata/md5-cache/kde-misc/kookie-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kookie/kookie-0.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=040364cb4b8c29121c1b911f1ee748a7
diff --git a/metadata/md5-cache/kde-misc/kopete-antispam-0.5 b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
index 8de2b726df51..0df5b1227e2d 100644
--- a/metadata/md5-cache/kde-misc/kopete-antispam-0.5
+++ b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kopete-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kopeteantispam/kopete-antispam-kde4-0.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=12bb9b2e58b4f4178bd729784a771ab3
diff --git a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50 b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
index e9625b501e2d..21ee43f66a28 100644
--- a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
+++ b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kopete-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/100537-kopete-thinklight-0.50.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6bb6137e21a8c7e10121d3a3ed7d0c64
diff --git a/metadata/md5-cache/kde-misc/kosd-0.7.1 b/metadata/md5-cache/kde-misc/kosd-0.7.1
index 17ea5d563e37..7afd53dde918 100644
--- a/metadata/md5-cache/kde-misc/kosd-0.7.1
+++ b/metadata/md5-cache/kde-misc/kosd-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-4.6:4[aqua=] >=kde-base/kmix-4.6:4[aqua=] >=kde-base/oxygen-icons-4.6:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/81457-kosd-0.7.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eb0f419a888d3db62998cfc6f729965d
diff --git a/metadata/md5-cache/kde-misc/kosd-0.8.1 b/metadata/md5-cache/kde-misc/kosd-0.8.1
index dd000689adb7..af05237abded 100644
--- a/metadata/md5-cache/kde-misc/kosd-0.8.1
+++ b/metadata/md5-cache/kde-misc/kosd-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-4.4:4[aqua=] >=kde-base/kmix-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/81457-kosd-0.8.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=060852e2afab633d5e991f82862254db
diff --git a/metadata/md5-cache/kde-misc/kprayertime-4.01 b/metadata/md5-cache/kde-misc/kprayertime-4.01
index e8b6f83abc20..2c0d2576ad66 100644
--- a/metadata/md5-cache/kde-misc/kprayertime-4.01
+++ b/metadata/md5-cache/kde-misc/kprayertime-4.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kprayertime/kprayertime4.01.src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=049dcd9967f66e29eb62e89c3662a0ed
diff --git a/metadata/md5-cache/kde-misc/krcstat-0.7.3 b/metadata/md5-cache/kde-misc/krcstat-0.7.3
index a8f18d611085..8e5e338ffaaa 100644
--- a/metadata/md5-cache/kde-misc/krcstat-0.7.3
+++ b/metadata/md5-cache/kde-misc/krcstat-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/konsole-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=ftp://binro.org/krcstat-0.7.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c13c53c2f673545cc4d2e5983d5bb7f4
diff --git a/metadata/md5-cache/kde-misc/krecipes-2.0_beta2 b/metadata/md5-cache/kde-misc/krecipes-2.0_beta2
index e6c9abb8c277..6004ae2a8775 100644
--- a/metadata/md5-cache/kde-misc/krecipes-2.0_beta2
+++ b/metadata/md5-cache/kde-misc/krecipes-2.0_beta2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-db/sqlite:3 dev-libs/libxml2 dev-libs/libxslt media-libs/qimageblitz >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krecipes/krecipes-2.0-beta2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e276cb3a16ebcde8a28dadff2b17b563
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9 b/metadata/md5-cache/kde-misc/krename-4.0.9
index 3dc4c6d4b018..d924bd119836 100644
--- a/metadata/md5-cache/kde-misc/krename-4.0.9
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( >=media-gfx/exiv2-0.13 ) pdf? ( >=app-text/podofo-0.8 ) taglib? ( >=media-libs/taglib-1.5 ) truetype? ( media-libs/freetype:2 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krename/krename-4.0.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=832a225255f778d2c7241593cde29d56
diff --git a/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4 b/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
index b2d6b5190c7b..5f343e7281fb 100644
--- a/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
+++ b/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/libkworkspace-4.4:4[aqua=] >=kde-base/kopete-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/105263-krunner-kopete-contacts-0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=184eda2e9508c0ca1329c74703c64095
diff --git a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1 b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1
index 8795b120ee79..a62cf62eb2a0 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1
+++ b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-base/keditbookmarks-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krusader/krusader-2.4.0-beta1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=23e3fbfe3cf6b949287b541037d6fef6
diff --git a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1-r1 b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1-r1
index d7ea93d387d7..4f706df2fec0 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1-r1
+++ b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-base/keditbookmarks-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krusader/krusader-2.4.0-beta1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a76e74b399b6bc4d1a94e9ae7f8c8e6a
diff --git a/metadata/md5-cache/kde-misc/kshutdown-2.0 b/metadata/md5-cache/kde-misc/kshutdown-2.0
index e58a946444a3..1735e13d250b 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-2.0
+++ b/metadata/md5-cache/kde-misc/kshutdown-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-2.0.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8cc89a4c03834a677d33183c2f407fe4
diff --git a/metadata/md5-cache/kde-misc/kshutdown-3.0_beta3 b/metadata/md5-cache/kde-misc/kshutdown-3.0_beta3
index 8ace7708993f..3195272a9cb7 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-3.0_beta3
+++ b/metadata/md5-cache/kde-misc/kshutdown-3.0_beta3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_bg(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-3.0beta3.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dd3e6d7fb022f7858f69c45a0886ad9e
diff --git a/metadata/md5-cache/kde-misc/ktouchpadenabler-0.1.0 b/metadata/md5-cache/kde-misc/ktouchpadenabler-0.1.0
index 4b83e4c58149..22691adb6c4e 100644
--- a/metadata/md5-cache/kde-misc/ktouchpadenabler-0.1.0
+++ b/metadata/md5-cache/kde-misc/ktouchpadenabler-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXi >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/extragear/ktouchpadenabler-0.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=831d9b98f913aabb973b85221d1af9c0
diff --git a/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1 b/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
index d9d6847e2fd6..d3aba6a35173 100644
--- a/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
+++ b/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/ktrafficanalyze/KTrafficAnalyzer-0.5.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8ebc7f3bdbbf43fd0d6bc46aa1958de0
diff --git a/metadata/md5-cache/kde-misc/kvkbd-0.6 b/metadata/md5-cache/kde-misc/kvkbd-0.6
index 5ea2fc263281..3e504ad53ab1 100644
--- a/metadata/md5-cache/kde-misc/kvkbd-0.6
+++ b/metadata/md5-cache/kde-misc/kvkbd-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/94374-kvkbd-0.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f247d212fe188f6fa155408b7a1b1292
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.2.0 b/metadata/md5-cache/kde-misc/kwebkitpart-1.2.0
index cbbdf2c694af..40b5e5678b77 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.2.0
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~thev00d00/distfiles/kde-misc/kwebkitpart-1.2.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=211080dac941d8cca2491967cb7a3ede
diff --git a/metadata/md5-cache/kde-misc/miniplayer-2.3 b/metadata/md5-cache/kde-misc/miniplayer-2.3
index bd8010a511fb..347cdb481a86 100644
--- a/metadata/md5-cache/kde-misc/miniplayer-2.3
+++ b/metadata/md5-cache/kde-misc/miniplayer-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/95501-miniplayer-2.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ae64f3bb7066dc5d293877bd9ade00b
diff --git a/metadata/md5-cache/kde-misc/miniplayer-2.4 b/metadata/md5-cache/kde-misc/miniplayer-2.4
index 4a6ab0c8611d..9fef3111d4e2 100644
--- a/metadata/md5-cache/kde-misc/miniplayer-2.4
+++ b/metadata/md5-cache/kde-misc/miniplayer-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/95501-miniplayer-2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6096f504f0395a1b50e69ea75aa5391f
diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.8_p20110714 b/metadata/md5-cache/kde-misc/networkmanagement-0.8_p20110714
index 1e324538fe24..85bb0dd3675d 100644
--- a/metadata/md5-cache/kde-misc/networkmanagement-0.8_p20110714
+++ b/metadata/md5-cache/kde-misc/networkmanagement-0.8_p20110714
@@ -10,5 +10,5 @@ RDEPEND=net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.8.2-
 RESTRICT=test
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/knetworkmanager-4.4.0_p20110714.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cf3a061df76b03c2dc95aed6a63a436d
diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.3 b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.3
index 26614322b9eb..e7f96b12e337 100644
--- a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.3
+++ b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-base/solid-4.6:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ar(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fi(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sr@latin(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/networkmanagement/0.9.0.3/src/networkmanagement-0.9.0.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6a9e16c8a01c622e1751b13f70687f3e
diff --git a/metadata/md5-cache/kde-misc/nightmode-0.3 b/metadata/md5-cache/kde-misc/nightmode-0.3
index 0c59d9e94d4c..ced1e1ffd6fe 100644
--- a/metadata/md5-cache/kde-misc/nightmode-0.3
+++ b/metadata/md5-cache/kde-misc/nightmode-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://static.davidedmundson.co.uk/nightmode_0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=755bd5f3f3776a13ea29ab5d056f087e
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0
index bd426a777b82..f7ec081e1ef2 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71bd3e30ec63bab042046257d5d1df9d
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25 b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25
index 8754d29cd147..b5717868d8b0 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25
+++ b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://cdlszm.org/downloads/plasma-applet-daisy-0.0.4.25.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a44e1ee680b19d8cf9681ef7b9faa5e
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25-r1 b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25-r1
index 2d933e280794..c5cf49890975 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25-r1
+++ b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.25-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://cdlszm.org/downloads/plasma-applet-daisy-0.0.4.25.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=83beaaa4565794807e05887a1353d337
diff --git a/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.2 b/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.2
index 2046303bd9dd..1ed6dc051b39 100644
--- a/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.2
+++ b/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-look.org/CONTENT/content-files/132350-mpdnowplaying-0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3ab03e18e1c8a97075622f4a6c76dfaf
diff --git a/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1 b/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
index f0ec429e5e2e..d119fbe2e6b5 100644
--- a/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
+++ b/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://downloads.sourceforge.net/project/pa-net-stat/plasma-network-status-0.1.1-Source.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3e53ee49dbff3b04d6a99944a619b1fa
diff --git a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.17 b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.17
index 70240388466b..626a9de0ee91 100644
--- a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.17
+++ b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdbusmenu-qt-0.6.0 >=dev-libs/qjson-0.7.1 x11-libs/qt-dbus:
 RESTRICT=test
 SLOT=4
 SRC_URI=http://launchpad.net/plasma-widget-menubar/trunk/0.1.17/+download/plasma-widget-menubar-0.1.17.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a0f02efc8cffbaa12699dc02ef374d4
diff --git a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.18 b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.18
index e9828e7eaf4f..ebeab9cd64f5 100644
--- a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.18
+++ b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.1.18
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdbusmenu-qt-0.6.0 >=dev-libs/qjson-0.7.1 !kde-misc/plasma-
 RESTRICT=test
 SLOT=4
 SRC_URI=http://launchpad.net/plasma-widget-menubar/trunk/0.1.18/+download/plasma-widget-menubar-0.1.18.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a2112a5596165a630814908ea784e45
diff --git a/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8 b/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
index 4e7447784052..f0f65d06f2cd 100644
--- a/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
+++ b/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdbusmenu-qt-0.3.0 >=dev-libs/libindicate-qt-0.2.5 >=kde-ba
 RESTRICT=test
 SLOT=4
 SRC_URI=http://launchpad.net/plasma-widget-message-indicator/trunk/0.5.8/+download/plasma-widget-message-indicator-0.5.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3cead5672a4a45dea6be5e0f427d4b94
diff --git a/metadata/md5-cache/kde-misc/plasmatvgr-0.47 b/metadata/md5-cache/kde-misc/plasmatvgr-0.47
index b481cb06c88b..d193e1c7d684 100644
--- a/metadata/md5-cache/kde-misc/plasmatvgr-0.47
+++ b/metadata/md5-cache/kde-misc/plasmatvgr-0.47
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/75728-plasmatvgr047.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5b75c1df964f3326a5d2b0a8d54f8ce9
diff --git a/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127 b/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
index 92fa5432fc83..c19c0c8d53a2 100644
--- a/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+++ b/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20101127
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-auth/polkit-kde-agent-0.98_pre >=sys-auth/polkit-qt-0.98_pre >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://gentoo/polkit-kde-kcmodules-1-0.98_pre20101127.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=21fe304850aee2ef1636152597b0ae00
diff --git a/metadata/md5-cache/kde-misc/qtrans-0.2.2.6 b/metadata/md5-cache/kde-misc/qtrans-0.2.2.6
index da20eb5c0d9f..7ef26215dce8 100644
--- a/metadata/md5-cache/kde-misc/qtrans-0.2.2.6
+++ b/metadata/md5-cache/kde-misc/qtrans-0.2.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/74876-qtrans-0.2.2.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e4cdf67f8da71a1007ee5b7594c27ef3
diff --git a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4 b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4
index d7001edf53ff..04d360db8d50 100644
--- a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4
+++ b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/konsole-4.4:4[aqua=] >=kde-base/libkonq-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kb.ccchl.de/quadkonsole4/quadkonsole4-0.4.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b3ed90cb082c7ea393205ff123f5b147
diff --git a/metadata/md5-cache/kde-misc/quickaccess-0.8.1b b/metadata/md5-cache/kde-misc/quickaccess-0.8.1b
index a2c09be221d0..d1e4099579c6 100644
--- a/metadata/md5-cache/kde-misc/quickaccess-0.8.1b
+++ b/metadata/md5-cache/kde-misc/quickaccess-0.8.1b
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/134442-plasma-widget-quickaccess-KDE4.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3eac712f9269ec70d72ac77a50f05c3a
diff --git a/metadata/md5-cache/kde-misc/quickaccess-0.8.2 b/metadata/md5-cache/kde-misc/quickaccess-0.8.2
index e301dea8aa44..9165e2b2a0ae 100644
--- a/metadata/md5-cache/kde-misc/quickaccess-0.8.2
+++ b/metadata/md5-cache/kde-misc/quickaccess-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/134442-plasma-widget-quickaccess-0.8.2-2.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8eb7f625f69d46b47a4a90e3953b6f48
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.11 b/metadata/md5-cache/kde-misc/rsibreak-0.11
index 42ea28d04f9f..98096b954404 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.11
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/knotify-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ml? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ml(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.rsibreak.org/files/rsibreak-0.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5e46d73817311b0fa677943f972f26df
diff --git a/metadata/md5-cache/kde-misc/semantik-0.7.3_p20091013 b/metadata/md5-cache/kde-misc/semantik-0.7.3_p20091013
index f378a98e1277..7997d191832a 100644
--- a/metadata/md5-cache/kde-misc/semantik-0.7.3_p20091013
+++ b/metadata/md5-cache/kde-misc/semantik-0.7.3_p20091013
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-xmlpatterns dev-lang/python[xml] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://semantik.googlecode.com/files/semantik-snapshot.tar.bz2 -> semantik-0.7.3_p20091013.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	waf-utils	c8866e3643d3746e746026c4b2c3f953
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	waf-utils	c8866e3643d3746e746026c4b2c3f953
 _md5_=800688e576c28d7314aa8286ec2bdd76
diff --git a/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1 b/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
index 562fb5c2cf40..4543a53c4a9b 100644
--- a/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
+++ b/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/101336-serverstatuswidget-1.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=695f9ae91643b7a660c583947feaba4d
diff --git a/metadata/md5-cache/kde-misc/skanlite-0.8 b/metadata/md5-cache/kde-misc/skanlite-0.8
index e6d7e43d371e..47f81a74a5ae 100644
--- a/metadata/md5-cache/kde-misc/skanlite-0.8
+++ b/metadata/md5-cache/kde-misc/skanlite-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libksane-4.6:4[aqua=] >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_be? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_be(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_eu(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sk(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sq(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.6:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/skanlite/0.8.0/src/skanlite-0.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5930a3da491326b296e6087132bd76c6
diff --git a/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130 b/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
index 83a1bec25519..737930cc80f7 100644
--- a/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
+++ b/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libtaskmanager-4.8:4[aqua=] >=kde-base/plasma-workspace-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_hu(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/smooth-tasks-0_p20120130.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a00ac2e1fffd431c4de62cdeee392cde
diff --git a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4 b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4
index 4d7eb623b34b..f47cb09c7ec1 100644
--- a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4
+++ b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/141713-steamcompanion.tar.gz -> steamcompanion-0.5.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d7467df9a1ab7ec0afc8a031500022df
diff --git a/metadata/md5-cache/kde-misc/stock-quote-2.1 b/metadata/md5-cache/kde-misc/stock-quote-2.1
index 14ca4d5662c6..1740e0a9c169 100644
--- a/metadata/md5-cache/kde-misc/stock-quote-2.1
+++ b/metadata/md5-cache/kde-misc/stock-quote-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/90695-plasma_stock_quote-2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=252f3798fc86022341bf522833343137
diff --git a/metadata/md5-cache/kde-misc/synaptiks-0.8.1 b/metadata/md5-cache/kde-misc/synaptiks-0.8.1
index 0b2c5e72d2b6..7d744d59b59d 100644
--- a/metadata/md5-cache/kde-misc/synaptiks-0.8.1
+++ b/metadata/md5-cache/kde-misc/synaptiks-0.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( >=dev-lang/python-2.7 dev-python/argparse ) >=dev-python/PyQt4-4.7 >=dev-python/pyudev-0.8[pyqt4] dev-python/setuptools >=kde-base/pykde4-4.4:4[aqua=] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=x11-drivers/xf86-input-synaptics-1.3 >=x11-libs/libXi-1.4 x11-libs/libXtst upower? ( dev-python/dbus-python sys-power/upower ) >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://pypi/s/synaptiks/synaptiks-0.8.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3a12dc36a3367ccea14f0d77e62bb680
diff --git a/metadata/md5-cache/kde-misc/takeoff-1.0 b/metadata/md5-cache/kde-misc/takeoff-1.0
index a50458078c1a..d99227f98a8d 100644
--- a/metadata/md5-cache/kde-misc/takeoff-1.0
+++ b/metadata/md5-cache/kde-misc/takeoff-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.8:4[aqua=] >=kde-base/oxygen-icons-4.8:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ca(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_es(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_el(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_ru(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.8:4[aqua=,linguas_tr(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=https://takeoff-launcher.googlecode.com/files/takeoff-1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ef80a7b83aa56d2e109fe2b5a3c4b699
diff --git a/metadata/md5-cache/kde-misc/tellico-2.3.5 b/metadata/md5-cache/kde-misc/tellico-2.3.5
index 42c9f90f2ecd..83c3e0d8d10e 100644
--- a/metadata/md5-cache/kde-misc/tellico-2.3.5
+++ b/metadata/md5-cache/kde-misc/tellico-2.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson >=kde-base/kdelibs-4.4:
 RESTRICT=test
 SLOT=4
 SRC_URI=http://tellico-project.org/files/tellico-2.3.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a8d88ff474a1ce6ec58b961194893266
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-1.3.4 b/metadata/md5-cache/kde-misc/wacomtablet-1.3.4
index f1c58b5ed27c..219cb23c7181 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-1.3.4
+++ b/metadata/md5-cache/kde-misc/wacomtablet-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-drivers/xf86-input-wacom-0.11.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=91fbd6293828437c3d8771c51363d14f
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-1.3.6 b/metadata/md5-cache/kde-misc/wacomtablet-1.3.6
index 0100f65cd43f..864bff872ea6 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-1.3.6
+++ b/metadata/md5-cache/kde-misc/wacomtablet-1.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-drivers/xf86-input-wacom-0.11.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=112405443c118691daaae61312190c95
diff --git a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.0 b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.0
index de8712477760..a397d735adfd 100644
--- a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.0
+++ b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/wicd >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-apps.org/CONTENT/content-files/132366-wicd-kde-0.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5fbcc3c52428b1d19b586c143b026c70
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.8 b/metadata/md5-cache/kde-misc/yakuake-2.9.8
index 1024a118bfbc..438d524582c4 100644
--- a/metadata/md5-cache/kde-misc/yakuake-2.9.8
+++ b/metadata/md5-cache/kde-misc/yakuake-2.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-base/konsole-4.4:4[aqua=] sys-devel/gettext >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/yakuake/2.9.8/src/yakuake-2.9.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9352657b507679954c3d45ca01e53cce
diff --git a/metadata/md5-cache/kde-misc/yawp-0.4.3 b/metadata/md5-cache/kde-misc/yawp-0.4.3
index b3b7e4e15e93..5f2f0f89efce 100644
--- a/metadata/md5-cache/kde-misc/yawp-0.4.3
+++ b/metadata/md5-cache/kde-misc/yawp-0.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/yawp/yawp-0.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7cd626281d5c1ff43c70ab22b74c78af
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.2.1 b/metadata/md5-cache/kde-misc/zanshin-0.2.1
index 825ce5b6fcf0..bad7e008cb4a 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.2.1
+++ b/metadata/md5-cache/kde-misc/zanshin-0.2.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-base/kdepim-runtime-4.6.0:4[aqua=] dev-libs/boost >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://files.kde.org/zanshin/zanshin-0.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e9d66be964e000c91f3b4e60df946a37
diff --git a/metadata/md5-cache/mail-client/alpine-2.00 b/metadata/md5-cache/mail-client/alpine-2.00
index 623acee4627e..a44d77b50c8f 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00
+++ b/metadata/md5-cache/mail-client/alpine-2.00
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-64 ) app-misc/mime-types !onlyalpine? ( !app-editors/pico ) !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-26-all.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16a932fe2e5980a47814da8afb43a81a
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r1 b/metadata/md5-cache/mail-client/alpine-2.00-r1
index 01e1bcf4dd1c..a270580ac3e1 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r1
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-64 ) app-misc/mime-types !onlyalpine? ( !app-editors/pico ) !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-51-all.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04e3bae9ee356da38943d167bac64c55
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r2 b/metadata/md5-cache/mail-client/alpine-2.00-r2
index 8b181eac687a..c7ae71743402 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r2
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-64 ) app-misc/mime-types !onlyalpine? ( !app-editors/pico ) !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-52-all.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0eead7c1a05585570b94d9c22c7063d8
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r3 b/metadata/md5-cache/mail-client/alpine-2.00-r3
index 55c540aeee92..06f1b4a7ce67 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r3
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-72 ) app-misc/mime-types !onlyalpine? ( !app-editors/pico ) !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-53-all.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0421fb44a94250bc23c3cf410317689d
diff --git a/metadata/md5-cache/mail-client/alpine-2.00-r4 b/metadata/md5-cache/mail-client/alpine-2.00-r4
index 618c89f03acc..db519cbab4d9 100644
--- a/metadata/md5-cache/mail-client/alpine-2.00-r4
+++ b/metadata/md5-cache/mail-client/alpine-2.00-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-libs/ncurses-5.1 ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( app-crypt/mit-krb5 ) spell? ( app-text/aspell ) topal? ( >=net-mail/topal-72 ) app-misc/mime-types !onlyalpine? ( !app-editors/pico ) !onlyalpine? ( !mail-client/pine ) !<=net-mail/uw-imap-2004g
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.bz2 chappa? ( http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/all.patch.gz -> alpine-2.00-chappa-73-all.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fff3ad048cf61ca2a95814d763c5de9
diff --git a/metadata/md5-cache/mail-client/evolution-2.32.2-r3 b/metadata/md5-cache/mail-client/evolution-2.32.2-r3
index 13120b60e64e..24ce236c338e 100644
--- a/metadata/md5-cache/mail-client/evolution-2.32.2-r3
+++ b/metadata/md5-cache/mail-client/evolution-2.32.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 OPENLDAP
 RDEPEND=>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.2[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/2.32/evolution-2.32.2.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.2-patches-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=489ee026661ad09f95ef64f6395f7762
diff --git a/metadata/md5-cache/mail-client/evolution-2.32.3 b/metadata/md5-cache/mail-client/evolution-2.32.3
index 382b571ab6ff..d64b4df7ed0b 100644
--- a/metadata/md5-cache/mail-client/evolution-2.32.3
+++ b/metadata/md5-cache/mail-client/evolution-2.32.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 OPENLDAP
 RDEPEND=>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/2.32/evolution-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.3-patches.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91c1a40a1c97183c89e27d420b7aac35
diff --git a/metadata/md5-cache/mail-client/evolution-2.32.3-r1 b/metadata/md5-cache/mail-client/evolution-2.32.3-r1
index ab0a0c118527..94ac8f2cd1ab 100644
--- a/metadata/md5-cache/mail-client/evolution-2.32.3-r1
+++ b/metadata/md5-cache/mail-client/evolution-2.32.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 OPENLDAP
 RDEPEND=>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/2.32/evolution-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.3-patches.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b534f832e4ee19b66c7f7397617419f
diff --git a/metadata/md5-cache/mail-client/evolution-3.2.3 b/metadata/md5-cache/mail-client/evolution-3.2.3
index 4c6a0a56e113..ac3db07a0f03 100644
--- a/metadata/md5-cache/mail-client/evolution-3.2.3
+++ b/metadata/md5-cache/mail-client/evolution-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0
 REQUIRED_USE=map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.2/evolution-3.2.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f7f560fecf083b35f27d9da93596257
diff --git a/metadata/md5-cache/mail-client/evolution-3.2.3-r1 b/metadata/md5-cache/mail-client/evolution-3.2.3-r1
index 854a7adc4801..051f2ddc9b4f 100644
--- a/metadata/md5-cache/mail-client/evolution-3.2.3-r1
+++ b/metadata/md5-cache/mail-client/evolution-3.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0
 REQUIRED_USE=map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.2/evolution-3.2.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=70c6e77283eb6b2f16663c3e1c7f5592
diff --git a/metadata/md5-cache/mail-client/evolution-3.4.1 b/metadata/md5-cache/mail-client/evolution-3.4.1
index 6cfdd4c28950..a5999c9bf08c 100644
--- a/metadata/md5-cache/mail-client/evolution-3.4.1
+++ b/metadata/md5-cache/mail-client/evolution-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2
 REQUIRED_USE=map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.4/evolution-3.4.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01e8b1a2c348ab389f940c133242e04c
diff --git a/metadata/md5-cache/mail-client/evolution-3.4.2 b/metadata/md5-cache/mail-client/evolution-3.4.2
index 61faf184a423..e96d39ea3cdd 100644
--- a/metadata/md5-cache/mail-client/evolution-3.4.2
+++ b/metadata/md5-cache/mail-client/evolution-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2
 REQUIRED_USE=map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.4/evolution-3.4.2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=540f9d133901025ec27f4863f761ae9b
diff --git a/metadata/md5-cache/mail-client/evolution-3.4.3 b/metadata/md5-cache/mail-client/evolution-3.4.3
new file mode 100644
index 000000000000..fe7faec9705a
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2.0:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.4.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.12.0 >=media-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.20.10 app-text/scrollkeeper >=dev-util/intltool-0.40.0 sys-devel/bison >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=4
+HOMEPAGE=http://www.gnome.org/projects/evolution/
+IUSE=clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 OPENLDAP
+RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.2.0:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.4.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.12.0 >=media-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+REQUIRED_USE=map? ( clutter ) connman? ( !networkmanager ) networkmanager? ( !connman )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.4/evolution-3.4.3.tar.xz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e8466ebe55bbdf8d92cc09744cea9656
diff --git a/metadata/md5-cache/mail-client/mail-notification-5.4-r4 b/metadata/md5-cache/mail-client/mail-notification-5.4-r4
index 0f5ad515ab9e..bf20dd61b6a1 100644
--- a/metadata/md5-cache/mail-client/mail-notification-5.4-r4
+++ b/metadata/md5-cache/mail-client/mail-notification-5.4-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.14 >=gnome-base/gconf-2.4.0 >=gnome-base/gconf-2.6 >=gnome-base/libgnomeui-2.14 >=gnome-base/libglade-2.0 dev-libs/dbus-glib dev-libs/gmime:2.4 >=x11-libs/libnotify-0.4.1 pop? ( gnome-base/gnome-keyring ) imap? ( gnome-base/gnome-keyring ) gmail? ( gnome-base/gnome-keyring ) ssl? ( >=dev-libs/openssl-0.9.6 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) evo? ( >=mail-client/evolution-2.24 ) sylpheed? ( mail-client/sylpheed )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/mailnotify/mail-notification-5.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4592947f7d464c5f12b2f213ed748659
diff --git a/metadata/md5-cache/mail-client/mail-notification-5.4-r5 b/metadata/md5-cache/mail-client/mail-notification-5.4-r5
index dc3aa62cc4ed..c2d5a9ca56de 100644
--- a/metadata/md5-cache/mail-client/mail-notification-5.4-r5
+++ b/metadata/md5-cache/mail-client/mail-notification-5.4-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.14 >=gnome-base/gconf-2.4.0 >=gnome-base/gconf-2.6 >=gnome-base/libgnomeui-2.14 >=gnome-base/libglade-2.0 dev-libs/dbus-glib dev-libs/gmime:2.4 >=x11-libs/libnotify-0.4.1 pop? ( gnome-base/gnome-keyring ) imap? ( gnome-base/gnome-keyring ) gmail? ( gnome-base/gnome-keyring ) ssl? ( >=dev-libs/openssl-0.9.6 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) evo? ( >=mail-client/evolution-2.24 ) sylpheed? ( mail-client/sylpheed )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/mailnotify/mail-notification-5.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c17b905c60d8ec306f753e7a9f0a63f4
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r1 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r1
index 8bdf7f8db750..d52ad9763a6f 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r1
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7e96243f3276d9c42c8b38862489bd2
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r3 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r3
index a0442a0e3c15..ba21a6061867 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r3
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r3
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=331348a675c24333187115591738c12e
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
index c6237d1732bc..126a3421b987 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d017cc637a57cde0e872f51d7697a0e
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r1 b/metadata/md5-cache/mail-client/mutt-1.5.21-r1
index f370c5f77414..d1b8005620b7 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e11e6a82438ac752c3ac184e15c1db59
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r10 b/metadata/md5-cache/mail-client/mutt-1.5.21-r10
index 6c2b30e5d699..6db78d3f72ea 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r10
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r13.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70767b0c93790b097ded4d09754c4b89
diff --git a/metadata/md5-cache/mail-client/mutt-1.5.21-r9 b/metadata/md5-cache/mail-client/mutt-1.5.21-r9
index 4f4fd9a4215c..62dffa577109 100644
--- a/metadata/md5-cache/mail-client/mutt-1.5.21-r9
+++ b/metadata/md5-cache/mail-client/mutt-1.5.21-r9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r12.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r12.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1aca41ddd44bd7ed6d29e9681d96e51
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0.4 b/metadata/md5-cache/mail-client/thunderbird-10.0.4
index 200fba6015eb..3bd9cc7ac9bc 100644
--- a/metadata/md5-cache/mail-client/thunderbird-10.0.4
+++ b/metadata/md5-cache/mail-client/thunderbird-10.0.4
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.4esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.4esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.4esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.4esr/source/thunderbird-10.0.4esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09f0941208c3542f758b649027b65e5b
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0.5 b/metadata/md5-cache/mail-client/thunderbird-10.0.5
index 697b18940b5e..e30e21b2ea99 100644
--- a/metadata/md5-cache/mail-client/thunderbird-10.0.5
+++ b/metadata/md5-cache/mail-client/thunderbird-10.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.9[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.5esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.5esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.5esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.5esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.5esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.5esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.5esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.5esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.5esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.5esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.5esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.5esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.5esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.5esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.5esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.5esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.5esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.5esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.5esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.5esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.5esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.5esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.5esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.5esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.5esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.5esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.5esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.5esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.5esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.5esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.5esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.5esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.5esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.5esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.5esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.5esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.5esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.5esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.5esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.5esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.5esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.5esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.5esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.5esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.5esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.5esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.5esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.5esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.5esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.5esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.5esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.5esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.5esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.5esr/source/thunderbird-10.0.5esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b859162cc51eaa81807d85901a2158e
diff --git a/metadata/md5-cache/mail-client/thunderbird-13.0 b/metadata/md5-cache/mail-client/thunderbird-13.0
index d6619e26a828..a10c2fc82caf 100644
--- a/metadata/md5-cache/mail-client/thunderbird-13.0
+++ b/metadata/md5-cache/mail-client/thunderbird-13.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.9[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ar.xpi -> thunderbird-13.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ast.xpi -> thunderbird-13.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/be.xpi -> thunderbird-13.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/bg.xpi -> thunderbird-13.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-13.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/br.xpi -> thunderbird-13.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ca.xpi -> thunderbird-13.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/cs.xpi -> thunderbird-13.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/da.xpi -> thunderbird-13.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/de.xpi -> thunderbird-13.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/el.xpi -> thunderbird-13.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/en-GB.xpi -> thunderbird-13.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/es-AR.xpi -> thunderbird-13.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/es-ES.xpi -> thunderbird-13.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/et.xpi -> thunderbird-13.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/eu.xpi -> thunderbird-13.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/fi.xpi -> thunderbird-13.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/fr.xpi -> thunderbird-13.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-13.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-13.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/gd.xpi -> thunderbird-13.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/gl.xpi -> thunderbird-13.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/he.xpi -> thunderbird-13.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/hu.xpi -> thunderbird-13.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/id.xpi -> thunderbird-13.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/is.xpi -> thunderbird-13.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/it.xpi -> thunderbird-13.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ja.xpi -> thunderbird-13.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ko.xpi -> thunderbird-13.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/lt.xpi -> thunderbird-13.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-13.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/nl.xpi -> thunderbird-13.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-13.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-13.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/pl.xpi -> thunderbird-13.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-13.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-13.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/rm.xpi -> thunderbird-13.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ro.xpi -> thunderbird-13.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ru.xpi -> thunderbird-13.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/si.xpi -> thunderbird-13.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/sk.xpi -> thunderbird-13.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/sl.xpi -> thunderbird-13.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/sq.xpi -> thunderbird-13.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/sr.xpi -> thunderbird-13.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-13.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-13.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/tr.xpi -> thunderbird-13.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/uk.xpi -> thunderbird-13.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/vi.xpi -> thunderbird-13.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-13.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//13.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-13.0-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/13.0/source/thunderbird-13.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-13.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-13.0-patches-0.2.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7ad97cbfdaf2e81765b70c501896d67
diff --git a/metadata/md5-cache/mail-client/thunderbird-3.1.12 b/metadata/md5-cache/mail-client/thunderbird-3.1.12
index f1026f698f82..bb0268611029 100644
--- a/metadata/md5-cache/mail-client/thunderbird-3.1.12
+++ b/metadata/md5-cache/mail-client/thunderbird-3.1.12
@@ -10,5 +10,5 @@ PDEPEND=crypt? ( >=x11-plugins/enigmail-1.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/source/thunderbird-3.1.12.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/af.xpi -> thunderbird-3.1.12-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ar.xpi -> thunderbird-3.1.12-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/be.xpi -> thunderbird-3.1.12-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bg.xpi -> thunderbird-3.1.12-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.12-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.12-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ca.xpi -> thunderbird-3.1.12-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/cs.xpi -> thunderbird-3.1.12-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/da.xpi -> thunderbird-3.1.12-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/de.xpi -> thunderbird-3.1.12-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/el.xpi -> thunderbird-3.1.12-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.12-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.12-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.12-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.12-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/et.xpi -> thunderbird-3.1.12-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/eu.xpi -> thunderbird-3.1.12-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fi.xpi -> thunderbird-3.1.12-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fr.xpi -> thunderbird-3.1.12-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.12-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.12-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.12-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.12-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/he.xpi -> thunderbird-3.1.12-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/hu.xpi -> thunderbird-3.1.12-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/id.xpi -> thunderbird-3.1.12-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/is.xpi -> thunderbird-3.1.12-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/it.xpi -> thunderbird-3.1.12-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ja.xpi -> thunderbird-3.1.12-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ko.xpi -> thunderbird-3.1.12-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/lt.xpi -> thunderbird-3.1.12-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.12-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.12-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nl.xpi -> thunderbird-3.1.12-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.12-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.12-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.12-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.12-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pl.xpi -> thunderbird-3.1.12-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.12-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.12-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.12-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ro.xpi -> thunderbird-3.1.12-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ru.xpi -> thunderbird-3.1.12-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/si.xpi -> thunderbird-3.1.12-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sk.xpi -> thunderbird-3.1.12-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sl.xpi -> thunderbird-3.1.12-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sq.xpi -> thunderbird-3.1.12-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.12-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.12-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/tr.xpi -> thunderbird-3.1.12-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/uk.xpi -> thunderbird-3.1.12-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.12-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.12-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.12-zh-TW.xpi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b16a0bf87f5919c3a5fde571dbefd44e
diff --git a/metadata/md5-cache/mail-client/thunderbird-3.1.14 b/metadata/md5-cache/mail-client/thunderbird-3.1.14
index b3b20947c2f8..52b64affa05f 100644
--- a/metadata/md5-cache/mail-client/thunderbird-3.1.14
+++ b/metadata/md5-cache/mail-client/thunderbird-3.1.14
@@ -10,5 +10,5 @@ PDEPEND=crypt? ( >=x11-plugins/enigmail-1.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/source/thunderbird-3.1.14.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/af.xpi -> thunderbird-3.1.14-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ar.xpi -> thunderbird-3.1.14-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/be.xpi -> thunderbird-3.1.14-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bg.xpi -> thunderbird-3.1.14-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.14-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.14-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ca.xpi -> thunderbird-3.1.14-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/cs.xpi -> thunderbird-3.1.14-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/da.xpi -> thunderbird-3.1.14-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/de.xpi -> thunderbird-3.1.14-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/el.xpi -> thunderbird-3.1.14-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.14-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.14-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.14-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.14-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/et.xpi -> thunderbird-3.1.14-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/eu.xpi -> thunderbird-3.1.14-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fi.xpi -> thunderbird-3.1.14-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fr.xpi -> thunderbird-3.1.14-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.14-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.14-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.14-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.14-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/he.xpi -> thunderbird-3.1.14-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/hu.xpi -> thunderbird-3.1.14-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/id.xpi -> thunderbird-3.1.14-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/is.xpi -> thunderbird-3.1.14-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/it.xpi -> thunderbird-3.1.14-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ja.xpi -> thunderbird-3.1.14-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ko.xpi -> thunderbird-3.1.14-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/lt.xpi -> thunderbird-3.1.14-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.14-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.14-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nl.xpi -> thunderbird-3.1.14-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.14-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.14-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.14-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.14-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pl.xpi -> thunderbird-3.1.14-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.14-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.14-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.14-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ro.xpi -> thunderbird-3.1.14-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ru.xpi -> thunderbird-3.1.14-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/si.xpi -> thunderbird-3.1.14-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sk.xpi -> thunderbird-3.1.14-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sl.xpi -> thunderbird-3.1.14-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sq.xpi -> thunderbird-3.1.14-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.14-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.14-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/tr.xpi -> thunderbird-3.1.14-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/uk.xpi -> thunderbird-3.1.14-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.14-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.14-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.14-zh-TW.xpi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05b2768bff9502e86c5f0f75006ba359
diff --git a/metadata/md5-cache/mail-filter/anubis-4.1.1 b/metadata/md5-cache/mail-filter/anubis-4.1.1
index ec8cf03c07cc..c8775533c690 100644
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1
+++ b/metadata/md5-cache/mail-filter/anubis-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/g
 REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
 SLOT=0
 SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8065be12febf47f9ef6163ec44d3ef1e
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.2 b/metadata/md5-cache/mail-filter/bogofilter-1.2.2
index 386e7971a96d..240a6ef4fc03 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.2
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv berkdb? ( >=sys-libs/db-3.2 ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2 ) ) ) sci-libs/gsl
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.2.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5473be45365736f2b861babaa1fc7c4
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.102 b/metadata/md5-cache/mail-filter/dcc-1.3.102
index 51452c6b3af6..937ddc8f9ceb 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.102
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.102
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( mail-filter/libmilter )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.102.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b895234ec46f9f4c6508a25aa64c4db7
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.119 b/metadata/md5-cache/mail-filter/dcc-1.3.119
index 8fc92c676213..31454865a818 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.119
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.119
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( mail-filter/libmilter )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.119.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=543843e65e8b36c3dfacc7bf09fc9baf
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.119-r1 b/metadata/md5-cache/mail-filter/dcc-1.3.119-r1
index 461afc395e1b..84475209ec21 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.119-r1
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.119-r1
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( mail-filter/libmilter )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.119.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e059901f4114a7a0add956176d456318
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.135 b/metadata/md5-cache/mail-filter/dcc-1.3.135
index 1d45a57f97af..3736d0c9328c 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.135
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.135
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( mail-filter/libmilter )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.135.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a1aabf4968ffdbb11e55e578409a084
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.140-r1 b/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
index 64c031fe2b8c..e2fd30abfdbd 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.140-r1
@@ -9,5 +9,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.140.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c86f3f7df81ecff7929d2f8f804a1679
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.55 b/metadata/md5-cache/mail-filter/dcc-1.3.55
index 6902a942ad2f..6b6294ea6d42 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.55
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.55
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/dcc-dccd-1.3.55.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fac4fe9f0e5da88123e2ee99ff63b58
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.97 b/metadata/md5-cache/mail-filter/dcc-1.3.97
index 32d816d0fd40..0000923c57b2 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.97
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.97
@@ -8,5 +8,5 @@ LICENSE=DCC
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( mail-filter/libmilter )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.97.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da006004add726d413a6cadc4ec84bab
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.5.4 b/metadata/md5-cache/mail-filter/maildrop-2.5.4
index 0ad2904aa1dc..0855d24b8b06 100644
--- a/metadata/md5-cache/mail-filter/maildrop-2.5.4
+++ b/metadata/md5-cache/mail-filter/maildrop-2.5.4
@@ -10,5 +10,5 @@ RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm
 REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/maildrop-2.5.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2af267a58f7caf11a075d3d5cd55d7b
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.5.5 b/metadata/md5-cache/mail-filter/maildrop-2.5.5
index e489c03b6cb9..e5b6930abf08 100644
--- a/metadata/md5-cache/mail-filter/maildrop-2.5.5
+++ b/metadata/md5-cache/mail-filter/maildrop-2.5.5
@@ -10,5 +10,5 @@ RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm
 REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/maildrop-2.5.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62518982ec0b910e89793c823e8cbb0f
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.5.5-r1 b/metadata/md5-cache/mail-filter/maildrop-2.5.5-r1
index 1874b94eb167..ac84b704462d 100644
--- a/metadata/md5-cache/mail-filter/maildrop-2.5.5-r1
+++ b/metadata/md5-cache/mail-filter/maildrop-2.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm
 REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/maildrop-2.5.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e8e27818ada05d718b99fca38411978
diff --git a/metadata/md5-cache/mail-filter/procmail-3.22-r10 b/metadata/md5-cache/mail-filter/procmail-3.22-r10
index f45a9a8337b6..bc31f0e871b8 100644
--- a/metadata/md5-cache/mail-filter/procmail-3.22-r10
+++ b/metadata/md5-cache/mail-filter/procmail-3.22-r10
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=selinux? ( sec-policy/selinux-procmail )
 SLOT=0
 SRC_URI=http://www.procmail.org/procmail-3.22.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2efd40a78bc763714e2c3c853adbf6a
diff --git a/metadata/md5-cache/mail-mta/courier-0.65.2 b/metadata/md5-cache/mail-mta/courier-0.65.2
index ef42dae6ff62..5b13981f1258 100644
--- a/metadata/md5-cache/mail-mta/courier-0.65.2
+++ b/metadata/md5-cache/mail-mta/courier-0.65.2
@@ -9,5 +9,5 @@ PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.61.0 >=dev-libs/openssl-0.9.6 >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql-base ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.65.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=022c388bda656855b9651899cc17b90d
diff --git a/metadata/md5-cache/mail-mta/courier-0.65.2-r1 b/metadata/md5-cache/mail-mta/courier-0.65.2-r1
index 84f71e3bc553..57375f8f0777 100644
--- a/metadata/md5-cache/mail-mta/courier-0.65.2-r1
+++ b/metadata/md5-cache/mail-mta/courier-0.65.2-r1
@@ -9,5 +9,5 @@ PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.61.0 >=dev-libs/openssl-0.9.6 >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql-base ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.65.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0e28e92b506438f1170c28035dc85db
diff --git a/metadata/md5-cache/mail-mta/courier-0.66.3 b/metadata/md5-cache/mail-mta/courier-0.66.3
index ba81a9603f10..68fba46a8d52 100644
--- a/metadata/md5-cache/mail-mta/courier-0.66.3
+++ b/metadata/md5-cache/mail-mta/courier-0.66.3
@@ -9,5 +9,5 @@ PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.61.0 !gnutls? ( >=dev-libs/openssl-0.9.6 ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql-base ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.66.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66778e542558d5b645c155085e4917f4
diff --git a/metadata/md5-cache/mail-mta/exim-4.76 b/metadata/md5-cache/mail-mta/exim-4.76
index a75446b3e68c..57ca23d8da35 100644
--- a/metadata/md5-cache/mail-mta/exim-4.76
+++ b/metadata/md5-cache/mail-mta/exim-4.76
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( sys-devel/libperl ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 ) gnutls? ( net-libs/gnutls dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.76.tar.bz2 mirror://gentoo/system_filter.exim.gz dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_469_dsn_1_3.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=421065756b1bd1d4bb6fd2dea8a181c1
diff --git a/metadata/md5-cache/mail-mta/exim-4.76-r1 b/metadata/md5-cache/mail-mta/exim-4.76-r1
index 8b7f9f29133b..bed34d39f0c3 100644
--- a/metadata/md5-cache/mail-mta/exim-4.76-r1
+++ b/metadata/md5-cache/mail-mta/exim-4.76-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( sys-devel/libperl ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 ) gnutls? ( net-libs/gnutls dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.76.tar.bz2 mirror://gentoo/system_filter.exim.gz dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_469_dsn_1_3.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ac3969b6677e62b604140c5699713f0
diff --git a/metadata/md5-cache/mail-mta/exim-4.77 b/metadata/md5-cache/mail-mta/exim-4.77
index 293aa46aa540..94b747a7c8f1 100644
--- a/metadata/md5-cache/mail-mta/exim-4.77
+++ b/metadata/md5-cache/mail-mta/exim-4.77
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( sys-devel/libperl ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 ) gnutls? ( net-libs/gnutls dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.77.tar.bz2 mirror://gentoo/system_filter.exim.gz dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_469_dsn_1_3.patch ) doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.77.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=540421fa55225da29f79613eb9eae2e4
diff --git a/metadata/md5-cache/mail-mta/exim-4.80 b/metadata/md5-cache/mail-mta/exim-4.80
index cb71ebf82b2d..e0549a04ad3c 100644
--- a/metadata/md5-cache/mail-mta/exim-4.80
+++ b/metadata/md5-cache/mail-mta/exim-4.80
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( sys-devel/libperl ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/pkgconfig virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.80.tar.bz2 mirror://gentoo/system_filter.exim.gz dsn? ( mirror://sourceforge/eximdsn/eximdsn-patch-1.3/exim_469_dsn_1_3.patch ) doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.80.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1ec92bc053dbdc8fc76605760a49611
diff --git a/metadata/md5-cache/mail-mta/mini-qmail-1.06 b/metadata/md5-cache/mail-mta/mini-qmail-1.06
index adb9adbaa90f..57893e1aab13 100644
--- a/metadata/md5-cache/mail-mta/mini-qmail-1.06
+++ b/metadata/md5-cache/mail-mta/mini-qmail-1.06
@@ -7,5 +7,5 @@ LICENSE=public-domain
 RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/maildrop !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz http://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90436544f0d95406df90ef56134174a6
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.05-r4 b/metadata/md5-cache/mail-mta/netqmail-1.05-r4
index 35bb98d7b5b1..2996a9eabc63 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.05-r4
+++ b/metadata/md5-cache/mail-mta/netqmail-1.05-r4
@@ -9,5 +9,5 @@ RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.05.tar.gz !vanilla? ( ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20060105.patch ) highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48b2df8550f273141ed04d26fbe48475
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.05-r8 b/metadata/md5-cache/mail-mta/netqmail-1.05-r8
index 47fd8f78e4e9..661b00ac446a 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.05-r8
+++ b/metadata/md5-cache/mail-mta/netqmail-1.05-r8
@@ -9,5 +9,5 @@ RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.05.tar.gz !vanilla? ( ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=caace75bfa8fd62dd96217019c4beea4
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06 b/metadata/md5-cache/mail-mta/netqmail-1.06
index ac90ccb24a42..54a6620fcdfe 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06
@@ -9,5 +9,5 @@ RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz http://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95c1f474c1b56e1782561b1b6417190a
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.05 b/metadata/md5-cache/mail-mta/nullmailer-1.05
index 8758a4ce2176..f32804626a39 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.05
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.05
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.05.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.04-1.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19000907787905d84b464c5e4926465a
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.06 b/metadata/md5-cache/mail-mta/nullmailer-1.06
index 2f05466f31b1..c88652b165bc 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.06
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.06
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.06.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.04-1.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=062edb17f8898dfb482a33d79f2e7773
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.10 b/metadata/md5-cache/mail-mta/nullmailer-1.10
index bd74816d8f3f..b4f53c7bd979 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.10
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.10.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.10-1.debian.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de497dad5d58117bd6b3269437bd5572
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.10-r1 b/metadata/md5-cache/mail-mta/nullmailer-1.10-r1
index d077ab21dc63..71f0b9799d2f 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.10-r1
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.10.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.10-1.debian.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=884d34f36ce6823c5cd62626932202cf
diff --git a/metadata/md5-cache/mail-mta/postfix-2.10_pre20120617 b/metadata/md5-cache/mail-mta/postfix-2.10_pre20120617
index 59a88fd15288..0070cb2bda99 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.10_pre20120617
+++ b/metadata/md5-cache/mail-mta/postfix-2.10_pre20120617
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120617.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f37debd956f88a3aa893efac0ff37760
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.10 b/metadata/md5-cache/mail-mta/postfix-2.7.10
index f5036a92acc7..62895fc771e7 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.10
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.10
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.10.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.7.8.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86535a7584b291ad79169ed5937bcda6
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.4 b/metadata/md5-cache/mail-mta/postfix-2.7.4
index 4ca00b7f05e0..65207ecc9aec 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.4
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.4
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.4.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-2.7.2.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73ef0419d7ab2a7695016405ba4e744b
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.5 b/metadata/md5-cache/mail-mta/postfix-2.7.5
index 8c2064eb5d47..979e261f09ca 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.5
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.5
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.5.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-2.7.2.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e3f6e855ea8620fc1393744e0dd874f
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.6 b/metadata/md5-cache/mail-mta/postfix-2.7.6
index 3d618c75d5e5..ce328f4752bb 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.6
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.6
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.6.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-2.7.2.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=680725f62563bc791df0cdeb51252a72
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.7 b/metadata/md5-cache/mail-mta/postfix-2.7.7
index 93e038895766..6222d7221ea6 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.7
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.7
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.7.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-2.7.2.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dc5c779fceb585743109e9675b5a587
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.8 b/metadata/md5-cache/mail-mta/postfix-2.7.8
index 3e5706f2cd81..ae1fc5e0c34a 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.8
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.8
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.8.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.7.8.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71f0c57f1e42a933fab22327fcb04321
diff --git a/metadata/md5-cache/mail-mta/postfix-2.7.9 b/metadata/md5-cache/mail-mta/postfix-2.7.9
index 4d64e1e2f602..d7f229b31d26 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.7.9
+++ b/metadata/md5-cache/mail-mta/postfix-2.7.9
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) ldap? ( >=net-nds/openldap-1.2 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.7.9.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.7.8.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f03d0484bcf3ce5a7c3ec064df263fc6
diff --git a/metadata/md5-cache/mail-mta/postfix-2.8.10 b/metadata/md5-cache/mail-mta/postfix-2.8.10
index c07511cf0c92..df19526bea68 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.8.10
+++ b/metadata/md5-cache/mail-mta/postfix-2.8.10
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 dev-lang/perl cdb? ( || ( >=dev
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.10.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.9.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9d476f6de67693fb7e84cb9b6159685
diff --git a/metadata/md5-cache/mail-mta/postfix-2.8.11 b/metadata/md5-cache/mail-mta/postfix-2.8.11
index 8c05115f5aa5..50e44c98a80a 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.8.11
+++ b/metadata/md5-cache/mail-mta/postfix-2.8.11
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 dev-lang/perl cdb? ( || ( >=dev
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.11.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.9.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f169ff5992ce15a4687fbdf41b5cba06
diff --git a/metadata/md5-cache/mail-mta/postfix-2.8.7 b/metadata/md5-cache/mail-mta/postfix-2.8.7
index 10780d3efbe6..a436b5454276 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.8.7
+++ b/metadata/md5-cache/mail-mta/postfix-2.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 dev-lang/perl cdb? ( || ( >=dev
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.7.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb6aaaadb872fa502992f9399be2912b
diff --git a/metadata/md5-cache/mail-mta/postfix-2.8.8 b/metadata/md5-cache/mail-mta/postfix-2.8.8
index b8fdc2e583c8..9498c9ee1e58 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.8.8
+++ b/metadata/md5-cache/mail-mta/postfix-2.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 dev-lang/perl cdb? ( || ( >=dev
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.8.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68937d32e8159e896b9c39babf565364
diff --git a/metadata/md5-cache/mail-mta/postfix-2.8.9 b/metadata/md5-cache/mail-mta/postfix-2.8.9
index e775e7f71549..6142ae0b1074 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.8.9
+++ b/metadata/md5-cache/mail-mta/postfix-2.8.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/db-3.2 >=dev-libs/libpcre-3.4 dev-lang/perl cdb? ( || ( >=dev
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.9.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.8.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb129230e64bef2901462403f28fc7ec
diff --git a/metadata/md5-cache/mail-mta/postfix-2.9.1 b/metadata/md5-cache/mail-mta/postfix-2.9.1
index 842fc24a1c07..af966a1dd33a 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.9.1
+++ b/metadata/md5-cache/mail-mta/postfix-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=022da6034f4f760b04d6338e0cc0e23e
diff --git a/metadata/md5-cache/mail-mta/postfix-2.9.1-r1 b/metadata/md5-cache/mail-mta/postfix-2.9.1-r1
index 27b07521e61c..8c9d9f60dfb6 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.9.1-r1
+++ b/metadata/md5-cache/mail-mta/postfix-2.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.8.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3cb91ceb27bdfa90b1e1d2772f892e4
diff --git a/metadata/md5-cache/mail-mta/postfix-2.9.1-r2 b/metadata/md5-cache/mail-mta/postfix-2.9.1-r2
index 2d080612ff80..49fa8c592621 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.9.1-r2
+++ b/metadata/md5-cache/mail-mta/postfix-2.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6cf16f00d50678556f0b1ab9d5b00daf
diff --git a/metadata/md5-cache/mail-mta/postfix-2.9.2 b/metadata/md5-cache/mail-mta/postfix-2.9.2
index 3ba0bf3c2a13..35141831aa89 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.9.2
+++ b/metadata/md5-cache/mail-mta/postfix-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=06858c61e9de9a232adc0f9d7907bf15
diff --git a/metadata/md5-cache/mail-mta/postfix-2.9.3 b/metadata/md5-cache/mail-mta/postfix-2.9.3
index c791f3489e84..78e088cd8aa2 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.9.3
+++ b/metadata/md5-cache/mail-mta/postfix-2.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb?
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.3.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c37aa900c6f0780f1fbe61a81be1ec11
diff --git a/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8 b/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8
index 0edc5442bb2c..b93abb6851eb 100644
--- a/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8
+++ b/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8
@@ -9,5 +9,5 @@ RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/qmail-1.03.tar.gz http://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.nrg4u.com/qmail/qmail-ldap-1.03-20060201.patch.gz mirror://gentoo/qmail-ldap-1.03-20060201-controls20060401d.patch mirror://gentoo/qmail-ldap-1.03-queue-custom-error.patch !vanilla? ( qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz mirror://gentoo/qmail-ldap-1.03-spp-0.42.patch ) )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aff136fb783836bf9fd33ff83da73592
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.4 b/metadata/md5-cache/media-fonts/encodings-1.0.4
index 1532fbe1c8fa..01e65988ce63 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.4
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=973176f1e58eda58b88604dacd6d2f06
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
index acac93bb1fff..71f8ed367a9f 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4558971e5ea7be98cdb7e301a6a30465
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
index be5d7a0a2f96..342c0a55492a 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=19213d2b4e50cdc5055cb458faabfba3
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
index 49fc4be65d5e..d4686dab35cb 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ff25aaf38047f02eb5f539e8d6a096bb
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
index 88259902e08c..e4d2c1904289 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cabb7e004a9b426968b8405d8adea3ff
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
index 6cd1dd89d3fd..fca4ef9d90ff 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a2dfbc2aa411e45fecafedea4733dbb2
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3 b/metadata/md5-cache/media-fonts/font-alias-1.0.3
index 783a96ffaf20..db9c8322cf2c 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-alias-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f62752d2867e8a770c1904c02f9594bd
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
index 37ca4910a893..f0f2fc9906ef 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=94a9402c51ed47b7ee4b9f3a787cb837
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
index 64e40e6ba3f5..5eb2bbca4e36 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=869647d10868665af56199d94140168c
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
index be5a6df45dee..e85763d7ccf8 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4009937f9c6e5a28fd77fa7d29ff3895
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
index 84571280bf8a..dc2272127479 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5b89bb66c48b418b448c52b4369530e2
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
index fcdd750cfdbb..03c823744c6c 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5ab15b4b9b49821e76ef474ae27b6102
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
index 45b74c6654fc..7faffaa9aa7b 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c03557d4f27962afb7c700508ad6fc1f
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
index 60b6c905035c..3470bba32377 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=280e5ee7b7378afbd7e8385e4219d421
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
index 290854410990..752c123fbfc0 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=79280ac155f9ece7837a80128e7b93db
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
index 42db81b1d8e7..16859bc0b356 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=105c64961eeb7d07e522aa1ef7db6199
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
index cf01105e8200..5addf2beb6f0 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a22c13117bc12d169140538902f6ac88
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
index 3d9ed17c89f9..7cd67f8340aa 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ab4e7c861c07106450cb215cfe3d2b0f
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
index d311c69072de..ff39e55bfa8b 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fef7ca147519e21ef9b8720c05ed2b16
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
index 1929f21ae312..3ebf9a1f9701 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fbb03d3421ffd6b8e09cba78d94ec505
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
index c105931c7863..9941594828cd 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=34afc7bde30b79781b97fc917a2e7472
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
index 2f46e27e6df5..85e54c8dedb3 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=624b1e5645187500ca0443662cdd1041
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
index f13ea84ea856..e8bef1c4b050 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=62a8c014a10d88293746ef49b5238845
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
index 2ce8cd3c3417..09ef21d37af0 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=862fa25ed23551780e41cbf99fbbb0d3
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
index d4187495987c..e87d8f8d01c5 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8646373e66395a42d83cb9309cdab71a
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
index f5f7f0eff66a..70986e0fecdd 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=40a70d12b8f0d40fb0c617870ce325a6
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
index bc1f753393fe..ed42e7398b3a 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a188236bc61636994df5ce6994a06b1a
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
index 07f4095402d1..b09d7d8bbfe4 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=084f8ac247a2e9980749e842ca4e89b8
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
index 69c8af1774ae..34caedb50cc2 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=40339a601f6c54f34689f65d3cfe3894
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
index 0313dcb55755..905279f19800 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bcfffd0a668bdb4e00f8f352415d90aa
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
index abca2777b261..4094b3fd76d2 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=553f28d18a2f1aac5e80626ae4dc8c85
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
index 48ae57168da3..ddd85859b5fa 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9be0e2195fd57a75cf67939df12b2e82
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
index c8c55489b081..898e2b1504c5 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1dd548dab18f229ba2dd7d08edf8ef73
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
index 1571dddd7841..2dedb89333e1 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6dc2c29dba60c9fa5e365950999157f1
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
index 018038aeccbf..9ee0a413621b 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6f891cf0da2ce49c1cf10c21879962b5
diff --git a/metadata/md5-cache/media-fonts/font-util-1.2.0 b/metadata/md5-cache/media-fonts/font-util-1.2.0
index c8ba7c446a1e..de3cbd378803 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.2.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6b5267075433176783fed85768f3767f
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.0 b/metadata/md5-cache/media-fonts/font-util-1.3.0
index 35ee283e8f35..67cffb21c980 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.0
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=X.Org font utilities
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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
+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=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f2475f791302221f1bcbb37df0b9b6fa
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=900a0998fd697c76140336f71c621402
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
index 13e2f51923bb..a735a08ec5e3 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1eea4da2e4e311640b0cb18d7da5cb3e
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
index 17bd3498a34f..440679e8390a 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4
@@ -10,5 +10,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6334c4131661d73dd99fe7962e9817e5
diff --git a/metadata/md5-cache/media-fonts/mix-mplus-ipa-20120411_p2 b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20120411_p2
new file mode 100644
index 000000000000..a86e2d050407
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20120411_p2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+DESCRIPTION=Mixing mplus and IPA fonts
+EAPI=4
+HOMEPAGE=http://mix-mplus-ipa.sourceforge.jp/
+IUSE=X
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=mplus-fonts IPAfont
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-1p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56155/migmix-2p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1p-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1c-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-1m-20120411-2.zip mirror://sourceforge.jp/mix-mplus-ipa/56156/migu-2m-20120411-2.zip
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d55fa724352c5696d0307ed42bbe80e8
diff --git a/metadata/md5-cache/media-fonts/ricty-3.2.0 b/metadata/md5-cache/media-fonts/ricty-3.2.0
new file mode 100644
index 000000000000..b5e5241d1b4d
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/ricty-3.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+DESCRIPTION=A beautiful sans-serif monotype Japanese font designed for code listings
+EAPI=4
+HOMEPAGE=http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
+IUSE=X
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=public-domain
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=https://github.com/yascentur/Ricty/tarball/3.2.0 -> Ricty-3.2.0.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e48d8afc7e78d49d0b9af68f277920d4
diff --git a/metadata/md5-cache/media-gfx/aqsis-1.6.0 b/metadata/md5-cache/media-gfx/aqsis-1.6.0
index fb0ca7046934..13024870b321 100644
--- a/metadata/md5-cache/media-gfx/aqsis-1.6.0
+++ b/metadata/md5-cache/media-gfx/aqsis-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.34.0 >=media-libs/tiff-3.7.1 >=sys-libs/zlib-1.1.4 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) openexr? ( media-libs/openexr )
 SLOT=0
 SRC_URI=mirror://sourceforge/aqsis/aqsis-1.6.0.tar.gz mirror://debian/pool/main/a/aqsis/aqsis_1.6.0-8.debian.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b164d4d42d36fef46c056a752bb86967
diff --git a/metadata/md5-cache/media-gfx/arss-0.2.3 b/metadata/md5-cache/media-gfx/arss-0.2.3
index 86b1b8931ce6..3b946a5b75b6 100644
--- a/metadata/md5-cache/media-gfx/arss-0.2.3
+++ b/metadata/md5-cache/media-gfx/arss-0.2.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/fftw
 SLOT=0
 SRC_URI=mirror://sourceforge/arss/arss-0.2.3-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d47fe84fb823e6eeb4c3f3f3f907b01
diff --git a/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1 b/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
index 23fbfc2fde2a..0d021bb57bd9 100644
--- a/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
+++ b/metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=!media-gfx/autopano-sift dev-libs/libxml2 media-libs/libpano13 media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10e96c54e20d825f90c994ab13118b94
diff --git a/metadata/md5-cache/media-gfx/blender-2.48a-r3 b/metadata/md5-cache/media-gfx/blender-2.48a-r3
index 17e1498c55b2..599e979fc80d 100644
--- a/metadata/md5-cache/media-gfx/blender-2.48a-r3
+++ b/metadata/md5-cache/media-gfx/blender-2.48a-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BL )
 RDEPEND=>=dev-libs/openssl-0.9.6 ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) media-libs/tiff:0 nls? ( >=media-libs/freetype-2.0 virtual/libintl >=media-libs/ftgl-2.1 ) openal? ( >=media-libs/openal-1.6.372 >=media-libs/freealut-1.1.0-r1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0 ) quicktime? ( media-libs/libquicktime ) >=media-libs/libsdl-1.2 blender-game? ( >=media-libs/libsdl-1.2[joystick] ) virtual/opengl || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://download.blender.org/source/blender-2.48a.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e69539a04e4ec73ed849d1ead897f94
diff --git a/metadata/md5-cache/media-gfx/blender-2.57-r1 b/metadata/md5-cache/media-gfx/blender-2.57-r1
index 2da23649af30..cb6a8039bf48 100644
--- a/metadata/md5-cache/media-gfx/blender-2.57-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.57-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BL )
 RDEPEND=virtual/jpeg media-libs/libpng:0 x11-libs/libXi x11-libs/libX11 media-libs/tiff:0 media-libs/libsamplerate virtual/opengl >=media-libs/freetype-2.0 virtual/libintl media-libs/glew dev-cpp/eigen:2 >=sci-physics/bullet-2.76 iconv? ( virtual/libiconv ) zlib? ( sys-libs/zlib ) sdl? ( media-libs/libsdl[audio,joystick] ) openexr? ( media-libs/openexr ) ffmpeg? ( virtual/ffmpeg[x264,mp3,encode,theora] jpeg2k? ( !<media-libs/openjpeg-1.5.0 virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] ) ) openal? ( >=media-libs/openal-1.6.372 ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) lcms? ( media-libs/lcms:0 ) =dev-lang/python-3.2*
 SLOT=2.5
 SRC_URI=http://download.blender.org/source/blender-2.57.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f5f4afb38ee5136095e51ab95042b93
diff --git a/metadata/md5-cache/media-gfx/blender-2.60a b/metadata/md5-cache/media-gfx/blender-2.60a
index ea36dc6408f7..1c0f44dece94 100644
--- a/metadata/md5-cache/media-gfx/blender-2.60a
+++ b/metadata/md5-cache/media-gfx/blender-2.60a
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BL )
 RDEPEND=virtual/jpeg media-libs/libpng:0 x11-libs/libXi x11-libs/libX11 media-libs/tiff:0 media-libs/libsamplerate virtual/opengl >=media-libs/freetype-2.0 virtual/libintl media-libs/glew dev-cpp/eigen:2 >=sci-physics/bullet-2.76 iconv? ( virtual/libiconv ) zlib? ( sys-libs/zlib ) sdl? ( media-libs/libsdl[audio,joystick] ) openexr? ( media-libs/openexr ) ffmpeg? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora] jpeg2k? ( !<media-libs/openjpeg-1.5.0 >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] ) ) openal? ( >=media-libs/openal-1.6.372 ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) sndfile? ( media-libs/libsndfile ) lcms? ( media-libs/lcms:0 ) 3dmouse? ( dev-libs/libspnav ) collada? ( media-libs/opencollada ) =dev-lang/python-3.2*
 SLOT=2.60
 SRC_URI=http://download.blender.org/source/blender-2.60a.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85e77268d105a3d82926909e9d7befa9
diff --git a/metadata/md5-cache/media-gfx/converseen-0.4.7 b/metadata/md5-cache/media-gfx/converseen-0.4.7
index 5cd1abb79246..dbbcd8d8e8d6 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.4.7
+++ b/metadata/md5-cache/media-gfx/converseen-0.4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui:4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 SLOT=0
 SRC_URI=mirror://sourceforge/converseen/converseen-0.4.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b2919beb8657ce1afd945213cb64d1e
diff --git a/metadata/md5-cache/media-gfx/converseen-0.4.9 b/metadata/md5-cache/media-gfx/converseen-0.4.9
index b4ddb8d6605c..e1264fccdb65 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.4.9
+++ b/metadata/md5-cache/media-gfx/converseen-0.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui:4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 SLOT=0
 SRC_URI=mirror://sourceforge/converseen/converseen-0.4.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=922ce2dcd5c41be47d35a4c3ff5e7f10
diff --git a/metadata/md5-cache/media-gfx/converseen-0.5 b/metadata/md5-cache/media-gfx/converseen-0.5
index 2b5af66f16d1..ac520d0daa40 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.5
+++ b/metadata/md5-cache/media-gfx/converseen-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui:4 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 SLOT=0
 SRC_URI=mirror://sourceforge/converseen/converseen-0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4078355fc5d2a94a1e579664c279d4c4
diff --git a/metadata/md5-cache/media-gfx/darktable-1.0 b/metadata/md5-cache/media-gfx/darktable-1.0
index 3e855a14ce2d..5747eb95c12a 100644
--- a/metadata/md5-cache/media-gfx/darktable-1.0
+++ b/metadata/md5-cache/media-gfx/darktable-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/libxml2:2 flickr? ( media-libs/flickcurl ) gnome? ( gnome-base/gconf gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng >=media-libs/libraw-0.13.4[demosaic] media-libs/openexr media-libs/tiff net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/darktable/darktable-1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37c05003d20c428f7f0272ac0dce5a4f
diff --git a/metadata/md5-cache/media-gfx/darktable-1.0.4 b/metadata/md5-cache/media-gfx/darktable-1.0.4
index 67ac302c3d88..7dfb0f1496c3 100644
--- a/metadata/md5-cache/media-gfx/darktable-1.0.4
+++ b/metadata/md5-cache/media-gfx/darktable-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/libxml2:2 flickr? ( media-libs/flickcurl ) gnome? ( gnome-base/gconf gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng >=media-libs/libraw-0.13.4[demosaic] media-libs/openexr media-libs/tiff net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/darktable/darktable-1.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69f5e3a22ba5c09f04ccd0141a21bbbf
diff --git a/metadata/md5-cache/media-gfx/digikam-2.5.0 b/metadata/md5-cache/media-gfx/digikam-2.5.0
index 1c278e5ab368..420ffe0a6bd7 100644
--- a/metadata/md5-cache/media-gfx/digikam-2.5.0
+++ b/metadata/md5-cache/media-gfx/digikam-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.7:4[aqua=,semantic-desktop=] >=kde-base/libkdcraw-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a42e730a259aaa563456c4521962028c
diff --git a/metadata/md5-cache/media-gfx/digikam-2.6.0 b/metadata/md5-cache/media-gfx/digikam-2.6.0
index 69471b5b18c9..122d5bddf6ba 100644
--- a/metadata/md5-cache/media-gfx/digikam-2.6.0
+++ b/metadata/md5-cache/media-gfx/digikam-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.8:4[aqua=,semantic-desktop=] >=kde-base/libkdcraw-4
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d12fa07fc8ea7e6bba2ba05c91aea408
diff --git a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2 b/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
index de52acf29080..dc0b253db517 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
+++ b/metadata/md5-cache/media-gfx/freecad-0.12.5284-r2
@@ -9,5 +9,5 @@ RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/xe
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/free-cad/freecad-0.12.5284.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d31933b13019f15c7d04d72fc8d582e5
diff --git a/metadata/md5-cache/media-gfx/freepv-0.3.0-r3 b/metadata/md5-cache/media-gfx/freepv-0.3.0-r3
index 065ccd77b511..616718208c3e 100644
--- a/metadata/md5-cache/media-gfx/freepv-0.3.0-r3
+++ b/metadata/md5-cache/media-gfx/freepv-0.3.0-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 media-libs/libpng media-libs/freeglut sys-libs/zlib virtual/jpeg x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/freepv/freepv-0.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c196e904aaef73450e513e8efe3c8827
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13 b/metadata/md5-cache/media-gfx/freewrl-1.22.13
index a4f5f8f7d9f9..2602036c19a6 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/openmotif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d706b27932234b99b8be8821a101257
diff --git a/metadata/md5-cache/media-gfx/gmic-1.5.1.4 b/metadata/md5-cache/media-gfx/gmic-1.5.1.4
index 66f2ba737496..4edbb9df1f7f 100644
--- a/metadata/md5-cache/media-gfx/gmic-1.5.1.4
+++ b/metadata/md5-cache/media-gfx/gmic-1.5.1.4
@@ -9,5 +9,5 @@ LICENSE=CeCILL-2
 RDEPEND=ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg? ( virtual/jpeg ) opencv? ( >=media-libs/opencv-2.3.1a-r1 ) openexr? ( media-libs/ilmbase media-libs/openexr ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/gmic/gmic_1.5.1.4.tar.gz
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c848e4c5c4cca5c982b1c0070c15d8f8
diff --git a/metadata/md5-cache/media-gfx/gmic-1.5.1.6 b/metadata/md5-cache/media-gfx/gmic-1.5.1.6
index ee1e70588774..b3340a1decbf 100644
--- a/metadata/md5-cache/media-gfx/gmic-1.5.1.6
+++ b/metadata/md5-cache/media-gfx/gmic-1.5.1.6
@@ -9,5 +9,5 @@ LICENSE=CeCILL-2
 RDEPEND=ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg? ( virtual/jpeg ) opencv? ( >=media-libs/opencv-2.3.1a-r1 ) openexr? ( media-libs/ilmbase media-libs/openexr ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/gmic/gmic_1.5.1.6.tar.gz
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4d65d2ece46c96b7e762fdfadaf510e
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.1.2 b/metadata/md5-cache/media-gfx/graphite2-1.1.2
index 3666d716b52d..d14cc9456cb7 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.1.2
+++ b/metadata/md5-cache/media-gfx/graphite2-1.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl ) dev-lang/perl[-build] test? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21e5b715493c9ffa1a9afeb03189cb71
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.1.3 b/metadata/md5-cache/media-gfx/graphite2-1.1.3
index 349442e0f926..05486610386f 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.1.3
+++ b/metadata/md5-cache/media-gfx/graphite2-1.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl ) dev-lang/perl[-build] test? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fce293028e165537f585a53d0da6e11
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4 b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
index 1377ac92c443..85f1359ccc5e 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
+++ b/metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06f7f736096ae5a638b233238d69af3b
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.28.0 b/metadata/md5-cache/media-gfx/graphviz-2.28.0
index 5168e08c5f32..0c672bc38d8c 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.28.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.28.0
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.28.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9cce2f361b402a892e416b88203c849
diff --git a/metadata/md5-cache/media-gfx/hugin-2011.0.0 b/metadata/md5-cache/media-gfx/hugin-2011.0.0
index ae85be195dab..65fc11280322 100644
--- a/metadata/md5-cache/media-gfx/hugin-2011.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2011.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 SIFT
 RDEPEND=!!dev-util/cocom app-arch/zip >=dev-libs/boost-1.35.0-r5 >=media-gfx/enblend-4.0 media-gfx/exiv2 media-libs/freeglut >=media-libs/libpano13-2.9.18 media-libs/libpng media-libs/openexr media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/wxGTK:2.8[X,opengl,-odbc] lapack? ( virtual/lapack ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2011.0.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=5870e536fa99b1aeb81d9e3b72361b5a
diff --git a/metadata/md5-cache/media-gfx/hugin-2011.2.0 b/metadata/md5-cache/media-gfx/hugin-2011.2.0
index 8b47a55be4a4..8122d5d12208 100644
--- a/metadata/md5-cache/media-gfx/hugin-2011.2.0
+++ b/metadata/md5-cache/media-gfx/hugin-2011.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 SIFT
 RDEPEND=!!dev-util/cocom app-arch/zip dev-cpp/tclap >=dev-libs/boost-1.35.0-r5 dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2 media-libs/freeglut >=media-libs/libpano13-2.9.18 media-libs/libpng media-libs/openexr media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/wxGTK:2.8[X,opengl,-odbc] lapack? ( virtual/lapack ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2011.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=ade39bdd5e9e65dd8e4b245a16050e7b
diff --git a/metadata/md5-cache/media-gfx/hugin-2011.4.0 b/metadata/md5-cache/media-gfx/hugin-2011.4.0
index 501ac2be0e78..c14d1e0f85f5 100644
--- a/metadata/md5-cache/media-gfx/hugin-2011.4.0
+++ b/metadata/md5-cache/media-gfx/hugin-2011.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 SIFT
 RDEPEND=!!dev-util/cocom app-arch/zip dev-cpp/tclap >=dev-libs/boost-1.35.0-r5 dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2 media-libs/freeglut >=media-libs/libpano13-2.9.18 media-libs/libpng media-libs/openexr media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/wxGTK:2.8[X,opengl,-odbc] lapack? ( virtual/lapack ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2011.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=30e52b29ebe76cc09c8f2aa1079fb6f3
diff --git a/metadata/md5-cache/media-gfx/imageworsener-0.9.5 b/metadata/md5-cache/media-gfx/imageworsener-0.9.5
index ea527fea1d4f..c9281e550259 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-0.9.5
+++ b/metadata/md5-cache/media-gfx/imageworsener-0.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0 virtual/jpeg webp? ( >=media-libs/libwebp-0.1.3 ) test? ( >=media-libs/libwebp-0.1.3 )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-src-0.9.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=743cebe393d04d3153e2d86c5cbe3aa2
diff --git a/metadata/md5-cache/media-gfx/imageworsener-0.9.6 b/metadata/md5-cache/media-gfx/imageworsener-0.9.6
index 9adf7a700af8..147d16327008 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-0.9.6
+++ b/metadata/md5-cache/media-gfx/imageworsener-0.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0 virtual/jpeg webp? ( >=media-libs/libwebp-0.1.3 ) test? ( >=media-libs/libwebp-0.1.3 )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-src-0.9.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f2674b8c4831936ce15cee401efb4df8
diff --git a/metadata/md5-cache/media-gfx/imageworsener-0.9.7 b/metadata/md5-cache/media-gfx/imageworsener-0.9.7
index 2cbc0d034094..c6faa83226f1 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-0.9.7
+++ b/metadata/md5-cache/media-gfx/imageworsener-0.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libpng:0 virtual/jpeg webp? ( >=media-libs/libwebp-0.1.3 ) test? ( >=media-libs/libwebp-0.1.3 )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-src-0.9.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce193f47ec45a01261bfa3f65bc0d769
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.48.2 b/metadata/md5-cache/media-gfx/inkscape-0.48.2
index f0d197ff464a..185f644a4d0f 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.48.2
+++ b/metadata/md5-cache/media-gfx/inkscape-0.48.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/inkscape/inkscape-0.48.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c34153b88d96e15b3c277280d255d474
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.48.3.1 b/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
index 492efd23d97e..b680091814ae 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/inkscape/inkscape-0.48.3.1.tar.bz2 http://dev.gentoo.org/~radhermit/dist/inkscape-0.48.3.1-poppler-0.20.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f206fe0ae9403dabf09a9756d3b9746
diff --git a/metadata/md5-cache/media-gfx/iscan-2.26.2 b/metadata/md5-cache/media-gfx/iscan-2.26.2
index 2dae14232ceb..94fa8d2a4d04 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.26.2
+++ b/metadata/md5-cache/media-gfx/iscan-2.26.2
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan-data media-gfx/sane-backends >=sys-fs/udev-103 virtual/l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://linux.avasys.jp/drivers/iscan/2.26.2/iscan_2.26.2-1.tar.gz doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=715e42bde2de234b731354acf1f1c004
diff --git a/metadata/md5-cache/media-gfx/iscan-2.28.1.3 b/metadata/md5-cache/media-gfx/iscan-2.28.1.3
index bd9b0f5e811f..7f5038fbb378 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.28.1.3
+++ b/metadata/md5-cache/media-gfx/iscan-2.28.1.3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan-data media-gfx/sane-backends >=sys-fs/udev-103 virtual/l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://linux.avasys.jp/drivers/iscan/2.28.1/iscan_2.28.1-3.tar.gz doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4f077ce0d2d9e9dc7887d6daecab692
diff --git a/metadata/md5-cache/media-gfx/k3d-0.7.11.0-r1 b/metadata/md5-cache/media-gfx/k3d-0.7.11.0-r1
index 0585a79722f6..28787a7657d9 100644
--- a/metadata/md5-cache/media-gfx/k3d-0.7.11.0-r1
+++ b/metadata/md5-cache/media-gfx/k3d-0.7.11.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost[python] >=dev-cpp/glibmm-2.6:2 >=dev-cpp/gtkmm-2.6:2.4 dev-libs/expat >=dev-libs/libsigc++-2.2:2 media-libs/mesa virtual/glu virtual/opengl >=x11-libs/gtkglext-1.0.6-r3 x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXt 3ds? ( media-libs/lib3ds ) cuda? ( dev-util/nvidia-cuda-toolkit ) gnome? ( gnome-base/libgnome ) graphviz? ( media-gfx/graphviz ) gts? ( sci-libs/gts ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg ) openexr? ( media-libs/openexr ) png? ( >=media-libs/libpng-1.2.43-r2 ) python? ( >=dev-lang/python-2.3 dev-python/cgkit ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/k3d/k3d-source-0.7.11.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00eaac1a3f3dc730f6933b446e17e045
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0
index c72b74b32d0b..7f010680e3d4 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kcoloredit-2.0.0-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c176fc203f4be4daac88a0103bccf751
diff --git a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1 b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
index c8d415bbaf5b..95a619a4a655 100644
--- a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
+++ b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=x11-libs/libX11 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kfax-3.3.6-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d5f3b45d6a860bdd35eb7226af7d1fb8
diff --git a/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1 b/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
index 6576e83dd3e8..2c5c86a789d5 100644
--- a/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
+++ b/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://gentoo/kflickr-0.9.1_p1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=75e50e05c8d08e026117bf6a690a4d2b
diff --git a/metadata/md5-cache/media-gfx/kgrab-0.1.1 b/metadata/md5-cache/media-gfx/kgrab-0.1.1
index 88eb8c35f97d..8b6422e61568 100644
--- a/metadata/md5-cache/media-gfx/kgrab-0.1.1
+++ b/metadata/md5-cache/media-gfx/kgrab-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=x11-libs/libX11 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kgrab-0.1.1-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=07c92f52520f80cf12af83b1c4ade692
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.1.1 b/metadata/md5-cache/media-gfx/kgraphviewer-2.1.1
index 1a787eef28fe..f2f44e66a579 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.1.1
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=media-gfx/graphviz sys-libs/zlib >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=https://api.opensuse.org/public/source/home:milianw:kdeapps/kgraphviewer/kgraphviewer-2.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=26fb8d0afcb224d8cf4a6126a5256342
diff --git a/metadata/md5-cache/media-gfx/kiconedit-4.4.0 b/metadata/md5-cache/media-gfx/kiconedit-4.4.0
index 8c007b2f7de7..ecc4f44e12e4 100644
--- a/metadata/md5-cache/media-gfx/kiconedit-4.4.0
+++ b/metadata/md5-cache/media-gfx/kiconedit-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kiconedit-4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c1e8b3168e57e1ef1ff44e9526eecd5a
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-4.1.1-r1 b/metadata/md5-cache/media-gfx/kphotoalbum-4.1.1-r1
index ca4b5852f5e7..1a33d98895fa 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-4.1.1-r1
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-4.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] virtual/jpeg >=x11-libs/qt-sql-4.4:4[sqlite] exif? ( >=media-gfx/exiv2-0.17 ) geolocation? ( >=kde-base/marble-4.4:4[aqua=] ) kipi? ( >=kde-base/libkipi-4.4:4[aqua=] ) raw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) semantic-desktop? ( >=kde-base/nepomuk-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kphotoalbum.org/data/download/kphotoalbum-4.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d8d356f60176275b31de5add7be209fb
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-4.2 b/metadata/md5-cache/media-gfx/kphotoalbum-4.2
index fdd1107fd6a2..2342870eed2c 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-4.2
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop=] >=x11-libs/qt-sql-4.4:4[sqlite] virtual/jpeg exif? ( >=media-gfx/exiv2-0.17 ) geolocation? ( >=kde-base/marble-4.4:4[aqua=] ) kipi? ( >=kde-base/libkipi-4.4:4[aqua=] ) raw? ( >=kde-base/libkdcraw-4.4:4[aqua=] ) semantic-desktop? ( >=kde-base/nepomuk-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kphotoalbum/4.2/src/kphotoalbum-4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6128941215209e33904dcfc131c6dbeb
diff --git a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3 b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3
index e2a7ba39601c..24fdb314d50f 100644
--- a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3
+++ b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_vi(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kpovmodeler.org/files/kpovmodeler-1.1.3-kde4.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b594e923bd55d6580046fe06d5819d5f
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1
index a62a8e7b2802..b56b03511608 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib !media-gfx/kuickshow:0 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3834e18b7de04663715eb4f2f418522b
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.2.0 b/metadata/md5-cache/media-gfx/luminance-hdr-2.2.0
index 4c67756cae0d..bec86239bdde 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.2.0
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.14 >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=695e60b8702e4960e98243c3027910de
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.2.1 b/metadata/md5-cache/media-gfx/luminance-hdr-2.2.1
index 457f4a1a9170..28966da3ee02 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.2.1
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.14 >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc4ce0621f69b031dc3f7cc3d2b43907
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r1 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r1
index 5b948b7409e2..c253e6604d05 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r1
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng:0 media-libs/ilmbase media-libs/tiff:0 sys-libs/zlib virtual/jpeg virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) cuda? ( dev-util/nvidia-cuda-toolkit ) glew? ( media-libs/glew ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr )
 SLOT=0
 SRC_URI=http://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz http://dev.gentoo.org/~ssuominen/nvidia-texture-tools-2.0.8-patchset-1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8f8c3b8fc5f3ad476637285ee92e1d9
diff --git a/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2 b/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
index 7e65c36698a3..8a079f9f8467 100644
--- a/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
+++ b/metadata/md5-cache/media-gfx/openexr_viewers-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/ilmbase-1.0.2 >=media-libs/openexr-1.7.0 media-libs/ctl media-libs/openexr_ctl opengl? ( virtual/opengl x11-libs/fltk:1[opengl] video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) ) !<media-libs/openexr-1.5.0
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr_viewers-1.0.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0399cfa66ee824313824a032012fa85
diff --git a/metadata/md5-cache/media-gfx/openmesh-2.0_rc5 b/metadata/md5-cache/media-gfx/openmesh-2.0_rc5
index 0e3081986b98..c5338898b108 100644
--- a/metadata/md5-cache/media-gfx/openmesh-2.0_rc5
+++ b/metadata/md5-cache/media-gfx/openmesh-2.0_rc5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 as-is
 RDEPEND=qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/freeglut )
 SLOT=0
 SRC_URI=http://openmesh.org/fileadmin/openmesh-files/2.0RC5/OpenMesh-2.0-RC5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=942b31c416858f88485061053a478ee1
diff --git a/metadata/md5-cache/media-gfx/openmesh-2.1 b/metadata/md5-cache/media-gfx/openmesh-2.1
index fe750cd997de..43b2de04f17f 100644
--- a/metadata/md5-cache/media-gfx/openmesh-2.1
+++ b/metadata/md5-cache/media-gfx/openmesh-2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 as-is
 RDEPEND=qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/freeglut )
 SLOT=0
 SRC_URI=http://openmesh.org/fileadmin/openmesh-files/2.1/OpenMesh-2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f9f16df2c3ce864d4768ee20f094eac
diff --git a/metadata/md5-cache/media-gfx/photo-0.7.1.1 b/metadata/md5-cache/media-gfx/photo-0.7.1.1
index f65f72d5c90a..03bccfdd8910 100644
--- a/metadata/md5-cache/media-gfx/photo-0.7.1.1
+++ b/metadata/md5-cache/media-gfx/photo-0.7.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/exiv2 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=http://qt-apps.org/CONTENT/content-files/147453-photo-0.7.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d898427a58304126835de8aafb79fa46
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
index d32cd78e0223..ee9b121777fb 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3613640475cd012db9b67d200dfcf50c
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3-r1
index 36b41a029fc5..809fabdc8e50 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc3-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6bf3c8866d3c727194bb9390614632e9
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0_rc5 b/metadata/md5-cache/media-gfx/povray-3.7.0_rc5
index f807a3db9e43..4c7e7603d557 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0_rc5
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0_rc5
@@ -9,5 +9,5 @@ LICENSE=povlegal-3.6
 RDEPEND=>=dev-libs/boost-1.41 media-libs/libpng:0 sys-libs/zlib virtual/jpeg openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=426153a8d1e1bf7df0f421ed2a17e109
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.8 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
index ee8628b69f7a..27e1acec8b08 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
+++ b/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
 SLOT=0
 SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.8.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d85235d053a798e4c21cb5e691111e9
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.9 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.9
index 97b61e008359..af5ede71c7ba 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.9
+++ b/metadata/md5-cache/media-gfx/rawtherapee-4.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/expat dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
 SLOT=0
 SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58cc1d0ea95b47c20ab99d1faee71bf6
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.17 b/metadata/md5-cache/media-gfx/sane-backends-1.0.17
index 5073eec60085..bd32135bd36d 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.17
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=virtual/jpeg amd64? ( sys-libs/libieee1284 ) x86? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 ) v4l? ( sys-kernel/linux-headers )
 SLOT=0
 SRC_URI=ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.17/sane-backends-1.0.17.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.17/sane-backends-1.0.17.tar.gz usb? ( mirror://gentoo/sane-1.0.16-brother-driver.diff.bz2 http://dev.gentoo.org/~phosphan/sane-1.0.16-brother-driver.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77c228288f162f4cfcdf7c7bf4888724
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.18-r6 b/metadata/md5-cache/media-gfx/sane-backends-1.0.18-r6
index fcce03ca4a28..df5b9c9633ae 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.18-r6
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.18-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=virtual/jpeg amd64? ( sys-libs/libieee1284 ) x86? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 ) v4l? ( sys-kernel/linux-headers ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz usb? ( mirror://gentoo/sane-1.0.18-brother-driver.diff.bz2 http://dev.gentoo.org/~phosphan/sane-1.0.18-brother-driver.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5ee9e20361022b87f2dff9ef3ad32e7
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.19-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.19-r2
index 2ccc5caf0e2e..7b117db05125 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.19-r2
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.19-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=virtual/jpeg amd64? ( sys-libs/libieee1284 ) x86? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 ) v4l? ( sys-kernel/linux-headers ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.19/sane-backends-1.0.19.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.19/sane-backends-1.0.19.tar.gz usb? ( mirror://gentoo/sane-1.0.19-brother-driver.diff.bz2 http://dev.gentoo.org/~phosphan/sane-1.0.19-brother-driver.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4d61863f4603c335bc278d57b8cd2e3
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.20-r3 b/metadata/md5-cache/media-gfx/sane-backends-1.0.20-r3
index 7ff69d99a8f7..a2713e208399 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.20-r3
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.20-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 virtual/jpeg ) v4l? ( media-libs/libv4l ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.20.tar.gz ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.20/sane-backends-1.0.20.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.20/sane-backends-1.0.20.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80a4e957ef78355ee6593c245841b09b
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.21-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.21-r1
index dc8c0670a933..96da3394daaa 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.21-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.21-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 virtual/jpeg ) v4l? ( media-libs/libv4l ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21-i18n.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72683350d22ac6162c3e4005ec8eace3
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r1
index f1fe57917948..2ddeda96ae03 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 virtual/jpeg ) v4l? ( media-libs/libv4l ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.22/sane-backends-1.0.22.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.22/sane-backends-1.0.22.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=542b25a2d98006e79d6dacc692eca421
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r2
index 72f0eeec4340..e5657b89b99a 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r2
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.22-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2 virtual/jpeg ) v4l? ( media-libs/libv4l ) !<sys-fs/udev-114
 SLOT=0
 SRC_URI=ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.22/sane-backends-1.0.22.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.22/sane-backends-1.0.22.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c8af42fbbe95ed1e348a86a6de4aa25
diff --git a/metadata/md5-cache/media-gfx/scantailor-0.9.10 b/metadata/md5-cache/media-gfx/scantailor-0.9.10
index 4cd2ac1e2227..84d879fefeb5 100644
--- a/metadata/md5-cache/media-gfx/scantailor-0.9.10
+++ b/metadata/md5-cache/media-gfx/scantailor-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 public-domain
 RDEPEND=>=media-libs/libpng-1.2.43 >=media-libs/tiff-3.9.4 sys-libs/zlib virtual/jpeg x11-libs/libXrender x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scantailor/scantailor-0.9.10.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6c87e1cc1f1e6447f921b49d0d6ee700
diff --git a/metadata/md5-cache/media-gfx/scantailor-0.9.11.1 b/metadata/md5-cache/media-gfx/scantailor-0.9.11.1
index bbee0e3fa9e4..d6d2a02f06fe 100644
--- a/metadata/md5-cache/media-gfx/scantailor-0.9.11.1
+++ b/metadata/md5-cache/media-gfx/scantailor-0.9.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 public-domain
 RDEPEND=>=media-libs/libpng-1.2.43 >=media-libs/tiff-3.9.4 sys-libs/zlib virtual/jpeg x11-libs/libXrender x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scantailor/scantailor-0.9.11.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4f4f4e1db108e0d2b42aa5d6acb98e24
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.1 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.1
index 2fcdaa9ebd1e..9545a27f1329 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.1
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=dev-libs/boost media-libs/tiff virtual/jpeg
 SLOT=0
 SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_1.zip
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c2a1bdc6bdee2eb4a9f28f1c96e8770
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
index ee989d0ad960..2d0bf5b02cfd 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=dev-libs/boost media-libs/tiff virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c22cbb3ece8c26289c960b55193bcb4a
diff --git a/metadata/md5-cache/media-gfx/sxiv-0.9-r1 b/metadata/md5-cache/media-gfx/sxiv-0.9-r1
deleted file mode 100644
index 9dcb7685edae..000000000000
--- a/metadata/md5-cache/media-gfx/sxiv-0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/imlib2[X] x11-libs/libX11
-DESCRIPTION=Simple (or small or suckless) X Image Viewer
-EAPI=4
-HOMEPAGE=https://github.com/muennich/sxiv/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/imlib2[X] x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://github/muennich/sxiv/sxiv-0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7540ecf95c3d7a1d5bdeadeb55e3bf38
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5d b/metadata/md5-cache/media-gfx/transfig-3.2.5d
index 69dc057dd3fe..99739596728a 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5d
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5d
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5d.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52accad2805290cc5691d64d83d2d96f
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5d-r1 b/metadata/md5-cache/media-gfx/transfig-3.2.5d-r1
index 9d732303245d..fe3eff3aafd9 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5d-r1
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5d-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5d.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b91bc5730af98c336149e8131f4366c
diff --git a/metadata/md5-cache/media-gfx/wally-2.4.4 b/metadata/md5-cache/media-gfx/wally-2.4.4
index f63de61ec7bf..6a2da608b07f 100644
--- a/metadata/md5-cache/media-gfx/wally-2.4.4
+++ b/metadata/md5-cache/media-gfx/wally-2.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libexif x11-libs/libX11 x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://sourceforge/wally/wally-2.4.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a1623bb94dc170b29b9fca99d1d51dc1
diff --git a/metadata/md5-cache/media-gfx/xloadimage-4.1-r11 b/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
index be0874c6b188..19d830c7450c 100644
--- a/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
+++ b/metadata/md5-cache/media-gfx/xloadimage-4.1-r11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 )
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz mirror://gentoo/xloadimage-4.1-gentoo-r1.diff.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=626d8866e7c83f3522bf34b7d0a339ac
diff --git a/metadata/md5-cache/media-gfx/xv-3.10a-r16 b/metadata/md5-cache/media-gfx/xv-3.10a-r16
index 69d4a403f174..71be847aefe6 100644
--- a/metadata/md5-cache/media-gfx/xv-3.10a-r16
+++ b/metadata/md5-cache/media-gfx/xv-3.10a-r16
@@ -9,5 +9,5 @@ LICENSE=xv
 RDEPEND=x11-libs/libXt jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/xv-3.10a.tar.gz mirror://gentoo/xv-3.10a.png.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=542dd1a6bd45b0fd40727b9e04b89ee3
diff --git a/metadata/md5-cache/media-libs/SoQt-1.4.1 b/metadata/md5-cache/media-libs/SoQt-1.4.1
index 8f2fa41a313e..85d3b82f89fe 100644
--- a/metadata/md5-cache/media-libs/SoQt-1.4.1
+++ b/metadata/md5-cache/media-libs/SoQt-1.4.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 PEL )
 RDEPEND=>=media-libs/coin-2.4.4 x11-libs/qt-gui:4[qt3support] x11-libs/qt-opengl:4[qt3support] x11-libs/qt-qt3support:4
 SLOT=0
 SRC_URI=ftp://ftp.coin3d.org/pub/coin/src/all/SoQt-1.4.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3567bb92f435149a6958b95957a27edc
diff --git a/metadata/md5-cache/media-libs/a52dec-0.7.4-r6 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
index 439aa6e7857f..8cc15d1a39c9 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=djbfft? ( sci-libs/djbfft )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70ce1be30f70717ed6e5afbb714a70e9
diff --git a/metadata/md5-cache/media-libs/aften-0.0.8 b/metadata/md5-cache/media-libs/aften-0.0.8
index facda62823af..2b21d1c8b51d 100644
--- a/metadata/md5-cache/media-libs/aften-0.0.8
+++ b/metadata/md5-cache/media-libs/aften-0.0.8
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1 BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/aften/aften-0.0.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b3ef0ab44f344aed6fdbfa7d8f5fdb3
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.2 b/metadata/md5-cache/media-libs/allegro-4.4.2
index 8040a47f34fb..0517fd7343ab 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.2
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2
@@ -9,5 +9,5 @@ LICENSE=Allegro as-is GPL-2 ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/opengl virtual/glu ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ed88c934af7d7fcd18883bc3ef0d36e
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.2-r1 b/metadata/md5-cache/media-libs/allegro-4.4.2-r1
index 7081dfaf1946..229a193cbe56 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.2-r1
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=Allegro as-is GPL-2 ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1472da9b51c2ec8ad55f74060627e20a
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.4 b/metadata/md5-cache/media-libs/allegro-5.0.4
index 900fd5dcd350..77597f7bce41 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.4
+++ b/metadata/md5-cache/media-libs/allegro-5.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) dumb? ( media-libs/dumb ) flac? ( media-libs/flac ) jpeg? ( virtual/jpeg ) openal? ( media-libs/openal ) physfs? ( dev-games/physfs ) png? ( >=media-libs/libpng-1.4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) truetype? ( >=media-libs/freetype-2 ) vorbis? ( media-libs/libvorbis ) x11-libs/libXcursor x11-libs/libXxf86vm x11-libs/libXrandr x11-libs/libX11 gtk? ( x11-libs/gtk+:2 ) virtual/opengl xinerama? ( x11-libs/libXinerama )
 SLOT=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54e1a8f8501f4b318d0724f4bfd9011a
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.5 b/metadata/md5-cache/media-libs/allegro-5.0.5
index 95e84eca06b3..cc2360980451 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.5
+++ b/metadata/md5-cache/media-libs/allegro-5.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) dumb? ( media-libs/dumb ) flac? ( media-libs/flac ) jpeg? ( virtual/jpeg ) openal? ( media-libs/openal ) physfs? ( dev-games/physfs ) png? ( >=media-libs/libpng-1.4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) truetype? ( >=media-libs/freetype-2 ) vorbis? ( media-libs/libvorbis ) x11-libs/libXcursor x11-libs/libXxf86vm x11-libs/libXrandr x11-libs/libX11 gtk? ( x11-libs/gtk+:2 ) virtual/opengl xinerama? ( x11-libs/libXinerama )
 SLOT=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfec7fde249fae5fc1cb2152799d412c
diff --git a/metadata/md5-cache/media-libs/alure-1.2 b/metadata/md5-cache/media-libs/alure-1.2
index 4e178e86165c..c49f403fa98a 100644
--- a/metadata/md5-cache/media-libs/alure-1.2
+++ b/metadata/md5-cache/media-libs/alure-1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/openal-1.1 dumb? ( media-libs/dumb ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1 ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/alure-releases/alure-1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b1ec26a11d374b65b4396fe09a2a1a9
diff --git a/metadata/md5-cache/media-libs/chromaprint-0.6 b/metadata/md5-cache/media-libs/chromaprint-0.6
index 6cbdbf1fbf95..7b22a08fe0ae 100644
--- a/metadata/md5-cache/media-libs/chromaprint-0.6
+++ b/metadata/md5-cache/media-libs/chromaprint-0.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/ffmpeg-0.6 tools? ( >=media-libs/taglib-1.6 )
 SLOT=0
 SRC_URI=mirror://github/lalinsky/chromaprint/chromaprint-0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ce1384146c9b396894f607cd8621467
diff --git a/metadata/md5-cache/media-libs/coin-3.1.3-r1 b/metadata/md5-cache/media-libs/coin-3.1.3-r1
index 38d902b516e7..c6e1fdb1f492 100644
--- a/metadata/md5-cache/media-libs/coin-3.1.3-r1
+++ b/metadata/md5-cache/media-libs/coin-3.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 PEL )
 RDEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://ftp.coin3d.org/pub/coin/src/all/Coin-3.1.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40895f7846973eff7440513bb52656cc
diff --git a/metadata/md5-cache/media-libs/edje-1.2.1 b/metadata/md5-cache/media-libs/edje-1.2.1
index 2b2d9558fd34..90e55ed0e5e6 100644
--- a/metadata/md5-cache/media-libs/edje-1.2.1
+++ b/metadata/md5-cache/media-libs/edje-1.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.0.0_beta >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 doc? ( app-doc/doxygen )
+DEPEND=dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.2.0 >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 doc? ( app-doc/doxygen )
 DESCRIPTION=graphical layout and animation library
 EAPI=1
 HOMEPAGE=http://www.enlightenment.org/pages/edje.html
 IUSE=debug +cache static-libs vim-syntax nls doc
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.0.0_beta >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 nls? ( sys-devel/gettext )
+RDEPEND=dev-lang/lua >=dev-libs/eet-1.6.0 >=dev-libs/eina-1.2.0 >=dev-libs/embryo-1.2.0 >=media-libs/evas-1.2.0 >=dev-libs/ecore-1.2.0 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.enlightenment.org/releases/edje-1.2.1.tar.bz2
 _eclasses_=enlightenment	8b2f159cf37ac63433934b2282d9c318	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cb36b97e587243f757cd34514e6293ff
+_md5_=5a1c657fabebd7daecc832be087357ed
diff --git a/metadata/md5-cache/media-libs/fidlib-0.9.10 b/metadata/md5-cache/media-libs/fidlib-0.9.10
index ac541c3bd17b..f3d0e9007215 100644
--- a/metadata/md5-cache/media-libs/fidlib-0.9.10
+++ b/metadata/md5-cache/media-libs/fidlib-0.9.10
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://uazu.net/fidlib/fidlib-0.9.10.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb0e36a7edea643e2f6cf00def250253
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1 b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
index cb73fc4df07d..f4c592525222 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r1
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa7d5fafe24c561cd5f0119c444cec8f
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2 b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
index 4a2e5ecb300f..caac09f5a1de 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bcf1d7bf83f0c616e9f8b1b4c45d7352
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.9.0 b/metadata/md5-cache/media-libs/fontconfig-2.9.0
index 2250a38a4e1a..a832a4dcee00 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.9.0
+++ b/metadata/md5-cache/media-libs/fontconfig-2.9.0
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27caba3f3bdc5d27444784fb3b37e098
diff --git a/metadata/md5-cache/media-libs/freeglut-2.6.0 b/metadata/md5-cache/media-libs/freeglut-2.6.0
index 305cbc507a9e..1e91880486b7 100644
--- a/metadata/md5-cache/media-libs/freeglut-2.6.0
+++ b/metadata/md5-cache/media-libs/freeglut-2.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-2.6.0.tar.gz mpx? ( http://tisch.sourceforge.net/freeglut-2.6.0-mpx-r6.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1853daa8ff2139124e78962936e023c8
diff --git a/metadata/md5-cache/media-libs/freetype-2.4.9 b/metadata/md5-cache/media-libs/freetype-2.4.10
similarity index 50%
rename from metadata/md5-cache/media-libs/freetype-2.4.9
rename to metadata/md5-cache/media-libs/freetype-2.4.10
index 84200e970369..10e5dee0c1b8 100644
--- a/metadata/md5-cache/media-libs/freetype-2.4.9
+++ b/metadata/md5-cache/media-libs/freetype-2.4.10
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A high-quality and portable font engine
 EAPI=4
 HOMEPAGE=http://www.freetype.org/
 IUSE=X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=FTL GPL-2
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad5ca274ff8f8fdc55ddb6292cde2ec9
+SRC_URI=mirror://sourceforge/freetype/freetype-2.4.10.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.10.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.10.tar.bz2 )
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f9ea51a49b920e65c3d80054b08544a2
diff --git a/metadata/md5-cache/media-libs/freetype-2.4.9-r1 b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
index 86961975231f..e909d33f5c9b 100644
--- a/metadata/md5-cache/media-libs/freetype-2.4.9-r1
+++ b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
@@ -9,5 +9,5 @@ LICENSE=FTL GPL-2
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45a9edd28820ea17cba195a62a197e8d
diff --git a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5 b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
index 13ed4605d11d..c1f6e4649519 100644
--- a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
+++ b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://sourceforge/ftgl/ftgl-2.1.3-rc5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46d6cce75c2b772d76d8b7aab327f307
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.5.5 b/metadata/md5-cache/media-libs/game-music-emu-0.5.5
index 6aa41a34ed46..0eaf20c83347 100644
--- a/metadata/md5-cache/media-libs/game-music-emu-0.5.5
+++ b/metadata/md5-cache/media-libs/game-music-emu-0.5.5
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://game-music-emu.googlecode.com/files/game-music-emu-0.5.5.tbz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d839ab58ca8c72bf1d7e9806afe474f3
diff --git a/metadata/md5-cache/media-libs/glpng-1.45-r1 b/metadata/md5-cache/media-libs/glpng-1.45-r1
index 3ab5d743ed60..d00fffb86d5e 100644
--- a/metadata/md5-cache/media-libs/glpng-1.45-r1
+++ b/metadata/md5-cache/media-libs/glpng-1.45-r1
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/libpng sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/glpng-1.45.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c981d14dad37b6f34f29ea9c882a291a
diff --git a/metadata/md5-cache/media-libs/gluon-0.70.0 b/metadata/md5-cache/media-libs/gluon-0.70.0
index 905b6f4fdabe..a9ea63ea82c1 100644
--- a/metadata/md5-cache/media-libs/gluon-0.70.0
+++ b/metadata/md5-cache/media-libs/gluon-0.70.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/glew media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl x11-libs/libXrandr >=kde-base/oxygen-icons-4.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://gluon.gamingfreedom.org/sites/default/files/gluon-0.70.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=51f46d209a55c41f83e39ad6951c6f1f
diff --git a/metadata/md5-cache/media-libs/gluon-0.71.0 b/metadata/md5-cache/media-libs/gluon-0.71.0
new file mode 100644
index 000000000000..a0a9d7558067
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gluon-0.71.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/alure media-libs/libsndfile media-libs/openal virtual/glu virtual/opengl x11-libs/qt-declarative:4 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Gluon is a Free and Open Source framework for creating and distributing games.
+EAPI=4
+HOMEPAGE=http://gluon.tuxfamily.org/
+IUSE=debug examples aqua
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=media-libs/alure media-libs/libsndfile media-libs/openal virtual/glu virtual/opengl x11-libs/qt-declarative:4 >=kde-base/oxygen-icons-4.4:4[aqua=] >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/unstable/gluon/0.71/src/gluon-0.71.0.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=5f842c19c1996913d3c9fef80e8d918e
diff --git a/metadata/md5-cache/media-libs/glyr-0.9.9 b/metadata/md5-cache/media-libs/glyr-0.9.9
index 83836ac7dbd8..1e3fcf1f6eae 100644
--- a/metadata/md5-cache/media-libs/glyr-0.9.9
+++ b/metadata/md5-cache/media-libs/glyr-0.9.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.10 net-misc/curl
 SLOT=0
 SRC_URI=mirror://github/sahib/glyr/glyr-0.9.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ff45759a999701dfecacf74e7cd5e09
diff --git a/metadata/md5-cache/media-libs/gmtk-1.0.5 b/metadata/md5-cache/media-libs/gmtk-1.0.5
index 7b93044704aa..b20154be37cc 100644
--- a/metadata/md5-cache/media-libs/gmtk-1.0.5
+++ b/metadata/md5-cache/media-libs/gmtk-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26 x11-libs/gtk+:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dconf? ( gnome-base/dconf )
 SLOT=0
 SRC_URI=http://gmtk.googlecode.com/files/gmtk-1.0.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb2f457b93326cbadb212aae3b1e209e
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.19 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.19
index 2561294ea946..24b343527ba2 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.19
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.19
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.29 >=media-libs/gstreamer-0.10.29 >=dev-libs/glib-2.16 >=dev-libs/liboil-0.3.8 !<media-plugins/gst-plugins-farsight-0.12.11
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.19.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c06cdf48243b66b001222e628dc6921a
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.21 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.21
index bcc723164350..e806270e1bb1 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.21
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.21
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.32 >=media-libs/gstreamer-0.10.32 >=dev-libs/glib-2.22 orc? ( >=dev-lang/orc-0.4.7 ) !<media-plugins/gst-plugins-farsight-0.12.11
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.21.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0af4e39e9e94e8a836879869e481e99d
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.22 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.22
index ed669e8e87cf..aea40e115ba1 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.22
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.22
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.33 >=media-libs/gstreamer-0.10.33 >=dev-libs/glib-2.22 orc? ( >=dev-lang/orc-0.4.11 ) !<media-plugins/gst-plugins-farsight-0.12.11
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-bad	b7837b306104936ec96e78be4ea05fd5	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=734b6325c39e46d9b3829df1df9b77cd
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
index 246a80b039a1..ab467314a67b 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.22 >=media-libs/gstreamer-0.10.32 dev-libs/libxml2 app-text/iso-codes orc? ( >=dev-lang/orc-0.4.11 ) !<media-libs/gst-plugins-bad-0.10.10
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb4daa9a3ee824b6af8c08b8b69447b0
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.23 b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.23
index e754c88fb802..b7b4a2bf6375 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.23
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.23
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gst-plugins-base-0.10.29 >=media-libs/gstreamer-0.10.29 >=dev-libs/liboil-0.3.14 sys-libs/zlib app-arch/bzip2
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.23.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef365cd35ebe2513787ed4331bd2e45d
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.28 b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.28
index 5e57f10113b2..b4d2050ee77d 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.28
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.28
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gst-plugins-base-0.10.32 >=media-libs/gstreamer-0.10.32 orc? ( >=dev-lang/orc-0.4.11 ) sys-libs/zlib app-arch/bzip2
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.28.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=595b2c12a712eaa04e5a7a18bafab78b
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.30 b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.30
index 6dfede45ba8b..381303cb2ae6 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.30
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.30
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gst-plugins-base-0.10.33 >=media-libs/gstreamer-0.10.33 orc? ( >=dev-lang/orc-0.4.11 ) sys-libs/zlib app-arch/bzip2
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.30.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-good	fa8b7c7c9ff1eef2de961769647b02bb	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e20260d3b31aefc42087f16094c20687
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.16 b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.16
index cccc8baa64c2..2eb35191cd05 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.16
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.26 >=media-libs/gstreamer-0.10.26 >=dev-libs/glib-2.20
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.16.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d785b4f7e333dfe3b3211549d7f15aa8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.17 b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.17
index 7b4c7ca9ca5a..bcb43c21eea0 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.17
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.26 >=media-libs/gstreamer-0.10.26 >=dev-libs/glib-2.20
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bca930bb48aadace8b271b0a98ce379
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.18 b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.18
index c97feac1d522..07697bdb0837 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.18
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.18
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10.26 >=media-libs/gstreamer-0.10.26 >=dev-libs/glib-2.20
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.18.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4e32f5e25c3035ccf700e58e9dc7acb
diff --git a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r1 b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r1
index ce5fd02a5df2..a2ae7677d9bf 100644
--- a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r1
+++ b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/ladspa_sdk_1.13.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1469fe5b25efd353ae4b8bff82c0e904
diff --git a/metadata/md5-cache/media-libs/lasi-1.1.1 b/metadata/md5-cache/media-libs/lasi-1.1.1
index 3780a29026ed..51c8d3de3f3d 100644
--- a/metadata/md5-cache/media-libs/lasi-1.1.1
+++ b/metadata/md5-cache/media-libs/lasi-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freetype:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/lasi/libLASi-1.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59886db90bebc262e989bbb1cdd61cc7
diff --git a/metadata/md5-cache/media-libs/lensfun-0.2.5_p153-r1 b/metadata/md5-cache/media-libs/lensfun-0.2.5_p153-r1
index d844b0e9b6ea..57f04e517e7e 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.2.5_p153-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.2.5_p153-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2 >=media-libs/libpng-1.2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/lensfun-0.2.5_p153.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94a98263e579dac80f93b90336b89c65
diff --git a/metadata/md5-cache/media-libs/leptonica-1.68 b/metadata/md5-cache/media-libs/leptonica-1.68
index b10bc15149f6..d7c835c6dbfa 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.68
+++ b/metadata/md5-cache/media-libs/leptonica-1.68
@@ -10,4 +10,4 @@ RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libp
 SLOT=0
 SRC_URI=http://www.leptonica.com/source/leptonica-1.68.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=460bdda7f2e5441dad743b916ba8df30
+_md5_=c6c0de816c4405b33db798a345c702f6
diff --git a/metadata/md5-cache/media-libs/libao-1.1.0 b/metadata/md5-cache/media-libs/libao-1.1.0
deleted file mode 100644
index ddff3bed07b6..000000000000
--- a/metadata/md5-cache/media-libs/libao-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig
-DESCRIPTION=The Audio Output library
-EAPI=3
-HOMEPAGE=http://www.xiph.org/ao/
-IUSE=alsa nas mmap pulseaudio static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz
-_eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=57c58f80ee462fe3b8cd5b2ce6f5ea89
diff --git a/metadata/md5-cache/media-libs/libao-1.1.0-r1 b/metadata/md5-cache/media-libs/libao-1.1.0-r1
index 865215965053..b9754e0a7761 100644
--- a/metadata/md5-cache/media-libs/libao-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/libao-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Audio Output library
 EAPI=4
 HOMEPAGE=http://www.xiph.org/ao/
 IUSE=alsa nas mmap pulseaudio static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz
-_eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=28a548c7d4fc8e63adf31030bd97cc17
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c2cafd07ac716bd99f9018323c013c51
diff --git a/metadata/md5-cache/media-libs/libbluray-0.2.1-r1 b/metadata/md5-cache/media-libs/libbluray-0.2.1-r1
index 8c0a869be488..cf4192da6e98 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.2.1-r1
+++ b/metadata/md5-cache/media-libs/libbluray-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.1/libbluray-0.2.1.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/libbluray-0.2.1-bdj.patch.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d10e188461db5124ccd1d9d2e545335b
diff --git a/metadata/md5-cache/media-libs/libbluray-0.2.2 b/metadata/md5-cache/media-libs/libbluray-0.2.2
index 36b6aa4263ce..b019cf9dfa1a 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.2.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.2/libbluray-0.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a63eaf0c29deeff4efd6bb923546648
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index e9e1a834642e..c3ecf1949e0b 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38c989081b33a3e943dad5dc383c317a
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta17 b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
index 5762378180b0..d67d77176791 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta17
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta17.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce6c24f080bcb6b46d4f48f40b4fb594
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18
index 321f029b4233..71c5da079099 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b05e7b16d604e527d3bd9629cf614c4
diff --git a/metadata/md5-cache/media-libs/libcuefile-444 b/metadata/md5-cache/media-libs/libcuefile-444
index 6e6161684da1..cf0591f9b87d 100644
--- a/metadata/md5-cache/media-libs/libcuefile-444
+++ b/metadata/md5-cache/media-libs/libcuefile-444
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/libcuefile-444.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90bcc023579a3b2aa54ca31ebb4b0494
diff --git a/metadata/md5-cache/media-libs/libcuefile-465 b/metadata/md5-cache/media-libs/libcuefile-465
index 3f144751db24..cf5ce4e2853a 100644
--- a/metadata/md5-cache/media-libs/libcuefile-465
+++ b/metadata/md5-cache/media-libs/libcuefile-465
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-m
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/libcuefile-465.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4573d4ef215e769044b2aeb644f362e
diff --git a/metadata/md5-cache/media-libs/libcuefile-477 b/metadata/md5-cache/media-libs/libcuefile-477
index 6e0d2a475687..61e4cd7a5851 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477
+++ b/metadata/md5-cache/media-libs/libcuefile-477
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ce36f99649621a593cea1c4a1666e53
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.5-r2 b/metadata/md5-cache/media-libs/libdca-0.0.5-r2
index 7f98c660d90c..fb61943a8198 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.5-r2
+++ b/metadata/md5-cache/media-libs/libdca-0.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-libs/libdts
 SLOT=0
 SRC_URI=http://www.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2 mirror://gentoo/libdca-0.0.5-constant.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c91fbaa0ca425da99b7ce624e06db249
diff --git a/metadata/md5-cache/media-libs/libechonest-1.2.1 b/metadata/md5-cache/media-libs/libechonest-1.2.1
index bebf609cc83b..15ac58fb0584 100644
--- a/metadata/md5-cache/media-libs/libechonest-1.2.1
+++ b/metadata/md5-cache/media-libs/libechonest-1.2.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/qjson-0.5 x11-libs/qt-core:4
 RESTRICT=test
 SLOT=0
 SRC_URI=http://pwsp.cleinias.com/libechonest-1.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80693c3693f924ca5934a2e1e5e3a2fb
diff --git a/metadata/md5-cache/media-libs/libextractor-0.6.3 b/metadata/md5-cache/media-libs/libextractor-0.6.3
index a4330d610517..4e0c869a2112 100644
--- a/metadata/md5-cache/media-libs/libextractor-0.6.3
+++ b/metadata/md5-cache/media-libs/libextractor-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-text/iso-codes app-text/poppler[cairo] >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-0.6.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1310efbe0934326c8adbf1c7645fb291
diff --git a/metadata/md5-cache/media-libs/libextractor-0.6.3-r1 b/metadata/md5-cache/media-libs/libextractor-0.6.3-r1
index 5a9d22473810..f089ff563e20 100644
--- a/metadata/md5-cache/media-libs/libextractor-0.6.3-r1
+++ b/metadata/md5-cache/media-libs/libextractor-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2 medi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-0.6.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57cceef0ddb17930d74f933fa9b56971
diff --git a/metadata/md5-cache/media-libs/libfpx-1.3.0-r1 b/metadata/md5-cache/media-libs/libfpx-1.3.0-r1
index e682e1802a86..0c5169346bfb 100644
--- a/metadata/md5-cache/media-libs/libfpx-1.3.0-r1
+++ b/metadata/md5-cache/media-libs/libfpx-1.3.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=as-is
 SLOT=0
 SRC_URI=mirror://imagemagick/delegates/libfpx-1.3.0-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7aed1544f203bedf05a8b8dd66c6ee01
diff --git a/metadata/md5-cache/media-libs/libkface-2.5.0 b/metadata/md5-cache/media-libs/libkface-2.5.0
index ff9fcb68a714..a832777d8c91 100644
--- a/metadata/md5-cache/media-libs/libkface-2.5.0
+++ b/metadata/md5-cache/media-libs/libkface-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/opencv-2.1 >=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=13d348fc5d90f5de83506ce0f3b0b546
diff --git a/metadata/md5-cache/media-libs/libkface-2.6.0 b/metadata/md5-cache/media-libs/libkface-2.6.0
index cb1241063687..e28694545f5d 100644
--- a/metadata/md5-cache/media-libs/libkface-2.6.0
+++ b/metadata/md5-cache/media-libs/libkface-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/opencv >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=915603b3cd66fe7bdcbdd144bb5296f1
diff --git a/metadata/md5-cache/media-libs/libkgeomap-2.5.0 b/metadata/md5-cache/media-libs/libkgeomap-2.5.0
index c770c0d14db3..c1c6c215d2b2 100644
--- a/metadata/md5-cache/media-libs/libkgeomap-2.5.0
+++ b/metadata/md5-cache/media-libs/libkgeomap-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkexiv2-4.7:4[aqua=] >=kde-base/marble-4.7:4[aqua=,kde,plasma] !media-libs/libkmap >=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=febd32e5cba931c21389dff3ae170ee7
diff --git a/metadata/md5-cache/media-libs/libkgeomap-2.6.0 b/metadata/md5-cache/media-libs/libkgeomap-2.6.0
index 4d84d8fe5d95..e3ccedd3bf4e 100644
--- a/metadata/md5-cache/media-libs/libkgeomap-2.6.0
+++ b/metadata/md5-cache/media-libs/libkgeomap-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkexiv2-4.8:4[aqua=] >=kde-base/marble-4.8:4[aqua=,kde,plasma] >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=128e2710d0a1531b241efc5c11cf079c
diff --git a/metadata/md5-cache/media-libs/liblastfm-1.0.1 b/metadata/md5-cache/media-libs/liblastfm-1.0.1
index 10ee8cd2d644..5bc00eff2120 100644
--- a/metadata/md5-cache/media-libs/liblastfm-1.0.1
+++ b/metadata/md5-cache/media-libs/liblastfm-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.8.0:4 >=x11-libs/qt-dbus-4.8.0:4 fingerprint? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cdn.last.fm/client/liblastfm-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45e0b170d1cdb089e6dec5ef4761313d
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r6 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
index 8c4ab6e76399..26ea52fd3cb6 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r6
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fec70d4baff2f406ad1a0dc4584e9051
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r7 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
index 42ab51e4c6ba..e94d90fe86bf 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r7
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6095094f145555ea2b82a9d49c41c1e8
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.2.0 b/metadata/md5-cache/media-libs/libmatroska-1.2.0
index 4bc239469ab6..4713bfb72ce3 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.2.0
+++ b/metadata/md5-cache/media-libs/libmatroska-1.2.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/libebml-1.2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/libmatroska-1.2.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d36f8af3b042f6a14a650cbca4a572f
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.3.0 b/metadata/md5-cache/media-libs/libmatroska-1.3.0
index 3fd4a83c4353..94f6adee82af 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.3.0
+++ b/metadata/md5-cache/media-libs/libmatroska-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible multimedia container format based on EBML
 EAPI=4
 HOMEPAGE=http://www.matroska.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/libmatroska-1.3.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=348bdbe79e3420b34dfe47fa661c9a75
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7d20068493a204773318a2705c8d4ef1
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.56 b/metadata/md5-cache/media-libs/libmediainfo-0.7.56
index 3235adbc9eba..5e92827f0dc0 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.56
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.56
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.26[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.56/libmediainfo_0.7.56.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e11f9bbd476b85a7273eac47fb8519d
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.58 b/metadata/md5-cache/media-libs/libmediainfo-0.7.58
index 59ed58f27e5b..da0f577d8ea6 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.58
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.58
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.27[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/source/libmediainfo/0.7.58/libmediainfo_0.7.58.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f31cf9ddb43ed50a9c9ed8e8e7e0f4d6
diff --git a/metadata/md5-cache/media-libs/libmediawiki-2.3.0 b/metadata/md5-cache/media-libs/libmediawiki-2.3.0
index c49741851b4c..6be8a929e4b9 100644
--- a/metadata/md5-cache/media-libs/libmediawiki-2.3.0
+++ b/metadata/md5-cache/media-libs/libmediawiki-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e93c3245c328b82b666dc2a8bb2015c
diff --git a/metadata/md5-cache/media-libs/libmediawiki-2.6.0 b/metadata/md5-cache/media-libs/libmediawiki-2.6.0
index eae111547986..a9d9cbb874d8 100644
--- a/metadata/md5-cache/media-libs/libmediawiki-2.6.0
+++ b/metadata/md5-cache/media-libs/libmediawiki-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4af7bcfb085e51b216867bd6fd3c3687
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.1.12-r1 b/metadata/md5-cache/media-libs/libmikmod-3.1.12-r1
index cc4ed66daf49..de8f55052c43 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.1.12-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.1.12-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-2 )
 SLOT=2
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.1.12.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da84a8fa872166f95161f41df5f7e8d7
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r3 b/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r3
index 079b46ca9b75..16bed8be9bb8 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r3
+++ b/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-f
 LICENSE=|| ( LGPL-2.1 LGPL-2 )
 SLOT=0
 SRC_URI=http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=903ad340eb04fe4d54377bde24355a8b
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r5 b/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r5
index 9c0781e5a2e6..86b8741563e4 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r5
+++ b/metadata/md5-cache/media-libs/libmikmod-3.2.0_beta2-r5
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f
 LICENSE=|| ( LGPL-2.1 LGPL-2 )
 SLOT=0
 SRC_URI=http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea2eb4fc305b26e24b0aa3fa3a170476
diff --git a/metadata/md5-cache/media-libs/libnut-503 b/metadata/md5-cache/media-libs/libnut-503
index 472cb698d97e..b7f359bee553 100644
--- a/metadata/md5-cache/media-libs/libnut-503
+++ b/metadata/md5-cache/media-libs/libnut-503
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://gentoo/libnut-503.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3366858831e1549282423dfe3f32dc6
diff --git a/metadata/md5-cache/media-libs/libnut-661 b/metadata/md5-cache/media-libs/libnut-661
index 1cdfcca80853..8b889ebb49a9 100644
--- a/metadata/md5-cache/media-libs/libnut-661
+++ b/metadata/md5-cache/media-libs/libnut-661
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://gentoo/libnut-661.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f363e501612b728cd3ff117a4737f97c
diff --git a/metadata/md5-cache/media-libs/libofa-0.9.3 b/metadata/md5-cache/media-libs/libofa-0.9.3
index e656fe098e9c..65da14214e2e 100644
--- a/metadata/md5-cache/media-libs/libofa-0.9.3
+++ b/metadata/md5-cache/media-libs/libofa-0.9.3
@@ -8,5 +8,5 @@ LICENSE=|| ( APL-1.0 GPL-2 )
 RDEPEND=dev-libs/expat net-misc/curl >=sci-libs/fftw-3
 SLOT=0
 SRC_URI=http://musicip-libofa.googlecode.com/files/libofa-0.9.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9ede5db8f46cb81b59db41b4f63657e
diff --git a/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120229 b/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120229
index 3ffc11824a44..bd32b17f5838 100644
--- a/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120229
+++ b/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120229
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/ffmpeg-0.10.2-r1 !<media-video/libav-0.8.2-r2 !media-video/ffmpeg
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lu_zero/distfiles/libpostproc-0.8.0.20120229.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2168e0dee98a7224519287b9ad3f34d
diff --git a/metadata/md5-cache/media-libs/libpostproc-9999 b/metadata/md5-cache/media-libs/libpostproc-9999
index de1b0f2fd8d9..9f0ee73dcf4b 100644
--- a/metadata/md5-cache/media-libs/libpostproc-9999
+++ b/metadata/md5-cache/media-libs/libpostproc-9999
@@ -7,5 +7,5 @@ IUSE=pic static-libs 3dnow 3dnowext altivec mmx vis
 LICENSE=GPL-2
 RDEPEND=>=virtual/ffmpeg-0.10.2-r2 !<media-video/libav-0.8.2-r2 !media-video/ffmpeg
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d49286fd5a9bc86f6f08a4d2fd9a9c1
diff --git a/metadata/md5-cache/media-libs/libprojectm-1.2.0 b/metadata/md5-cache/media-libs/libprojectm-1.2.0
index 41e663a731f0..e09602e35070 100644
--- a/metadata/md5-cache/media-libs/libprojectm-1.2.0
+++ b/metadata/md5-cache/media-libs/libprojectm-1.2.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/ftgl media-libs/freetype media-libs/mesa media-libs/glew sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/libprojectM-1.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=225c343154912778633db34cf18f1c7a
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.0.1-r1 b/metadata/md5-cache/media-libs/libprojectm-2.0.1-r1
index af7d93c998ed..c4233067251d 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.0.1-r1
+++ b/metadata/md5-cache/media-libs/libprojectm-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-2.0.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ba053fa717aaf727bf6f18689aceb61
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.1.0 b/metadata/md5-cache/media-libs/libprojectm-2.1.0
index fce10db8ecc9..8839d43fad0e 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.1.0
+++ b/metadata/md5-cache/media-libs/libprojectm-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c9ded9775d8d88387921dc2c9258a19
diff --git a/metadata/md5-cache/media-libs/libprojectm-qt-1.2.0 b/metadata/md5-cache/media-libs/libprojectm-qt-1.2.0
index 052df5641b29..d8f8cab34ae0 100644
--- a/metadata/md5-cache/media-libs/libprojectm-qt-1.2.0
+++ b/metadata/md5-cache/media-libs/libprojectm-qt-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libprojectm-1.1 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/libprojectM-qt-1.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb6e160e9b8ddc6f355cd542dfc1ab18
diff --git a/metadata/md5-cache/media-libs/libprojectm-qt-2.0.1 b/metadata/md5-cache/media-libs/libprojectm-qt-2.0.1
index 980b30615837..3f91f836e966 100644
--- a/metadata/md5-cache/media-libs/libprojectm-qt-2.0.1
+++ b/metadata/md5-cache/media-libs/libprojectm-qt-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libprojectm-2.0.1 x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-qt-2.0.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9183b829804fb54540098be41825cb09
diff --git a/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0 b/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0
index c61020171d11..25414ed071e9 100644
--- a/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0
+++ b/metadata/md5-cache/media-libs/libprojectm-qt-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libprojectm-2.1.0 x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-qt-2.1.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9470434948515cb18f2693f5ad98d8c
diff --git a/metadata/md5-cache/media-libs/libreplaygain-444 b/metadata/md5-cache/media-libs/libreplaygain-444
index 61a2543d03d4..78f9a46ec82b 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-444
+++ b/metadata/md5-cache/media-libs/libreplaygain-444
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/libreplaygain-444.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed6fc979fe36b7de3d10b89447381caf
diff --git a/metadata/md5-cache/media-libs/libreplaygain-465 b/metadata/md5-cache/media-libs/libreplaygain-465
index cbad3cc685a4..7ae11af5af5a 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-465
+++ b/metadata/md5-cache/media-libs/libreplaygain-465
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-m
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/libreplaygain-465.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=926b4e403b7d41d216ad3bf6cfff65d5
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477 b/metadata/md5-cache/media-libs/libreplaygain-477
index 5d4c383103fd..7fbf64a67ca1 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477
+++ b/metadata/md5-cache/media-libs/libreplaygain-477
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3434ce65a113426b293af706f6d75180
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.14-r6 b/metadata/md5-cache/media-libs/libsdl-1.2.14-r6
index dd44a69ffe78..72dde1a4f630 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.14-r6
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.14-r6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c128e655efad0c4ad3322d1942eb55f9
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15 b/metadata/md5-cache/media-libs/libsdl-1.2.15
index 4b69c84b445c..125f80745966 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3dfa6b9c61e6632364d1d75fd7b43725
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r1 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r1
index 1d1fa082d703..2e57c5b7d839 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r1
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d380226ac3adac82ccabb4ae9b534597
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r2 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r2
index e0307f7080b5..617a43b2ba81 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r2
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=audio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas x11-libs/libXt x11-libs/libXext x11-libs/libX11 ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-libs/libXrandr ) directfb? ( >=dev-libs/DirectFB-0.9.19 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) opengl? ( virtual/opengl virtual/glu ) ppc64? ( ps3? ( sys-libs/libspe2 ) ) tslib? ( x11-libs/tslib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d443d50f67ebc8c603e3c02533f1a6b
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.25 b/metadata/md5-cache/media-libs/libsndfile-1.0.25
index 3eb2f4da32a0..5342e0a143b5 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.25
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.25
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1 >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.3 ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbd27dcae77e0f0af2c31d8f4a7a9fbf
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.6.0 b/metadata/md5-cache/media-libs/libsoundtouch-1.6.0
index 223087ec97fb..5e4b96ddcbdd 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.6.0
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.6.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.6.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=673b330c0440b45233d48a49e7aeac71
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1 b/metadata/md5-cache/media-libs/libtheora-1.1.1
index ac8763cfe176..fbae1b06e500 100644
--- a/metadata/md5-cache/media-libs/libtheora-1.1.1
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libogg encode? ( media-libs/libvorbis ) examples? ( media-libs/libpng media-libs/libvorbis >=media-libs/libsdl-0.11.0 )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=122888d6e4e476e8a1533566061bb1e3
diff --git a/metadata/md5-cache/media-libs/mesa-7.10.3 b/metadata/md5-cache/media-libs/mesa-7.10.3
index 4d6673d774ba..66bf39e3d865 100644
--- a/metadata/md5-cache/media-libs/mesa-7.10.3
+++ b/metadata/md5-cache/media-libs/mesa-7.10.3
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.10.3/MesaLib-7.10.3.tar.bz2 mirror://gentoo/mesa-7.10.1-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1cbda4c93235119e0674aaa85d76894
diff --git a/metadata/md5-cache/media-libs/mesa-7.11 b/metadata/md5-cache/media-libs/mesa-7.11
index 09e08d4c3c3b..e37eba0d551d 100644
--- a/metadata/md5-cache/media-libs/mesa-7.11
+++ b/metadata/md5-cache/media-libs/mesa-7.11
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.11/MesaLib-7.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e69e5be2d1c8dd6be2a5c54e70f99eb7
diff --git a/metadata/md5-cache/media-libs/mesa-7.11.2 b/metadata/md5-cache/media-libs/mesa-7.11.2
index 04d017eb84d0..f07d9e706f35 100644
--- a/metadata/md5-cache/media-libs/mesa-7.11.2
+++ b/metadata/md5-cache/media-libs/mesa-7.11.2
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.11.2/MesaLib-7.11.2.tar.bz2 mirror://gentoo/mesa-7.11.2-gentoo-patches-01.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e78eb59b4c1a1b486bb0ff8bc0f1c203
diff --git a/metadata/md5-cache/media-libs/mesa-8.0.3 b/metadata/md5-cache/media-libs/mesa-8.0.3
index cc4cb26b4f54..d7c809ef730d 100644
--- a/metadata/md5-cache/media-libs/mesa-8.0.3
+++ b/metadata/md5-cache/media-libs/mesa-8.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT LGPL-3 SGI-B-2.0
 RDEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] )
 REQUIRED_USE=d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/mesa-8.0.3-gentoo-patches-02.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66f9860e94160ac24a733cb6d359214c
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7d71057dfaf042e46098e782222afb7a
diff --git a/metadata/md5-cache/media-libs/mesa-8.0.3-r1 b/metadata/md5-cache/media-libs/mesa-8.0.3-r1
index 84895ab10e82..3246a173f6e8 100644
--- a/metadata/md5-cache/media-libs/mesa-8.0.3-r1
+++ b/metadata/md5-cache/media-libs/mesa-8.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 !<x11-base/xorg-
 REQUIRED_USE=d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/mesa-8.0.3-gentoo-patches-02.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8274e68bc094d283c14ab14549094f19
diff --git a/metadata/md5-cache/media-libs/ming-0.4.3-r1 b/metadata/md5-cache/media-libs/ming-0.4.3-r1
index 5d4f4fb83112..98d4dfef9b7b 100644
--- a/metadata/md5-cache/media-libs/ming-0.4.3-r1
+++ b/metadata/md5-cache/media-libs/ming-0.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ming/ming-0.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5d973a5c5d2a8806f1d5989f51cb2c9
diff --git a/metadata/md5-cache/media-libs/ming-0.4.3-r2 b/metadata/md5-cache/media-libs/ming-0.4.3-r2
index 44021fbe9921..2eeeacf621ac 100644
--- a/metadata/md5-cache/media-libs/ming-0.4.3-r2
+++ b/metadata/md5-cache/media-libs/ming-0.4.3-r2
@@ -10,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ming/ming-0.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41c1202b9e8fa13e90b4651facf04fff
diff --git a/metadata/md5-cache/media-libs/ming-0.4.4 b/metadata/md5-cache/media-libs/ming-0.4.4
index 8ff226875afc..70f62ad22c46 100644
--- a/metadata/md5-cache/media-libs/ming-0.4.4
+++ b/metadata/md5-cache/media-libs/ming-0.4.4
@@ -10,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ming/ming-0.4.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf9e468075299766bcfefd29046b8355
diff --git a/metadata/md5-cache/media-libs/musicbrainz-3.0.2 b/metadata/md5-cache/media-libs/musicbrainz-3.0.2
index a96f93e31adf..e885bf7b0592 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-3.0.2
+++ b/metadata/md5-cache/media-libs/musicbrainz-3.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/neon media-libs/libdiscid
 SLOT=3
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=845749057f8c15f2dc9b4353aa8706d3
diff --git a/metadata/md5-cache/media-libs/musicbrainz-3.0.3 b/metadata/md5-cache/media-libs/musicbrainz-3.0.3
index bf03c603eaad..46629f67d4a1 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-3.0.3
+++ b/metadata/md5-cache/media-libs/musicbrainz-3.0.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/neon media-libs/libdiscid
 SLOT=3
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f9d656a97fc7af2eb3e375c085c842b
diff --git a/metadata/md5-cache/media-libs/musicbrainz-4.0.3 b/metadata/md5-cache/media-libs/musicbrainz-4.0.3
index b1084d82dc11..43e4e2c52dd1 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-4.0.3
+++ b/metadata/md5-cache/media-libs/musicbrainz-4.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/neon
 SLOT=4
 SRC_URI=mirror://github/metabrainz/libmusicbrainz/libmusicbrainz-4.0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b91a73e24f0c4731cf28f6594aeca07
diff --git a/metadata/md5-cache/media-libs/musicbrainz-5.0.1 b/metadata/md5-cache/media-libs/musicbrainz-5.0.1
index a7102ffcd524..1279e3876d84 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-5.0.1
+++ b/metadata/md5-cache/media-libs/musicbrainz-5.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/neon
 SLOT=5
 SRC_URI=mirror://github/metabrainz/libmusicbrainz/libmusicbrainz-5.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74242ca7a2e5f2d890814a94677b9c2f
diff --git a/metadata/md5-cache/media-libs/openal-1.11.753 b/metadata/md5-cache/media-libs/openal-1.11.753
index 09725e0a7828..ed32c5884f3b 100644
--- a/metadata/md5-cache/media-libs/openal-1.11.753
+++ b/metadata/md5-cache/media-libs/openal-1.11.753
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.11.753.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc6861a6d59b2afdd5971cef606770da
diff --git a/metadata/md5-cache/media-libs/openal-1.12.854 b/metadata/md5-cache/media-libs/openal-1.12.854
index a06a9a0ffd1d..8b205e03af19 100644
--- a/metadata/md5-cache/media-libs/openal-1.12.854
+++ b/metadata/md5-cache/media-libs/openal-1.12.854
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.12.854.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f33c93ce03a78d4a21477f83a2744bd
diff --git a/metadata/md5-cache/media-libs/openal-1.13 b/metadata/md5-cache/media-libs/openal-1.13
index 96a2d538eca1..d7c2bd0c2f21 100644
--- a/metadata/md5-cache/media-libs/openal-1.13
+++ b/metadata/md5-cache/media-libs/openal-1.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d453e21bcbe5449cbc8098fbaff90da8
diff --git a/metadata/md5-cache/media-libs/opencollada-0_p864-r1 b/metadata/md5-cache/media-libs/opencollada-0_p864-r1
index cc5fddc74a0f..6e6bebdc0112 100644
--- a/metadata/md5-cache/media-libs/opencollada-0_p864-r1
+++ b/metadata/md5-cache/media-libs/opencollada-0_p864-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpcre expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) media-libs/lib3ds sys-libs/zlib dev-libs/zziplib
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/opencollada-0_p864.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0177621cb3a39e67851d1b6db5dc103d
diff --git a/metadata/md5-cache/media-libs/opencv-2.3.1a-r1 b/metadata/md5-cache/media-libs/opencv-2.3.1a-r1
index cb9c15797f7e..5b6956a45883 100644
--- a/metadata/md5-cache/media-libs/opencv-2.3.1a-r1
+++ b/metadata/md5-cache/media-libs/opencv-2.3.1a-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.3.1a.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=663f1aeef954fc3bb86f4187c5d04b3e
diff --git a/metadata/md5-cache/media-libs/opencv-2.3.1a-r20 b/metadata/md5-cache/media-libs/opencv-2.3.1a-r20
index 54765d1cc9f0..938377311880 100644
--- a/metadata/md5-cache/media-libs/opencv-2.3.1a-r20
+++ b/metadata/md5-cache/media-libs/opencv-2.3.1a-r20
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.3.1a.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1976af65a6f3837961f0eece4add8ca8
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.0 b/metadata/md5-cache/media-libs/opencv-2.4.0
index 799ec9732c6b..a4d102097f4a 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.0
+++ b/metadata/md5-cache/media-libs/opencv-2.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f11bee89f9b211dd4dca537fa138b249
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.15.2 b/metadata/md5-cache/media-libs/opengtl-0.9.15.2
index df325666bf27..01bcd19f9da6 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.15.2
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.15.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib
 SLOT=0
 SRC_URI=http://download.opengtl.org/OpenGTL-0.9.15.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1e671fd2fc8f192c645d6879ebf3540
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.16 b/metadata/md5-cache/media-libs/opengtl-0.9.16
index 95b4ac5fd48e..fefba4317619 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.16
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.16
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng =sys-devel/llvm-3.0* sys-libs/zlib
 SLOT=0
 SRC_URI=http://download.opengtl.org/OpenGTL-0.9.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e6eafc6656aa88673ff3ef3865e44de
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.17 b/metadata/md5-cache/media-libs/opengtl-0.9.17
index 4ec4d7360065..e3454e213952 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.17
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.17
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libpng =sys-devel/llvm-3.1*
 SLOT=0
 SRC_URI=http://download.opengtl.org/OpenGTL-0.9.17.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37d7d95c0ba9a4e1756ac6c036556733
diff --git a/metadata/md5-cache/media-libs/openimageio-0.10.2 b/metadata/md5-cache/media-libs/openimageio-0.10.2
index ed78bb8edfa9..57ce802b5f8a 100644
--- a/metadata/md5-cache/media-libs/openimageio-0.10.2
+++ b/metadata/md5-cache/media-libs/openimageio-0.10.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost media-libs/glew media-libs/ilmbase media-libs/jasper media-libs/libpng media-libs/openexr media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://github.com/OpenImageIO/oiio/tarball/Release-0.10.2 -> openimageio-0.10.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=081a0a5dcf2f4c17f6f3cd0e25afb066
diff --git a/metadata/md5-cache/media-libs/openimageio-0.10.5 b/metadata/md5-cache/media-libs/openimageio-0.10.5
index 3af8c0ea283c..8806051ed563 100644
--- a/metadata/md5-cache/media-libs/openimageio-0.10.5
+++ b/metadata/md5-cache/media-libs/openimageio-0.10.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost media-libs/glew media-libs/ilmbase media-libs/jasper media-libs/libpng media-libs/openexr media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://github.com/OpenImageIO/oiio/tarball/Release-0.10.5 -> openimageio-0.10.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c11d64b5284ddee5c05d775ec842c03f
diff --git a/metadata/md5-cache/media-libs/openinventor-2.1.5.10-r3 b/metadata/md5-cache/media-libs/openinventor-2.1.5.10-r3
index c2c751591380..69fbbc1c486b 100644
--- a/metadata/md5-cache/media-libs/openinventor-2.1.5.10-r3
+++ b/metadata/md5-cache/media-libs/openinventor-2.1.5.10-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=|| ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) >=x11-libs/openmotif-2.3:0 >=media-libs/freetype-2.0 media-fonts/corefonts virtual/jpeg
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3e5cf954a19253ace6791b349acc6d0
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.4-r1 b/metadata/md5-cache/media-libs/openjpeg-1.4-r1
index a68c75f5034e..d11cb585e6ee 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.4-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib
 SLOT=0
 SRC_URI=http://openjpeg.googlecode.com/files/openjpeg_v1_4_sources_r697.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7545c511f08bd727ef7a4612f7abf8fb
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.0 b/metadata/md5-cache/media-libs/openjpeg-1.5.0
index 61cac2a07707..07c3da8f2e6d 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.0
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ed92f4a91086ef97015eac7f27f4406
diff --git a/metadata/md5-cache/media-libs/phonon-4.4.2 b/metadata/md5-cache/media-libs/phonon-4.4.2
index eb1636c5f909..d2c8eab9a886 100644
--- a/metadata/md5-cache/media-libs/phonon-4.4.2
+++ b/metadata/md5-cache/media-libs/phonon-4.4.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-test-4.6.0:4[aqua=] >=x11-libs/qt-dbus-4.6.0:4[aqua=] >=x11-libs/qt-gui-4.6.0:4[aqua=] >=x11-libs/qt-opengl-4.6.0:4[aqua=] gstreamer? ( media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?] ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.4.2/phonon-4.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5b327594a99b14ded5979f5f9f89808
diff --git a/metadata/md5-cache/media-libs/phonon-4.4.3 b/metadata/md5-cache/media-libs/phonon-4.4.3
index 87c323e1ee1a..a6bf1f706458 100644
--- a/metadata/md5-cache/media-libs/phonon-4.4.3
+++ b/metadata/md5-cache/media-libs/phonon-4.4.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-test-4.6.0:4[aqua=] >=x11-libs/qt-dbus-4.6.0:4[aqua=] >=x11-libs/qt-gui-4.6.0:4[aqua=] >=x11-libs/qt-opengl-4.6.0:4[aqua=] gstreamer? ( media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?] ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.4.3/phonon-4.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a18458168a9b2eb5cb1cb0b57ebdab4
diff --git a/metadata/md5-cache/media-libs/phonon-4.5.0 b/metadata/md5-cache/media-libs/phonon-4.5.0
index d003ba9598b6..ea6ac4dd189a 100644
--- a/metadata/md5-cache/media-libs/phonon-4.5.0
+++ b/metadata/md5-cache/media-libs/phonon-4.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-
 REQUIRED_USE=|| ( aqua gstreamer vlc )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.5.0/src/phonon-4.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb001c014248573ebc7e3762aae9fb95
diff --git a/metadata/md5-cache/media-libs/phonon-4.5.1-r1 b/metadata/md5-cache/media-libs/phonon-4.5.1-r1
index b165465076b6..098006419667 100644
--- a/metadata/md5-cache/media-libs/phonon-4.5.1-r1
+++ b/metadata/md5-cache/media-libs/phonon-4.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6
 REQUIRED_USE=|| ( aqua gstreamer vlc )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.5.1/src/phonon-4.5.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8691bcb9a4af7f850078bc537022460f
diff --git a/metadata/md5-cache/media-libs/phonon-4.6.0-r1 b/metadata/md5-cache/media-libs/phonon-4.6.0-r1
index a03d37209a5c..ec848d7b827d 100644
--- a/metadata/md5-cache/media-libs/phonon-4.6.0-r1
+++ b/metadata/md5-cache/media-libs/phonon-4.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6
 REQUIRED_USE=|| ( aqua gstreamer vlc )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.6.0/src/phonon-4.6.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=265560c7eb7937e7a582580685a3b512
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
index 9efda262002a..87bd14362820 100644
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ b/metadata/md5-cache/media-libs/phonon-9999
@@ -9,5 +9,5 @@ PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( media-libs/phonon-gstreamer
 RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-test-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) zeitgeist? ( dev-libs/libqzeitgeist )
 REQUIRED_USE=|| ( aqua gstreamer vlc )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=339791e46414dc634ad10d4d8c893298
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.0
index ddae6e4ea9d4..13063a149537 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.0
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?,ogg,vorbis] =media-libs/phonon-4.5* >=x11-libs/qt-core-4.6.0:4[glib] >=x11-libs/qt-gui-4.6.0:4[glib] >=x11-libs/qt-opengl-4.6.0:4 virtual/opengl network? ( media-plugins/gst-plugins-soup )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.5.0/src/phonon-backend-gstreamer-4.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a36f1af8fbfbb68c81d36fa9270b50d
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.1 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.1
index d0eea3262dc4..2956e1d69f3d 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.1
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?,ogg,vorbis] >=media-libs/phonon-4.6.0 >=x11-libs/qt-core-4.6.0:4[glib] >=x11-libs/qt-gui-4.6.0:4[glib] >=x11-libs/qt-opengl-4.6.0:4 virtual/opengl network? ( media-plugins/gst-plugins-soup )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.5.1/src/phonon-backend-gstreamer-4.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fcca8a639a5a9936fce05c8d853a7da
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.6.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.6.0
index 9643098fedf1..7af7eb4459f6 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.6.0
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?,ogg,vorbis] >=media-libs/phonon-4.6.0 >=x11-libs/qt-core-4.6.0:4[glib] >=x11-libs/qt-gui-4.6.0:4[glib] >=x11-libs/qt-opengl-4.6.0:4 virtual/opengl network? ( media-plugins/gst-plugins-soup )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.6.0/src/phonon-backend-gstreamer-4.6.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=442aba9c8cc671ed611aac5de8a5201a
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-9999 b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
index a3add1f7d740..650a1162741d 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-9999
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
@@ -7,5 +7,5 @@ IUSE=alsa debug +network
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/gstreamer media-plugins/gst-plugins-meta[alsa?,ogg,vorbis] >=media-libs/phonon-4.6.0 >=x11-libs/qt-core-4.6.0:4[glib] >=x11-libs/qt-gui-4.6.0:4[glib] >=x11-libs/qt-opengl-4.6.0:4 virtual/opengl network? ( media-plugins/gst-plugins-soup )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a22c970d569b383c39e998e75a36249
diff --git a/metadata/md5-cache/media-libs/phonon-qt7-0_pre20110424 b/metadata/md5-cache/media-libs/phonon-qt7-0_pre20110424
index c7c2bac675fd..1bd24030665a 100644
--- a/metadata/md5-cache/media-libs/phonon-qt7-0_pre20110424
+++ b/metadata/md5-cache/media-libs/phonon-qt7-0_pre20110424
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/phonon-4.5
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/phonon-qt7-0_pre20110424.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1701860f8bd87f5a8b83293e3b129add
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.4.1 b/metadata/md5-cache/media-libs/phonon-vlc-0.4.1
index 754d8f5b96a8..576479d2024b 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.4.1
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==media-libs/phonon-4.5* >=media-video/vlc-1.1.1[dbus,ogg,vorbis] >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.4.1/phonon-backend-vlc-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec7294e55b1fa69e143339e1c040c9b4
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.5.0 b/metadata/md5-cache/media-libs/phonon-vlc-0.5.0
index c9d0cce95f8d..c8d570b1031a 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.5.0
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/phonon-4.6.0 media-video/vlc[dbus,ogg,vorbis] >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.5.0/src/phonon-backend-vlc-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b60bae8d2f68494a740222894cee101c
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-9999 b/metadata/md5-cache/media-libs/phonon-vlc-9999
index af3d1231925e..fcdba15a54ef 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-9999
+++ b/metadata/md5-cache/media-libs/phonon-vlc-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/phonon-4.6.0 media-video/vlc[dbus,ogg,vorbis] >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ac815be4d8fc9a4917d1d55c1ce1971
diff --git a/metadata/md5-cache/media-libs/plib-1.8.5 b/metadata/md5-cache/media-libs/plib-1.8.5
index 12665e8d32e9..440e2fc1c80a 100644
--- a/metadata/md5-cache/media-libs/plib-1.8.5
+++ b/metadata/md5-cache/media-libs/plib-1.8.5
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e512ee9496c3d197b27561ea4512956
diff --git a/metadata/md5-cache/media-libs/pnglite-0.1.17 b/metadata/md5-cache/media-libs/pnglite-0.1.17
index 5bab6b85bb66..57fae5d533df 100644
--- a/metadata/md5-cache/media-libs/pnglite-0.1.17
+++ b/metadata/md5-cache/media-libs/pnglite-0.1.17
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/pnglite/pnglite-0.1.17.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d77319c2bc9584223a32a978a96ae7c2
diff --git a/metadata/md5-cache/media-libs/portmidi-217 b/metadata/md5-cache/media-libs/portmidi-217
index d4cc8273e235..2889b04dff3e 100644
--- a/metadata/md5-cache/media-libs/portmidi-217
+++ b/metadata/md5-cache/media-libs/portmidi-217
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a51090f57b505a2746543c20329179c
diff --git a/metadata/md5-cache/media-libs/prison-1.0 b/metadata/md5-cache/media-libs/prison-1.0
index ae7ade2999e1..ef1e5861b368 100644
--- a/metadata/md5-cache/media-libs/prison-1.0
+++ b/metadata/md5-cache/media-libs/prison-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/qrencode media-libs/libdmtx >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/prison/1.0/src/prison-1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04b3b388a0d83316b0b0f4ccfbf9c916
diff --git a/metadata/md5-cache/media-libs/qhull-2010.1-r2 b/metadata/md5-cache/media-libs/qhull-2010.1-r2
index a278eac19feb..6cc7626d1d4d 100644
--- a/metadata/md5-cache/media-libs/qhull-2010.1-r2
+++ b/metadata/md5-cache/media-libs/qhull-2010.1-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linu
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.qhull.org/download/qhull-2010.1-src.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4611884113141bb99cc733fc838fb31f
diff --git a/metadata/md5-cache/media-libs/qhull-2012.1-r1 b/metadata/md5-cache/media-libs/qhull-2012.1-r1
index af2fe84c4958..e0d937c88e00 100644
--- a/metadata/md5-cache/media-libs/qhull-2012.1-r1
+++ b/metadata/md5-cache/media-libs/qhull-2012.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.qhull.org//download/qhull-2012.1-src.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9f5007841e8f83842499e6f7682c5b7
diff --git a/metadata/md5-cache/media-libs/qimageblitz-0.0.6 b/metadata/md5-cache/media-libs/qimageblitz-0.0.6
index f262a076b468..a2284cbeb75b 100644
--- a/metadata/md5-cache/media-libs/qimageblitz-0.0.6
+++ b/metadata/md5-cache/media-libs/qimageblitz-0.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://kde/stable/qimageblitz/qimageblitz-0.0.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20a2bfd434b0d66d984992bc656d9d5c
diff --git a/metadata/md5-cache/media-libs/rply-1.01-r1 b/metadata/md5-cache/media-libs/rply-1.01-r1
index c7f40069cbd0..975c8858db73 100644
--- a/metadata/md5-cache/media-libs/rply-1.01-r1
+++ b/metadata/md5-cache/media-libs/rply-1.01-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/rply/rply-1.01.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd05a96b37641263093bd1d2b84b9a6c
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1 b/metadata/md5-cache/media-libs/speex-1.2_rc1
index bce2166aceba..d1d67c529de6 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f1bbdc975ce7ef8b050e0a7f74bb714
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1 b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
index ff7fa08f2b4b..36256c237550 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04679abc7bf8e51b136b0a017bb73bc7
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r1 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r1
index c05b4ecd8301..c67b3080d370 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r1
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af36ef86905b9484a4c5a8a738891692
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
index c7060a5fefb3..ac20da310979 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f19684c83e96c43668886528e6d59a51
diff --git a/metadata/md5-cache/media-libs/t1lib-5.1.2 b/metadata/md5-cache/media-libs/t1lib-5.1.2
index e99ee79e2d76..a0b2ab9c6624 100644
--- a/metadata/md5-cache/media-libs/t1lib-5.1.2
+++ b/metadata/md5-cache/media-libs/t1lib-5.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXt )
 SLOT=5
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4b2d94af469623c3e473ea9c5bab348
diff --git a/metadata/md5-cache/media-libs/taglib-1.7.2 b/metadata/md5-cache/media-libs/taglib-1.7.2
index 9f3e750ef915..3e0b9c1ca7ab 100644
--- a/metadata/md5-cache/media-libs/taglib-1.7.2
+++ b/metadata/md5-cache/media-libs/taglib-1.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 MPL-1.1
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://developer.kde.org/~wheeler/files/src/taglib-1.7.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bbd42ac4226c5585ce09063eee9290a
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1
index a04a2972c7f8..f01e776182dc 100644
--- a/metadata/md5-cache/media-libs/taglib-extras-1.0.1
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6
 SLOT=0
 SRC_URI=http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=701f9de1766052757953d74f47bb5fb6
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.2 b/metadata/md5-cache/media-libs/tiff-4.0.2
index 332572c1cbea..8e2d1c06d8ae 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.2
+++ b/metadata/md5-cache/media-libs/tiff-4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=4
 HOMEPAGE=http://www.remotesensing.org/libtiff/
 IUSE=+cxx jbig jpeg lzma static-libs zlib
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 RDEPEND=jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.2.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=6b6470dc0e94a51cf29158f765197ec1
+_md5_=345818c0c7663738da56b631ce5180e2
diff --git a/metadata/md5-cache/media-libs/tse3-0.3.1-r1 b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
index e1afb9d1c7fd..18fca14e2b31 100644
--- a/metadata/md5-cache/media-libs/tse3-0.3.1-r1
+++ b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/tse3/tse3-0.3.1.tar.gz mirror://gentoo/tse3-0.3.1-awe_voice.h.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d39d14db97f47f9e48a905b67cf8937
diff --git a/metadata/md5-cache/media-libs/vigra-1.7.1 b/metadata/md5-cache/media-libs/vigra-1.7.1
index 8e7aa9046a03..e38a4d5e195d 100644
--- a/metadata/md5-cache/media-libs/vigra-1.7.1
+++ b/metadata/md5-cache/media-libs/vigra-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost[python?] fftw? ( >=sci-libs/fftw-3 ) hdf5? ( sci-libs/hdf
 REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 ) test? ( hdf5 python fftw )
 SLOT=0
 SRC_URI=http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.1-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cd88222ccdc8219ce76fbb24c6ceabc
diff --git a/metadata/md5-cache/media-libs/vigra-1.7.1-r1 b/metadata/md5-cache/media-libs/vigra-1.7.1-r1
index 4909f54460d8..ac2afcec74f9 100644
--- a/metadata/md5-cache/media-libs/vigra-1.7.1-r1
+++ b/metadata/md5-cache/media-libs/vigra-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost[python?] fftw? ( >=sci-libs/fftw-3 ) hdf5? ( sci-libs/hdf
 REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 ) test? ( hdf5 python fftw )
 SLOT=0
 SRC_URI=http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.1-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=46d6f3ff964c720642bdd76417021b37
diff --git a/metadata/md5-cache/media-libs/vigra-1.8.0 b/metadata/md5-cache/media-libs/vigra-1.8.0
index 463dacb8bef0..3841e6e5ae3e 100644
--- a/metadata/md5-cache/media-libs/vigra-1.8.0
+++ b/metadata/md5-cache/media-libs/vigra-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.40[python?] fftw? ( sci-libs/fftw:3.0 ) hdf5? ( sci-l
 REQUIRED_USE=doc? ( hdf5 fftw ) python? ( hdf5 ) test? ( hdf5 python fftw )
 SLOT=0
 SRC_URI=http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.8.0-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=791950b0603dea2aa581a2b4abebe9a6
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20111220 b/metadata/md5-cache/media-libs/x264-0.0.20111220
index 891cd434904b..d0efdc09d47c 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20111220
+++ b/metadata/md5-cache/media-libs/x264-0.0.20111220
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111220-2245.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3708283a09fa8e65f735305646baa4a2
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20120327 b/metadata/md5-cache/media-libs/x264-0.0.20120327
index dba07c71818d..1367753c5453 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20120327
+++ b/metadata/md5-cache/media-libs/x264-0.0.20120327
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd6
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-2245.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31f4549f25ac9a4a99f243d8aad6f33a
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.1 b/metadata/md5-cache/media-libs/xvid-1.3.1
index 911888461b07..a2181544f982 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.1
+++ b/metadata/md5-cache/media-libs/xvid-1.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ecff421c82acc55f7e9c93e6201d7513
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.2 b/metadata/md5-cache/media-libs/xvid-1.3.2
index b7649af6b29e..347fb6fbf7e0 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.2
+++ b/metadata/md5-cache/media-libs/xvid-1.3.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.3.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5b639332a866e189f40a19c432e3cbf
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
index ca5c1103d6aa..3086e32054b9 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.24
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.24[alsa_pcm_plugins_ioplug(+)] ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) !media-plugins/alsa-jack
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.24.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55935513e68aa82958775227e074ff76
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
index 6203e54b38ef..38a1d9c27da7 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) !media-plugins/alsa-jack
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90c7d37f19295a95301680755ef8ca12
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
index bb17fe104f29..ce96afae4a8e 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.25-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72a289dfa0890f7162f457b69cd26c86
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-2.4.4-r1 b/metadata/md5-cache/media-plugins/audacious-plugins-2.4.4-r1
index 4c56e3cc5040..9d224e044114 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-2.4.4-r1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-2.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 >=media-sound/audacious-2.4.4 >=net-libs/neon-0.26.4 >=x11-libs/gtk+-2.14:2 aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( virtual/ffmpeg ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( >=media-libs/libsdl-1.2.5 ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 SLOT=0
 SRC_URI=http://distfiles.atheme.org/audacious-plugins-2.4.4.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2152342b2fa68445838a13624e2ad05
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-2.5.4 b/metadata/md5-cache/media-plugins/audacious-plugins-2.5.4
index 4a1034bfc6e1..c1644d11d007 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-2.5.4
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-2.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 >=media-sound/audacious-2.5.4 >=net-libs/neon-0.26.4 >=x11-libs/gtk+-2.14:2 aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( virtual/ffmpeg ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( >=media-libs/libsdl-1.2.5 ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 SLOT=0
 SRC_URI=http://distfiles.atheme.org/audacious-plugins-2.5.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=888bb3da7d4e96abb1887b86e9cb3bd1
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.1 b/metadata/md5-cache/media-plugins/audacious-plugins-3.1
index 79121bb720ad..e12c24f1f4b3 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.1 >=net-libs/neon-0.26.4 x11-libs/gtk+:3 aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 SLOT=0
 SRC_URI=http://distfiles.atheme.org/audacious-plugins-3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03b55058c315ce0e687bc8ced00d7954
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.1.1 b/metadata/md5-cache/media-plugins/audacious-plugins-3.1.1
index 1df03b9aa025..3c745e6ffca3 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.1.1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.1.1 >=net-libs/neon-0.26.4 x11-libs/gtk+:3 aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 SLOT=0
 SRC_URI=http://distfiles.atheme.org/audacious-plugins-3.1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=234ce0c0eadc5676b47e7c20bf7976c1
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1 b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
index daab63e88542..69b8ee42cc2d 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/l
 REQUIRED_USE=^^ ( gtk gtk3 )
 SLOT=0
 SRC_URI=http://distfiles.audacious-media-player.org/audacious-plugins-3.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fd9ea43fc80ebb4da8b258185aebbe8
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.3 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.3
index 2f91fe4b2a1c..cfa5bd5aa700 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.3
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=facedetect? ( >=media-libs/opencv-2.3.0 ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
 SLOT=0
 SRC_URI=http://www.piksel.no/frei0r/releases/frei0r-plugins-1.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99f39794912a94bfee648112f27f557a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.11-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.11-r1
index b3cc0cca2960..ec3a46e2d244 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.11-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.25 >=media-libs/gst-plugins-base-0.10.25 orc? ( >=dev-lang/orc-0.4.5 )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1bea9dcd618b527edc7b6df9b5300ba
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.12 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.12
index 718d7b877e75..51375535a21c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.12
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 orc? ( >=dev-lang/orc-0.4.6 )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=577d8468523886c9dbe1b93994172bc3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r1
index 34673be80a48..31f33211c317 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 >=virtual/ffmpeg-0.10 orc? ( >=dev-lang/orc-0.4.6 )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e230c75ab671d52c7a31e16b7edcf28c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r2 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r2
index a5dd681417b5..8fdd4f3a33d7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 >=virtual/ffmpeg-0.10 || ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 ) orc? ( >=dev-lang/orc-0.4.6 )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dfb61d32e932a5eff13d030561dd276
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.9 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.9
index 51887686253d..95fd30359a08 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.9
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.25 >=media-libs/gst-plugins-base-0.10.25 >=dev-libs/liboil-0.3.6
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d034a477fccca552b9fb57ad0227173
diff --git a/metadata/md5-cache/media-plugins/ir_lv2-1.3 b/metadata/md5-cache/media-plugins/ir_lv2-1.3
index 04d1adec933f..ffde4f741f62 100644
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.3
+++ b/metadata/md5-cache/media-plugins/ir_lv2-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/zita-convolver >=x11-libs/gtk+-2.16:2 media-libs/libsndfile media-libs/libsamplerate
 SLOT=0
 SRC_URI=http://factorial.hu/system/files/ir.lv2-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=640ee5c54962bbdeb46c6989730ac70e
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-2.5.0 b/metadata/md5-cache/media-plugins/kipi-plugins-2.5.0
index 311f9e0d4423..35739b178a61 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-2.5.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.5.0 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( >=net-libs/libkvkontakte-2.5.0 ) cdr? ( app-cdr/k3b ) expoblending? ( media-gfx/hugin ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) mjpeg? ( media-video/mjpegtools ) panorama? ( media-gfx/enblend >=media-gfx/hugin-2011.0.0 ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.7:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5edeafbebeb5f53ee104fbac9d7eca93
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-2.6.0 b/metadata/md5-cache/media-plugins/kipi-plugins-2.6.0
index e77375e995ee..2562a2738a42 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-2.6.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( media-libs/libkgeomap ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 mediawiki? ( >=media-libs/libmediawiki-2.6.0 ) ) panorama? ( dev-libs/boost ) redeyes? ( media-libs/opencv ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( net-libs/libkvkontakte ) cdr? ( app-cdr/k3b ) expoblending? ( media-gfx/hugin ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) mjpeg? ( media-video/mjpegtools ) panorama? ( media-gfx/enblend >=media-gfx/hugin-2011.0.0 ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.7:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b4a3b532dcaff63c34e23f9b95cb2538
diff --git a/metadata/md5-cache/media-plugins/libvisual-projectm-1.2.0 b/metadata/md5-cache/media-plugins/libvisual-projectm-1.2.0
index 2986878a34ac..39a088779ae1 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-1.2.0
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-1.2.0
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libsdl =media-libs/libvisual-0.4* >=media-libs/libprojectm-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-libvisual-1.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=707a0be75b33cfc2d1edd48a28fb3f55
diff --git a/metadata/md5-cache/media-plugins/libvisual-projectm-2.0.1 b/metadata/md5-cache/media-plugins/libvisual-projectm-2.0.1
index 73724d053bb7..ea1f3608feb3 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-2.0.1
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-2.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/libsdl =media-libs/libvisual-0.4* >=media-libs/libprojectm-2.0.1
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM_libvisual-2.0.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9959e837a3d183d04616a286b4d5d81
diff --git a/metadata/md5-cache/media-plugins/live-2012.01.07 b/metadata/md5-cache/media-plugins/live-2012.01.07
index afe06e5ded95..3948a9601579 100644
--- a/metadata/md5-cache/media-plugins/live-2012.01.07
+++ b/metadata/md5-cache/media-plugins/live-2012.01.07
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-free
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.live555.com/liveMedia/public/live.2012.01.07.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fb091800382152c7df9bb0fda883bdc
diff --git a/metadata/md5-cache/media-plugins/live-2012.04.04 b/metadata/md5-cache/media-plugins/live-2012.04.04
index 89eb439b2198..9bf4f61fe617 100644
--- a/metadata/md5-cache/media-plugins/live-2012.04.04
+++ b/metadata/md5-cache/media-plugins/live-2012.04.04
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.live555.com/liveMedia/public/live.2012.04.04.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0a965aa43fb93614474ac229eeaa86f
diff --git a/metadata/md5-cache/media-plugins/live-2012.04.21 b/metadata/md5-cache/media-plugins/live-2012.04.21
index c4eed20802dd..8a89a3f7d68d 100644
--- a/metadata/md5-cache/media-plugins/live-2012.04.21
+++ b/metadata/md5-cache/media-plugins/live-2012.04.21
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.live555.com/liveMedia/public/live.2012.04.21.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0b8803555c60d4acfaef246caebf75d
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.3.2c b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.3.2c
index 3238b6c1bbae..bedba38ca539 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.3.2c
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.3.2c
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.3.2 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
 SRC_URI=mirror://sourceforge/vamp/vamp-aubio-plugins-0.3.2c.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b93d92999765d5a0e54ed6c873504bce
diff --git a/metadata/md5-cache/media-plugins/vdr-ac3mode-0.1 b/metadata/md5-cache/media-plugins/vdr-ac3mode-0.1
index b44bcc882322..e7bdba59880d 100644
--- a/metadata/md5-cache/media-plugins/vdr-ac3mode-0.1
+++ b/metadata/md5-cache/media-plugins/vdr-ac3mode-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-ac3mode-0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=69828f12888b5a8d984923abaf3a4eeb
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.1.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.1.1
index bc04472cf995..8571777521b6 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ventoso.org/luca/vdr/vdr-actuator-1.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=05f3c2d754ecf06cb92d3b04769dc529
diff --git a/metadata/md5-cache/media-plugins/vdr-admin-0.8.0 b/metadata/md5-cache/media-plugins/vdr-admin-0.8.0
index b35251d5978d..ceff325f487f 100644
--- a/metadata/md5-cache/media-plugins/vdr-admin-0.8.0
+++ b/metadata/md5-cache/media-plugins/vdr-admin-0.8.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.37 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-admin/vdr-admin-0.8.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=2375333421838ac4d9e9d8f358a308aa
diff --git a/metadata/md5-cache/media-plugins/vdr-alcd-1.5.1 b/metadata/md5-cache/media-plugins/vdr-alcd-1.5.1
index 2b6e17c81dca..1f877925dd92 100644
--- a/metadata/md5-cache/media-plugins/vdr-alcd-1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-alcd-1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.htpc-forum.de/download/vdr-alcd-1.5.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=eb827eae7256d0ea5cd8993fe427aaf8
diff --git a/metadata/md5-cache/media-plugins/vdr-amarok-0.0.2 b/metadata/md5-cache/media-plugins/vdr-amarok-0.0.2
index fe755baf3027..b57659ccb263 100644
--- a/metadata/md5-cache/media-plugins/vdr-amarok-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-amarok-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://irimi.ir.ohost.de/vdr-amarok-0.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=ca1d5c8424225bb2d72c8dd3c8e0810a
diff --git a/metadata/md5-cache/media-plugins/vdr-analogtv-1.0.00-r2 b/metadata/md5-cache/media-plugins/vdr-analogtv-1.0.00-r2
index bdc2248b4310..5796fdaf4ebf 100644
--- a/metadata/md5-cache/media-plugins/vdr-analogtv-1.0.00-r2
+++ b/metadata/md5-cache/media-plugins/vdr-analogtv-1.0.00-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 media-libs/libdvb >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.ko0l.de/download/vdr/analogtv/download/vdr-analogtv-1.0.00.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0d68dcecd70451b46de350c7cdc3f1d2
diff --git a/metadata/md5-cache/media-plugins/vdr-arghdirector-0.2.6 b/metadata/md5-cache/media-plugins/vdr-arghdirector-0.2.6
index 90e809b7e52d..c6ce53884284 100644
--- a/metadata/md5-cache/media-plugins/vdr-arghdirector-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-arghdirector-0.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.arghgra.de/vdr-arghdirector-0.2.6.tar.gz mirror://vdrfiles/vdr-arghdirector-0.2.6/vdr-arghdirector-0.2.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=61dd4eb029fc56d04951be66f7da6d5b
diff --git a/metadata/md5-cache/media-plugins/vdr-atscepg-0.1.1 b/metadata/md5-cache/media-plugins/vdr-atscepg-0.1.1
index 79bad1bb54a7..5d373d34e47d 100644
--- a/metadata/md5-cache/media-plugins/vdr-atscepg-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-atscepg-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6[atsc] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-atscepg-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c1ce4fcdb0aa9b9e5ad3b598454812de
diff --git a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0 b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0
index a49396c48646..7ce13842b900 100644
--- a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6[atsc] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-atscepg-0.3.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=dc4981948e50c1c208632a9b9cb8f0d0
diff --git a/metadata/md5-cache/media-plugins/vdr-audiorecorder-0.1.0_pre14-r1 b/metadata/md5-cache/media-plugins/vdr-audiorecorder-0.1.0_pre14-r1
index 6e422891e23e..9c61c60c9ac5 100644
--- a/metadata/md5-cache/media-plugins/vdr-audiorecorder-0.1.0_pre14-r1
+++ b/metadata/md5-cache/media-plugins/vdr-audiorecorder-0.1.0_pre14-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-libs/taglib virtual/ffmpeg[encode,mp3] >=dev-libs/tinyxml-2.6.1[stl] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.zulu-entertainment.de/files/vdr-audiorecorder/vdr-audiorecorder-0.1.0-pre14.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=afd53ce5d90c17df05f7a7b6660c16cf
diff --git a/metadata/md5-cache/media-plugins/vdr-autosort-0.0.10 b/metadata/md5-cache/media-plugins/vdr-autosort-0.0.10
index d2f10e887021..96487dd65cc4 100644
--- a/metadata/md5-cache/media-plugins/vdr-autosort-0.0.10
+++ b/metadata/md5-cache/media-plugins/vdr-autosort-0.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.copypointburscheid.de/linux/vdr-autosort-0.0.10.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=af415fe6fbc4e566b69ee206257b8203
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index 1ab487780a3b..88ebd7a831b9 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4aef5d27656668a7f743a5eaa0411c5a
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.0.6 b/metadata/md5-cache/media-plugins/vdr-beep-0.0.6
index 064aeda3a76e..853cb7c704c7 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://deltab.de/vdr/vdr-beep-0.0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3b62c7d95ed78308c8f32aa2b40e7f90
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.0 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.0
index d538392d5845..f6aa504058ad 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 sys-devel/gettext >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-beep/vdr-beep-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=ed6bf55799d43b5a661686466f70c7c3
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index 4771b35d2653..623e2f7c0d9a 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.deltab.de/component/option,com_docman/task,doc_download/gid,104/Itemid,62/ -> vdr-beep-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=fce3c108642be22e45ba879b74775e98
diff --git a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0 b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
index 91359a4af629..1f27c269e291 100644
--- a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.reelbox.org/software/vdr/vdr-bgprocess-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=81807d67fec08d7816640d797ec84bad
diff --git a/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.85-r2 b/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.85-r2
index ff250d719c7d..b7c9f51295e8 100644
--- a/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.85-r2
+++ b/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.85-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-libs/alsa-lib-0.9.8 >=media-sound/alsa-utils-0.9.8 >=media-libs/libmad-0.14.2b-r2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/bitstreamout/vdr-bitstreamout-0.85.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=da4c32af1239e4a79fe905e3119437b6
diff --git a/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.89c b/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.89c
index df54499ac71a..55d464012839 100644
--- a/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.89c
+++ b/metadata/md5-cache/media-plugins/vdr-bitstreamout-0.89c
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-libs/alsa-lib-0.9.8 >=media-sound/alsa-utils-0.9.8 >=media-libs/libmad-0.14.2b-r2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/bitstreamout/vdr-bitstreamout-0.89c.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4a784f4801f9af74c20fef0fab4db72f
diff --git a/metadata/md5-cache/media-plugins/vdr-browse-0.0.2 b/metadata/md5-cache/media-plugins/vdr-browse-0.0.2
index 1e254605f593..6d5eb14c04cf 100644
--- a/metadata/md5-cache/media-plugins/vdr-browse-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-browse-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://fepg2.f2g.net/vdr-browse-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b4837a254ab8df22fb3c481c66bd5e36
diff --git a/metadata/md5-cache/media-plugins/vdr-browse-0.1.0 b/metadata/md5-cache/media-plugins/vdr-browse-0.1.0
index e893417731a1..a0a2da7619a9 100644
--- a/metadata/md5-cache/media-plugins/vdr-browse-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-browse-0.1.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://fepg2.f2g.net/vdr-browse-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=aacdf7ca272d5073fb3c8da9a15a5c3e
diff --git a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0 b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
index 482e27fbf11f..494dbcfc9ec4 100644
--- a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-browse-0.2.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9743778fd94f15b08cfffa770749d70f
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre21-r6 b/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre21-r6
index 770f0c9a541f..10dec2b58c36 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre21-r6
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre21-r6
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.4 >=dev-libs/libcdio-0.71 >=dev-libs/boost-1.32.0 me
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.magoa.net/linux/contrib/vdr-burn-0.1.0-pre21.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a739791028e2e84d7ea24246ca7c0838
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre22_p1 b/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre22_p1
index 3e5fa369734e..58a07d4d05ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre22_p1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.1.0_pre22_p1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.6 >=dev-libs/libcdio-0.71 media-libs/gd[png,truetype
 RESTRICT=test
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/patches/vdr-burn-0.1.0-pre22-ff1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9dbf6138a1efe54041a7229276a220b8
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0
index 9a5ce0f26e8a..2ff031174266 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdio-0.71 >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] media-video/transcode media-fonts/ttf-bitstream-vera virtual/eject >=app-cdr/dvd+rw-tools-5.21 >=media-video/projectx-0.90.4.00_p32 dvdarchive? ( media-video/vdrtools-genindex ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/832/vdr-burn-0.2.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1298b972f7183359afa807807b42a6b3
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta1
index 3cdc124e6fd2..bb16a6587148 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.6 >=dev-libs/libcdio-0.71 media-libs/gd[png,truetype
 RESTRICT=test
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/patches/vdr-burn-0.2.0-beta1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a76580cbd4545df1c621866e1a1e4075
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta5-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta5-r1
index 961aac042f6d..886718f610d7 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.0_beta5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.6 media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/437/vdr-burn-0.2.0-beta5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2207cc08d9d19be675ca0224573fcb57
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index 77238a42e433..36c773bc814f 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrcalc.bmschneider.de/dateien/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a0f73d0bd7411076bf954fe1c4c31851
diff --git a/metadata/md5-cache/media-plugins/vdr-cdda-0.1.0-r1 b/metadata/md5-cache/media-plugins/vdr-cdda-0.1.0-r1
index 73d2bbd013f4..1e88a3e1c42e 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdda-0.1.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-cdda-0.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.22 >=dev-libs/libcdio-0.75 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=ftp://ftp.wahnadium.org/pub/vdr-cdda/vdr-cdda-0.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7cb80318887d41f6f855988ae44df825
diff --git a/metadata/md5-cache/media-plugins/vdr-chanman-0.0.6 b/metadata/md5-cache/media-plugins/vdr-chanman-0.0.6
index 1f82303b86db..a40aad3b9937 100644
--- a/metadata/md5-cache/media-plugins/vdr-chanman-0.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-chanman-0.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.messinalug.org/vdr-chanman/download/vdr-chanman-0.0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e323b67d6f0a24341c7c682c032d282b
diff --git a/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.5 b/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.5
index 78e3547d80a1..b9f1532c15e3 100644
--- a/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2[dvbsetup] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.zulu-entertainment.de/files/vdr-channelblocker/vdr-channelblocker-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0db553431e25c31ad51157fee76d234f
diff --git a/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.6 b/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.6
index 80ae497b4ed2..dbcec5257cd3 100644
--- a/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-channelblocker-0.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2[dvbsetup] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.zulu-entertainment.de/files/vdr-channelblocker/vdr-channelblocker-0.0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=25fc01feb307488590469999ceb3ad16
diff --git a/metadata/md5-cache/media-plugins/vdr-channelscan-0.1.0 b/metadata/md5-cache/media-plugins/vdr-channelscan-0.1.0
index e8e5c2071770..f9f18a8fa977 100644
--- a/metadata/md5-cache/media-plugins/vdr-channelscan-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-channelscan-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://kikko77.altervista.org/sections/Download/[10]_channelscan/vdr-channelscan-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=91655bea61f3f89a42a16dd4fade6b2f
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.3a b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.3a
index 044364bc5183..9fef30cb2461 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.3a
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.3a
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.3a.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=8dd620f49a1c5c1757f17f3a51b5d97b
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index 8915d73181e7..3f419e83140f 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9ee09469547f7928faa877a50c6d1225
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0
index d71667712596..162eac3c237e 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.aistleitner.info/vdr-clock-1.0.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=926fba574735afff5757fd42eed57097
diff --git a/metadata/md5-cache/media-plugins/vdr-console-0.6.0 b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
index 7f6c49bc584d..7c214085ab79 100644
--- a/metadata/md5-cache/media-plugins/vdr-console-0.6.0
+++ b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ricomp.de/vdr/vdr-console-0.6.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e08002bd0c5213ed4aafe50c414303ff
diff --git a/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2 b/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
index dbba5f468790..82aea6d0e0e8 100644
--- a/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-plugins/vdr-music-0.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.kost.sh/vdr/vdr-coverviewer-0.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6af07f5d19f6e3de972e7449117f13b2
diff --git a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6 b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6
index 887a682ac5df..b23477ae01fd 100644
--- a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.christianglass.de/cpumon//vdr-cpumon-0.0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=903e7cd47791c237f87e837ae2a2f593
diff --git a/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1 b/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
index f2d943f34dfd..c6a2d0fa98a4 100644
--- a/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.21-r2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7ada0c18a90bb386ae100c0f2477cba1
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
index 462c45161127..75d0cf60853b 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c9db5d96468b8682b8ca7a73f8ef7438
diff --git a/metadata/md5-cache/media-plugins/vdr-director-0.2.8-r1 b/metadata/md5-cache/media-plugins/vdr-director-0.2.8-r1
index 1efb4b1ea259..7c95bbe49e4c 100644
--- a/metadata/md5-cache/media-plugins/vdr-director-0.2.8-r1
+++ b/metadata/md5-cache/media-plugins/vdr-director-0.2.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.wontorra.net/filemgmt_data/files/vdr-director-0.2.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d27c29c333d0817246ea5ccea3d67088
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.2 b/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.2
index c505d4859ed1..1c12eee27d9a 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-1.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3b7edf3eae7f38756ccefc402e4c8d42
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.3
index 733fd46f8af6..2f115153420b 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-1.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-1.0.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c82020c9af5400fb7fb43ea13433b0be
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.4 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.4
index 6d5600ab827e..2dc44105d5f1 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=2faf0179cea66c58056a43c04efe192a
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106
index 05d7826e67ce..214091075407 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6b9c92b2ab28eb399ebaa8be84df5245
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdconvert-1.0.2 b/metadata/md5-cache/media-plugins/vdr-dvdconvert-1.0.2
index edd0c09fe44b..87fc3610156c 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdconvert-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdconvert-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-video/dvdauthor-0.6.10 >=media-video/vobcopy-1.0.0 >=media-video/m2vrequantizer-0.0.2_pre20060306 media-video/transcode media-video/tcmplex-panteltje media-libs/a52dec media-sound/lame media-sound/toolame projectx? ( media-video/projectx ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.lausitz.net/lini/vdr/vdr-dvdconvert-1.0.2.tar.bz2 projectx? ( http://dev.gentoo.org/~hd_brummy/distfiles/px-files-20070104.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=182597044b2325831b32d38627bb7f48
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.3-r2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.3-r2
index b622d22c2369..003863021b3e 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.3-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://download.schmidtie.de/vdr-dvdswitch-0.1.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0ffdf2ee70c891eb6ea664d494b6bf46
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.6 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.6
index e07324833b77..e4acd4327ea8 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/445/vdr-dvdswitch-0.1.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6d32d9cbd9ff874dbfa3ab9d2db54487
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.0 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.0
index 3e0e30b20df3..334425e1138a 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/534/vdr-dvdswitch-0.2.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=41451601c0b877185a9c1c8c5878e4c1
diff --git a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.10 b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.10
index 1ab893256e55..4051ab293754 100644
--- a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.10
+++ b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/em8300-libraries >=media-video/vdr-1.6.0 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3plugin/vdr-dxr3-0.2.10.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4098ff7beef4f11f66de40dd5265f010
diff --git a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.12 b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.12
index 25e601e604a2..90de80680458 100644
--- a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.12
+++ b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/em8300-libraries >=media-video/vdr-1.6.0 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3plugin/vdr-dxr3-0.2.12.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=430d59c03670ef693d8f18081a1ffa47
diff --git a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.13 b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.13
index ced01f376fb4..f9c5565f220d 100644
--- a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.13
+++ b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/em8300-libraries >=media-video/vdr-1.6.0_p2-r7 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3plugin/vdr-dxr3-0.2.13.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a15649e5612577414bbbe9738debcd1
diff --git a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.8 b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.8
index 3c91f8333cfc..65f3e9a1dc79 100644
--- a/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.8
+++ b/metadata/md5-cache/media-plugins/vdr-dxr3-0.2.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/em8300-libraries >=media-video/vdr-1.4.0 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3plugin/vdr-dxr3-0.2.8.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=543c7cbd3efafe93f24ba7b65898d8db
diff --git a/metadata/md5-cache/media-plugins/vdr-eggtimer-0.9.5 b/metadata/md5-cache/media-plugins/vdr-eggtimer-0.9.5
index 926441875ca6..95e282e94c80 100644
--- a/metadata/md5-cache/media-plugins/vdr-eggtimer-0.9.5
+++ b/metadata/md5-cache/media-plugins/vdr-eggtimer-0.9.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://194.95.44.38/~pjuszack/digicam/download/vdr-eggtimer-0.9.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cba81fec831f063158eabe42da9d17cf
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-0.9.25_beta17 b/metadata/md5-cache/media-plugins/vdr-epgsearch-0.9.25_beta17
index 2cdb8cd4de33..40099246d01d 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-0.9.25_beta17
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-0.9.25_beta17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-epgsearch-0.9.25.beta17.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4d61cac01dfac4cdccd42a9ae59a6868
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0
index 0d84b06612d7..ab691b0e5435 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre
 REQUIRED_USE=pcre? ( !tre ) tre? ( !pcre )
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-1.0.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0eabc7c2690acc49ebb9f38ec34d76dc
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
index 6e62b89be8b5..adf378d9b0a5 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre
 REQUIRED_USE=pcre? ( !tre ) tre? ( !pcre )
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-1.0.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=7ff0fada44e633380545a007560644f7
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-0.0.4 b/metadata/md5-cache/media-plugins/vdr-epgsync-0.0.4
index 0fc88a0f82ad..94cc6a29787c 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=37bcc7bc2dfb0f1cf4e61198d4d24723
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index dd7679fb98dc..b6efacc52415 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/exec/vdr-exec-0.0.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e8f9184b8a86cbda05d78720c8aa00e7
diff --git a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1 b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
index b457312a3719..f875291d3570 100644
--- a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 app-misc/lirc >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.deltab.de/component/option,com_docman/task,doc_download/gid,102/ -> vdr-extb-0.3.1.tar.gz mirror://vdrfiles/vdr-extb/extb_firmware_1.08_lircd.conf.zip mirror://vdrfiles/vdr-extb/extb.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=ce4ed1a6218ef27aa39fb953344d0c5c
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.1 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.1
index 964aabf6cb17..15404540bd4f 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/583/vdr-extrecmenu-1.2.1.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=da02f64d41af058e23be11b43d26d99f
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2
index 744dced149f3..85e299fb2d7b 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/936/vdr-extrecmenu-1.2.2.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=29a79d9d21d698631551892012f30556
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-1.6.7 b/metadata/md5-cache/media-plugins/vdr-femon-1.6.7
index 6b66c1be2f07..bbdb55198175 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-1.6.7
+++ b/metadata/md5-cache/media-plugins/vdr-femon-1.6.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-1.6.7.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2a3c7a5765ae4ba7cf62a7d0469f5164
diff --git a/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1 b/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
index a9fc320d22b0..0eb9f048cc9e 100644
--- a/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-fepg-0.4.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7646e2ab0b8c46dccf63b0c3839798fa
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.0-r1 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.0-r1
index 93fcc2ca9e4c..7c21d9bccbd0 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-ffnetdev-0.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=535810fb69f8ea857858f08708ca8d3d
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
index 2f4e7d06b93a..0d0681a7edb5 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.nasenbaeren.net/filebrowser/vdr-filebrowser-0.2.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=5e3ce53da325ebe57a6a4c9cf934dfd3
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r2 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r2
index 16ce215f3630..6f6b92a9b3a0 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r2
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.magoa.net/linux/files/vdr-freecell-0.0.2.tgz mirror://vdrfiles/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3d5def96b04f7c70bd3c402f41ae6cf2
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.1 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.1
index 0e0aafba90c1..57b24e93fe4f 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 dev-libs/libgcrypt dev-cpp/commoncpp2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-fritz/vdr-fritzbox-1.4.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a86c48accb35ca42e31f404c4d0a61a1
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.2 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.2
index dad31fa6c77f..5aabe0f9b90d 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.2
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 dev-libs/libgcrypt dev-cpp/commoncpp2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-fritz/vdr-fritzbox-1.4.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=44ca136bc5ab5e42eb2a60ad249a2e12
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.3 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.3
index 491b47a19755..d02e1f70542e 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.3
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 dev-libs/libgcrypt dev-cpp/commoncpp2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-fritz/vdr-fritzbox-1.4.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=43ff08ca1aa05155d6f5c9226128dae6
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.5 b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.5
index 097e2cd66e99..647f2b9006ad 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.5
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=app-misc/graphlcd-base-0.1.5 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/229/vdr-graphlcd-0.1.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=8e51160046953e8a8ca20dcff5ce4d8d
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9 b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
index f76c426ed738..6370fba9e6bb 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/graphlcd-base-0.1.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/502/vdr-graphlcd-0.1.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c7a296edfbba9f08b7eae4730ee7b1b7
diff --git a/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.2.24 b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.2.24
index ebc6770e9a47..39dc6d4a5bf7 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.2.24
+++ b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.2.24
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/vdr-1.6.0_p2-r1[graphtft] media-libs/imlib2[png,jpeg] gnom
 RESTRICT=test
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-graphtft/vdr-graphtft-0.3.2.24.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4678f3e8b90e892495c419df6ac32df5
diff --git a/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.4 b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.4
index cffd81e6ed51..40fcaaa569a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.4
+++ b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/vdr-1.6.0_p2-r1[graphtft] media-libs/imlib2[png,jpeg] gnom
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-graphtft-0.3.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d8989390e8977975e95f054f6b9f0616
diff --git a/metadata/md5-cache/media-plugins/vdr-image-0.3.0 b/metadata/md5-cache/media-plugins/vdr-image-0.3.0
index 2aaee2112287..a63b19b24b0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-image-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-image-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=virtual/ffmpeg-0.4.8_p20080326 >=media-libs/netpbm-10.0 exif? ( media-libs/libexif ) >=media-tv/gentoo-vdr-scripts-0.2.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/678/vdr-image-0.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a917e5e76834d2a4e504a7695bee72cf
diff --git a/metadata/md5-cache/media-plugins/vdr-image-0.3.1 b/metadata/md5-cache/media-plugins/vdr-image-0.3.1
index 59aa253b6766..92f2a50c8274 100644
--- a/metadata/md5-cache/media-plugins/vdr-image-0.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-image-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=virtual/ffmpeg-0.4.8_p20080326 >=media-libs/netpbm-10.0 exif? ( media-libs/libexif ) >=media-tv/gentoo-vdr-scripts-0.2.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/679/vdr-image-0.3.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cfb698acd112cc7186abddf0dda47df2
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
index 8a6df16cfa64..7a5e392f3115 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/408/vdr-imonlcd-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07035ecd0696618f71176afbc53a4399
diff --git a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.10 b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.10
index f8979ff99ed9..b5881d303db7 100644
--- a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.10
+++ b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/163/vdr-infosatepg-0.0.10.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b1e719cb7de6c2d6fa3aeb3260888df6
diff --git a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.11 b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.11
index c05cd920a802..3841ca23c6e8 100644
--- a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.11
+++ b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/342/vdr-infosatepg-0.0.11.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=35e5b7fc000d64d053b5bb971c9fb227
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-0.3.0 b/metadata/md5-cache/media-plugins/vdr-iptv-0.3.0
index c3dbbfa89a92..b45a6cf86bbf 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=media-video/vdr-1.6.0[iptv] >=media-video/vdr-1.6.0[pluginparam] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-0.3.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1cd552fea3cfa007b2f518ef650ccb14
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-0.3.2 b/metadata/md5-cache/media-plugins/vdr-iptv-0.3.2
index db448c4fc5f0..b3737ca9c034 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-0.3.2
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-0.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=media-video/vdr-1.6.0[iptv] >=media-video/vdr-1.6.0[pluginparam] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-0.3.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d825bfd1d5c980c173cff9c2924606dd
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 3fb4731378c5..6d28300673f1 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b091bc9c3342ef3104373dfd723f7c42
diff --git a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6 b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
index c515b63bbc25..ecc384df0182 100644
--- a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/vdr-statusleds/vdr-kvdrmon-0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1c6fc78bc10ec37bf04aa6fd81a6a6e4
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
index abb017128336..0337268a9a23 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cdf0ccc2cfe186e031fc7b73611b5907
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.3 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.3
index e57188d34a20..38625b39a911 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.3
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo//vdr-lcdproc-0.0.10-jw3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c22c94f77395d53b054f5f8d7709f3c2
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.4 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.4
index 85ed098f38a3..ef0be2cec9db 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.4
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo//vdr-lcdproc-0.0.10-jw4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb4d25e3d57ea9c90c65abb65c268c4a
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.6 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.6
index 81fb512e7088..70a061c40174 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.6
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.joachim-wilke.de/dl.htm?ct=gz&dir=vdr-patches&file=vdr-lcdproc-0.0.10-jw6.tgz -> vdr-lcdproc-0.0.10.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a6770b5a4fd3474d703e3d2134a4a31
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index b3118455266e..af34e33e998b 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f8cf014a842d4a2dfa206ffc89b8bce
diff --git a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.8 b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.8
index 208f277623ce..be640426cad6 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.8
+++ b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.21 >=dev-perl/libwww-perl-5.69-r2 >=dev-perl/HTML-Parser-3.34-r1 >=www-client/lynx-2.8.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-lcr-0.0.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=675e69b51e63bef7a81ba1b6b6279456
diff --git a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9 b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
index aaa0d852a8c8..29c527651db6 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=dev-perl/libwww-perl-5.69-r2 >=dev-perl/HTML-Parser-3.34-r1 >=www-client/lynx-2.8.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-lcr-0.0.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=76a17ca3485bec5e00b3c6b71b2b8c53
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.2.0 b/metadata/md5-cache/media-plugins/vdr-live-0.2.0
index c37ca234ccba..6af972f91cdc 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-1.5.3 >=dev-libs/cxxtools-1.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://live.vdr-developer.org/downloads/vdr-live-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=22b2fff5facc5403a208255c19a9a3be
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325 b/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
index a7c1d1ed2b05..b30256df98e2 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
@@ -9,5 +9,5 @@ LICENSE=GPL-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_p20120325.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=3c198450a0b770159c6c4788043570c3
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.11 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.11
index 1e54aa9bce6e..4b535af3351d 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.11
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.11
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://kikko77.altervista.org/sections/Download/[11]_loadepg/vdr-loadepg-0.1.11.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2c8b9ec4a6842dcb48b615ce1ec59638
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.9 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.9
index ccb068de61fc..70c6ace004bb 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.9
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.1.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://kikko77.altervista.org/sections/Download/[11]_loadepg/vdr-loadepg-0.1.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a0c9dfca9b8e8e47ed5291e0d0a75c11
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.0 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.0
index a787d538a865..76f9cbb40e27 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=37030e39f5bb68b8436b4dce4d19ed62
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
index c90dfa76f8c7..8b053207f957 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2949a811b5d77b8b5467c4a6122a4c29
diff --git a/metadata/md5-cache/media-plugins/vdr-mailbox-0.6.0 b/metadata/md5-cache/media-plugins/vdr-mailbox-0.6.0
index ed32f0913727..327cc00f26dc 100644
--- a/metadata/md5-cache/media-plugins/vdr-mailbox-0.6.0
+++ b/metadata/md5-cache/media-plugins/vdr-mailbox-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.8 >=net-libs/c-client-2002e-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://alex.vdr-developer.org/download/vdr-mailbox-0.6.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=45d806714b541d09d8a68b7134764909
diff --git a/metadata/md5-cache/media-plugins/vdr-markad-0.1.2 b/metadata/md5-cache/media-plugins/vdr-markad-0.1.2
index 956daa3c0da5..22e47d1a7f54 100644
--- a/metadata/md5-cache/media-plugins/vdr-markad-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-markad-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 virtual/ffmpeg[mp3,x264] !media-video/noad >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/578/vdr-markad-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cdc98f1f481e41f3e4f246517bd2c45f
diff --git a/metadata/md5-cache/media-plugins/vdr-markad-0.1.3 b/metadata/md5-cache/media-plugins/vdr-markad-0.1.3
index b9cd1e24afb8..186aee1b4067 100644
--- a/metadata/md5-cache/media-plugins/vdr-markad-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-markad-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 virtual/ffmpeg[mp3,x264] !media-video/noad >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/888/vdr-markad-0.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3bada8cbfde5a545580cf576fa93dc45
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.4 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.4
index 502a8da6e13f..e4c3420e4434 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.4
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.18[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.e-tobi.net/blog/files/vdr-menuorg-0.4.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=70ece8a2b3f73012bd8ab6462ce5889b
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.5 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.5
index 1a7a3fb0c53f..28955f63b6b0 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.5
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.18[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/879/vdr-menuorg-0.4.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=62dc84722f5d769b66325f574dff03cd
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-0.0.3 b/metadata/md5-cache/media-plugins/vdr-mlist-0.0.3
index 7cf2cf7c12b4..57c5f47932d9 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-0.0.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.30 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-mlist/vdr-mlist-0.0.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b459d5784f3ec54daba74105fea40c49
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-0.0.5 b/metadata/md5-cache/media-plugins/vdr-mlist-0.0.5
index 45aef3d23952..3167d7771793 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-0.0.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.30 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-mlist/vdr-mlist-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c327a0d84ba61fb39305eb662d7eeb99
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.1 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.1
index 7d0812b490c0..956b183fa55b 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.30 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-mlist/vdr-mlist-1.0.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=123dc85e2bc0169e4ad74253d9c84603
diff --git a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2 b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
index 286fe4fa6388..a6dfff14869a 100644
--- a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://homepages.physik.uni-muenchen.de/~Felix.Rauscher/vdr-mount-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c5a86fe2c8fa18569f168b9645c409a9
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre4 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre4
index a1a52e4e2a70..d83111544b73 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre4
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 media-libs/libmad media-libs/libid3tag sys-libs/zlib media-libs/libsndfile vorbis? ( media-libs/libvorbis ) imagemagick? ( media-gfx/imagemagick ) !imagemagick? ( media-libs/imlib2 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.glaserei-franz.de/VDR/Moronimo2/downloads/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=571d007e3169113234f1fa9cb9b1bade
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.0 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.0
index 1fa94769d00e..82d8ac406342 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.0
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=46d324b2c3184fbbcb607b0ef881c610
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.1 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.1
index 24894d72ae32..0f6cadba3a20 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.1
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7938dd91e97de228adb681aa2851fcbd
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
index 5b0d5f6a3d23..0e59df9b5323 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=01b36c15c00f8dae677475ddbe58f339
diff --git a/metadata/md5-cache/media-plugins/vdr-music-0.2.0 b/metadata/md5-cache/media-plugins/vdr-music-0.2.0
index bc04398f87ee..5331cf3bcf94 100644
--- a/metadata/md5-cache/media-plugins/vdr-music-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-music-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.30 media-libs/libmad media-libs/libid3tag imagemagick? ( media-gfx/imagemagick[png] ) vorbis? ( media-libs/libvorbis ) sndfile? ( media-libs/libsndfile ) oss? ( media-libs/alsa-oss ) !imagemagick? ( media-libs/imlib2[png] ) virtual/jre media-tv/shoutcast2vdr sys-process/at graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.kost.sh/vdr/vdr-music-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e1eb833c0018e911b1684b005705363b
diff --git a/metadata/md5-cache/media-plugins/vdr-music-0.9.3 b/metadata/md5-cache/media-plugins/vdr-music-0.9.3
index ed2ae88c19e3..11cdfa03c330 100644
--- a/metadata/md5-cache/media-plugins/vdr-music-0.9.3
+++ b/metadata/md5-cache/media-plugins/vdr-music-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-process/at graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr.glaserei-franz.de/files/vdr-music-0.9.3-testing.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=75c0d8a3aaf6b6f5e58462e1dc5da848
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index f952b9bed3b7..7327f5ab53ba 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 net-misc/wget >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.wontorra.net/filemgmt_data/files/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=f0694d469c3599994105530670023a18
diff --git a/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.4
index e5fb78485557..7bd1f30df6f6 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.7-r8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/noepgmenu/downloads/vdr-noepgmenu-0.0.4.tgz mirror://gentoo/vdr-noepgmenu-0.0.4-unlimit-wareagle2.diff.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=29f5e372545b9cf7c9a46e4f9a893c4c
diff --git a/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.5 b/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.5
index d6a4c288fb7f..89ba59c238a5 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-noepgmenu-0.0.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.7-r8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/noepgmenu/downloads/vdr-noepgmenu-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=21c54be16230a9099ae78d952d3a01ef
diff --git a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.8a b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.8a
index c82bea1e7659..ccc798ab7a27 100644
--- a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.8a
+++ b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.8a
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.31 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://martins-kabuff.de/download/vdr-nordlichtsepg-0.8a.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=ca746ad5f693abac8db8962eb96f854c
diff --git a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1 b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
index ce3f2cd922e9..f71d531a9204 100644
--- a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.31 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://martins-kabuff.de/download/vdr-nordlichtsepg-0.9-test1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=58460d767ea0ab359f2de4361f4b2241
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10
index 1c9b90165aff..45ce412bad76 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10
+++ b/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-libs/libmpeg2-0.4.0 >=virtual/ffmpeg-0.4.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/osdpip/vdr-osdpip-0.0.10.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b659f20a44fdcfdb787988c9bf39de8a
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0
index 2fc462856042..8e82aab31c64 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2-r5 >=media-libs/libmpeg2-0.5.1 >=virtual/ffmpeg-0.6.90 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/download/267/vdr-osdpip-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0e8d651409b36a2b3a0888fb75f2feab
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1
index 0140df39e0a3..d18a5f8cfeee 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2-r5 >=media-libs/libmpeg2-0.5.1 >=virtual/ffmpeg-0.6.90 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/880/vdr-osdpip-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cf4efa659627e84b19275097b94dddb8
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.1 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.1
index 8df5b9125a27..b49af153d8fb 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7b60c8875cc17d4ce6a3083abe03a0ab
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
index 1d032d7cae99..2e759b269b2e 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=33a9d7582ea164f1f98647155755f81e
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.1
index 8a645c808395..e8d8d43c9211 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/685/vdr-osdteletext-0.9.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2bd6d15bc4f4a1fcb47e9ef557587f7f
diff --git a/metadata/md5-cache/media-plugins/vdr-pcd-0.9 b/metadata/md5-cache/media-plugins/vdr-pcd-0.9
index 150b4b326923..18fbeb60f648 100644
--- a/metadata/md5-cache/media-plugins/vdr-pcd-0.9
+++ b/metadata/md5-cache/media-plugins/vdr-pcd-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.4 >=virtual/ffmpeg-0.4.9_p20070616 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-pcd-0.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d434cc2909e9cd6d744db23b1ea804a0
diff --git a/metadata/md5-cache/media-plugins/vdr-picselshow-0.0.2 b/metadata/md5-cache/media-plugins/vdr-picselshow-0.0.2
index 7fd63557f36d..1aafe6733f3b 100644
--- a/metadata/md5-cache/media-plugins/vdr-picselshow-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-picselshow-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-image =media-plugins/vdr-music-0.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.kost.sh/vdr/vdr-picselshow-0.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=399eafd74673a0f3c54a7bb8f2ba29e7
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.8 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.8
index 353b8e652454..530712643b0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.8
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.8.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=8773ddb01a8f6c3a7eef1af11a929232
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9
index b4c10559a878..60f7b3d12b4b 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a10c13ee140d5266da97b8c65b9d5b91
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
index 84ff453f06da..6170e0f9ed63 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=fe0ca5b66f788056cd9c72441ec123e7
diff --git a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2 b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2
index ba339b6e4943..d4a1f23bd1de 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdrwiki.free.fr/vdr/pilotskin/files/vdr-pilotskin-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=f5fa46663c21e1ac3a5bd658919bbfdd
diff --git a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
index d4437d15e66e..238059278716 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdrwiki.free.fr/vdr/pilotskin/files/vdr-pilotskin-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9bd41e608c5828e2a23d8521417a1ca1
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.9 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.9
index 443e39d5dea7..efa1151c97b3 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.9
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.jwendel.de/vdr/vdr-pin-0.1.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e8e1fae22cf76d214ef3eb91e5c63152
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index 9aa7fb186c28..ce2c2a2756a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=3faff5ed569c0d48e095c1bf50eca8c0
diff --git a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.4 b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.4
index 62350ee7cfa3..e2e32e7fc0d3 100644
--- a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.4
+++ b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/prefermenu/vdr-prefermenu-0.6.4.tgz mirror://vdrfiles/vdr-prefermenu/vdr-prefermenu-0.6.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c74a12aff2f5c987e3f00ec3a896d7f8
diff --git a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6 b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6
index d7d8ac4feb52..8e3666640fed 100644
--- a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6
+++ b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.45 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/prefermenu/vdr-prefermenu-0.6.6.tgz mirror://vdrfiles/vdr-prefermenu/vdr-prefermenu-0.6.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=82a20d5df47252bdf4336ffdbc7d5f60
diff --git a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r1 b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r1
index 1431f4e42e79..03175ebc542d 100644
--- a/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r1
+++ b/metadata/md5-cache/media-plugins/vdr-prefermenu-0.6.6-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.45 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/prefermenu/vdr-prefermenu-0.6.6.tgz mirror://vdrfiles/vdr-prefermenu/vdr-prefermenu-0.6.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c3ee46a7fb10a1327f9a0076f4948b2e
diff --git a/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0 b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0
index 95ec8daa5549..0d4d84fad3c1 100644
--- a/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-premiereepg-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=cf9a4a72e44162e9a540f99fbe0e4de3
diff --git a/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1 b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1
index 5b5bdb323bd7..1d60e856c297 100644
--- a/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-premiereepg-0.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=90adf9551cccf3a32d512fb3b6f8d173
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.2 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.2
index e1e505097245..526cc850af9f 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.23 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=5466b7ed6a8e4a91de91d28ab41a9e17
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.3 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.3
index fb5452bd9441..c27702715556 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.23 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1beff0e59d0c0d85bbf0d1ad768545a9
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4
index c05cac420999..920960081b00 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.23 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=deca03ff102436c11d1fe197fe67ce58
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
index 1d0ea4111a55..fca7c0d3ffce 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=5575095891a3721078f148b4b805dbcb
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.3 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.3
index fb5441995d60..238b02861f25 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.3
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 media-sound/mpg123 media-sound/twolame media-libs/a52dec >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://drseltsam.device.name/vdr/pvr/src/pvr350/vdr-pvr350-1.7.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1c0b19f643df39affe623ab41b703dd8
diff --git a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.08.18 b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.08.18
index 4cb938f56dda..a487a052cdd9 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.08.18
+++ b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.08.18
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/668/vdr-pvrinput-2011-08-18.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=532ffc8e2b62c13d8d7998e83e7ddf12
diff --git a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17 b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
index dd0212c923e7..53c5bfb412ca 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
+++ b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-pvrinput-2011.09.17.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f783bddba7a3fb6f6aee5396fa5353b
diff --git a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1 b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
index d14167953eca..efb59124fa31 100644
--- a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-quicktimer-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=fdb1f544b655f44c240db15733f04834
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.2.4 b/metadata/md5-cache/media-plugins/vdr-radio-0.2.4
index b247960ee532..866b591d7494 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.2.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.43 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.2.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1f0a98834ddc59d6fde8712b8c177946
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.0 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.0
index 4bc757701a55..70ee59fe4120 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.0
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=44ac888c542195826b5ee05c345263cc
diff --git a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2 b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
index 647161c34b69..b49ab35efb6e 100644
--- a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://194.95.44.38/~pjuszack/digicam/download/vdr-radiolist-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7c8f536c2a7661d59df1b4d5254bab6b
diff --git a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.5 b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.5
index 522f2249a43f..d35a93e7f80f 100644
--- a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-recstatus-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1ee7a65efb4dfddff264701e606f0e58
diff --git a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8 b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
index 6739cb34b9dc..32bcb0293080 100644
--- a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
+++ b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://www.constabel.net/files/vdr/vdr-recstatus-0.0.8.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=94245fcbdda4906029aeba26b8fcb2a1
diff --git a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.3.3 b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.3.3
index 3b6f7bda390a..4ea12d47a95d 100644
--- a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.3.3
+++ b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.3.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.reelbox.org/software/source/vdr-plugins/vdr-reelchannelscan-0.3.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b6ea00776ef39adaebe9633e0c64e9a4
diff --git a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r2 b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r2
index e74df8873853..92e1208bfd0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-reelchannelscan-0.4.3.tgz http://dev.gentoo.org/~zzam/distfiles/vdr-reelchannelscan-0.4.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7e1bcf3253315752f63e36c12c037c8a
diff --git a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r3 b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r3
index ac9031b72431..acab92d75a48 100644
--- a/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r3
+++ b/metadata/md5-cache/media-plugins/vdr-reelchannelscan-0.4.3-r3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-reelchannelscan-0.4.3.tgz http://dev.gentoo.org/~zzam/distfiles/vdr-reelchannelscan-0.4.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=53cfca89e245890f0cdac493f71902a9
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.4.0-r2 b/metadata/md5-cache/media-plugins/vdr-remote-0.4.0-r2
index 5b519e62c4ac..ce9ccdae0cdc 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.4.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.4.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.4.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ebbdae1dc5bb5a8a4b6ac95b1f39e16
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.0.2 b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.0.2
index 3c49fcd86318..30472d7702a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=580261572d71a7ad8d14f14f00a7149d
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.0
index f2a58bf84b3f..8b6d87b158c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-0.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b5c1826120551522400560a2eb7a579e
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.1
index cb6aa069a486..f825d0c45e4c 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-plugins/vdr-svdrpservice-0.0.2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=e8041b0483d6274017f59d6e62ec5850
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.3 b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.3
index 9aca8afbed7e..ba429637c6ce 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-0.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=939685bb4f39dfc07cc68b3fc9d10291
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.4 b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.4
index 1044a7251f9d..27dc530cbe3c 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-0.1.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e7682c030701cd2c871190cf8b3d9e3a
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.6 b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.6
index 76e45bba3d76..d8e41a32d903 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-0.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-plugins/vdr-svdrpservice-0.0.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-0.1.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=9bb83798f4a754dfcc9575b3b3104e6d
diff --git a/metadata/md5-cache/media-plugins/vdr-rotor-0.1.5 b/metadata/md5-cache/media-plugins/vdr-rotor-0.1.5
index fcd85479c829..b543bcf7ff6d 100644
--- a/metadata/md5-cache/media-plugins/vdr-rotor-0.1.5
+++ b/metadata/md5-cache/media-plugins/vdr-rotor-0.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0[rotor] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.vrweb.de/~bergwinkl.thomas/downro/vdr-rotor-0.1.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=8f024873739dd0fb0f7814d6af44a9f0
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-1.6.4 b/metadata/md5-cache/media-plugins/vdr-rssreader-1.6.4
index 4ab65ad840c4..ce16fa988461 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-1.6.4
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-1.6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-1.6.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=ec191f5c1da3b2fa38a76c5c832c269f
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index 90ccac6ef1a5..f3406c593fee 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=4bb089a49acd370c3c6fd96090cab3ca
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.11 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.11
index 8b3d668ab04b..9a5b389e14c6 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.11
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.11
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.21 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-screenshot-0.0.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=f0605589cfda61947a36469b64df42b2
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.13 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.13
index 4aaf45a570ca..eef3978fa2cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.13
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.joachim-wilke.de/dl.htm?ct=gz&dir=vdr-screenshot&file=vdr-screenshot-0.0.13.tar.bz2 -> vdr-screenshot-0.0.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=37d9d4d9b767960909b7f3b0d3ecbe6f
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a
index 565c4323f275..80b935db4185 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz mirror://vdrfiles/vdr-serial/vdr-serial-0.0.6a.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a0aa5ad06f959514207504164ff97984
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index b5c0118cb59a..e9ff11abe65e 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz mirror://vdrfiles/vdr-serial/vdr-serial-0.0.6a.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=04d8b145833a9e88171fdda2ddbd7952
diff --git a/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r1 b/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r1
index 431264cb409b..04b12b163910 100644
--- a/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrtools.de/download/vdr-setup-0.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d54aa47c461238a38b0c4206f05dd6cf
diff --git a/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r4 b/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r4
index f7603c61b06c..6dc9e6cbbee3 100644
--- a/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r4
+++ b/metadata/md5-cache/media-plugins/vdr-setup-0.3.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2-r7[setup] >=dev-libs/tinyxml-2.6.1[stl] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrtools.de/download/vdr-setup-0.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=bb7a6ffd29162dbf5500481775181de7
diff --git a/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2 b/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
index 1027c6835227..e98930fd393f 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skinclassic-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=9b9e81c9fd33f9b2dcbbea5a1abde82e
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-0.0.8 b/metadata/md5-cache/media-plugins/vdr-skincurses-0.0.8
index 41daab823b55..d63d343f7b86 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-0.0.8
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-0.0.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.28 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/vdr/vdr-1.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=58b142e6788a81c2f47970d3a71ce404
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.10 b/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.10
index fa91b6ea042b..f7247c6d54fd 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.10
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-0.1.10.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=c6ef96849d8b90ff1bade990733703f3
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.7 b/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.7
index 9dcc7d94f9da..d4a3e2494d94 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.7
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-0.1.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6ef6a3c1490d09a5dfc88aa2eff17c6b
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.1.1_pre2-r3 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.1.1_pre2-r3
index efc2d913a1fd..a473c30e5774 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.1.1_pre2-r3
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.1.1_pre2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skinelchi-0.1.1pre2.tgz mirror://gentoo/vdr-skinelchi-0.1.1_pre2-vdr-1.5.5-getfont.diff.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=c161d25f4cb8b68aa202f34229b262a9
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.1-r1
index 1616aaee4744..969971ed72b0 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=11cc015a46e636c27ec8b86f71374c2b
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.6 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.6
index 8c7aeadef016..7708e988beb6 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.2.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=bcdc040b06797b149e54ef9bb5e5373e
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7
index fccf4b19e4ce..67ee8938a0e1 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.2.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=6f82f6db735bd13a926042893023775d
diff --git a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.1 b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.1
index ec8501dc7878..cbe27f37ea36 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 x11-themes/skinenigmang-logos imagemagick? ( media-gfx/imagemagick[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/enigmang/download/vdr-skinenigmang-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=99654404d6ab39eced286dbf91be944d
diff --git a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2 b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2
index f7613a7a6649..fa4ace39484c 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 x11-themes/skinenigmang-logos imagemagick? ( media-gfx/imagemagick[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/enigmang/download/vdr-skinenigmang-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=a7718a86801fc5a92c06218d7610e3fa
diff --git a/metadata/md5-cache/media-plugins/vdr-skinreel-0.0.1 b/metadata/md5-cache/media-plugins/vdr-skinreel-0.0.1
index 75afdc6ba8f3..6afa5bba75c1 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinreel-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-skinreel-0.0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.22 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-skinreel/vdr-skinreel-0.0.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b654f6f5c0dfe84106985b6ba3adc7d1
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-1.6.4 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-1.6.4
index f440f56b0fee..600a308a4c09 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-1.6.4
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-1.6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-1.6.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=64ddab9ac54c1687dce96919a0d62e0a
diff --git a/metadata/md5-cache/media-plugins/vdr-sky-0.3.5 b/metadata/md5-cache/media-plugins/vdr-sky-0.3.5
index 605c1169ca1a..954b6c81c0f5 100644
--- a/metadata/md5-cache/media-plugins/vdr-sky-0.3.5
+++ b/metadata/md5-cache/media-plugins/vdr-sky-0.3.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.3.47.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b526af931e024c2dfef9634dbbbe0d3d
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index a6ad77854dbd..9987783b9221 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=dd88e69e06c1126f84e264df7e153a5e
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.3 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.3
index f2e3d44e6328..027949b1dce1 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-sndctl/vdr-sndctl-0.1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4751fb9b63c1acb1b756060d750661d4
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 7718809c3690..38895c929765 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr-portal.de/board/attachment.php?attachmentid=25497 -> vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a92171564a8ba499157fa571779e5f21
diff --git a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20080922 b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20080922
index 4b5aa81cf50b..e6d908fe615c 100644
--- a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20080922
+++ b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20080922
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=virtual/ffmpeg-0.4.9_pre1 directfb? ( dev-libs/DirectFB dev-libs/DFB++ ) media-libs/alsa-lib xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXv xinerama? ( x11-libs/libXinerama ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-softdevice-cvs-20080922.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b69f29bcabc34359ccfb297e5c973571
diff --git a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090218 b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090218
index 1a99fac12830..3c5e2ead8e6a 100644
--- a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090218
+++ b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090218
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=virtual/ffmpeg-0.4.9_pre1 directfb? ( dev-libs/DirectFB dev-libs/DFB++ ) media-libs/alsa-lib xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXv xinerama? ( x11-libs/libXinerama ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-softdevice-cvs-20090218.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1046336c73e8104b7341e6478f8d0fe
diff --git a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090630 b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090630
index 62b74ec2087b..fbedf504b01b 100644
--- a/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090630
+++ b/metadata/md5-cache/media-plugins/vdr-softdevice-0.5.0.20090630
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 || ( >=virtual/ffmpeg-0.4.9_pre1[-theora] ( >=virtual/ffmpeg-0.4.9_pre1[theora] >=media-libs/libtheora-1.0_alpha4 ) ) directfb? ( dev-libs/DirectFB dev-libs/DFB++ ) media-libs/alsa-lib xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXv xinerama? ( x11-libs/libXinerama ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-softdevice-cvs-20090630.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7faf29b927c450b8eac6d6a6697f3d0b
diff --git a/metadata/md5-cache/media-plugins/vdr-softplay-0.0.2.20080421 b/metadata/md5-cache/media-plugins/vdr-softplay-0.0.2.20080421
index 2f6639b7e7d5..2ef8eb71f581 100644
--- a/metadata/md5-cache/media-plugins/vdr-softplay-0.0.2.20080421
+++ b/metadata/md5-cache/media-plugins/vdr-softplay-0.0.2.20080421
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.20 >=media-plugins/vdr-softdevice-0.2.3.20060814-r1 >=virtual/ffmpeg-0.4.9_p20080326 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-softplay-cvs-20080421.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35a6d79b5301098d1d9b6502769ecc7b
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.2 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.2
index 3c2a1f24bf31..70ce4b5ce627 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=a7c606048f3df6e03ae3fc09359e8f55
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index c053a66c54d5..08e5954d4a26 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=5cb873650909951119734a86270a9d2c
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index 5e97c2a243c7..a25bc3ebaeb1 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=1d3e52aac5e8d78764f16c1435c18d0d
diff --git a/metadata/md5-cache/media-plugins/vdr-spider-0.2.2 b/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
index 27f2e476dc91..cec2692a59ef 100644
--- a/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://toms-cafe.de/vdr/spider/vdr-spider-0.2.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=4803bfe4782700fe7ac6db320c9aece4
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1
index 159abba1d46a..78add97a6148 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/497/vdr-streamdev-0.5.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=f6e9f892474d0afcd390f72edd1c2cdc
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1-r1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1-r1
index 51b1d0b9dcc5..6d9f6a10df36 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/497/vdr-streamdev-0.5.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b521cd7d8eda8a975ea76dc86132c175
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1_p20120311 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1_p20120311
index e511fcdabe53..78f7638be296 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1_p20120311
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.1_p20120311
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-streamdev-0.5.1_p20120311.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=6999488fe8f7c605cbe3f9dd74ecde77
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.2 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.2
index 3d64268dc45f..2cfac97ce45d 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.2
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/es
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/953/vdr-streamdev-0.5.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=4beb61929fa11ad885705ebe03031b58
diff --git a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5 b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
index fd8598441f09..ae9546a35fb5 100644
--- a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
+++ b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/280/vdr-sudoku-0.3.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=4195d70fdd33114f76be44a5eef15c2a
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-1.0.1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-1.0.1
index 76d2da14f41a..d5075cec10b4 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-1.0.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=47febff2a7ae77952af7bdf525dba840
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-0.1.1 b/metadata/md5-cache/media-plugins/vdr-svdrposd-0.1.1
index ae3c84f5b12f..69f0f7cdb38b 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpext/vdr-svdrposd-0.1.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=10720cadc9cd298de10684684dd81ff4
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-0.0.4 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-0.0.4
index 90f1e6385b12..066d3ba7010c 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=5d462410d8dcd170b9d549d964b10083
diff --git a/metadata/md5-cache/media-plugins/vdr-sysinfo-0.1.0a-r1 b/metadata/md5-cache/media-plugins/vdr-sysinfo-0.1.0a-r1
index b99b37f6c333..0a1d637d5331 100644
--- a/metadata/md5-cache/media-plugins/vdr-sysinfo-0.1.0a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-sysinfo-0.1.0a-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://kikko77.altervista.org/sections/Download/[12]_sysinfo/vdr-sysinfo-0.1.0a.tgz mirror://gentoo/vdr-sysinfo-0.1.0a-firefly-20060520.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6a56c691fcdcbe81f58198d891ff3e39
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
index ef7c3b93accc..d12a72113506 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=22bbd344cbe84f692985d36b20f776f5
diff --git a/metadata/md5-cache/media-plugins/vdr-taste-0.0.2d b/metadata/md5-cache/media-plugins/vdr-taste-0.0.2d
index 2adb5dafce47..741c08fde7c5 100644
--- a/metadata/md5-cache/media-plugins/vdr-taste-0.0.2d
+++ b/metadata/md5-cache/media-plugins/vdr-taste-0.0.2d
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.magoa.net/linux/files/vdr-taste-0.0.2d.tgz mirror://vdrfiles/vdr-taste/taste-0.0.2d.patch
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=891b0a7a99d61d850a9bf248571caaa8
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
index f0ff846e55c4..a6c065694250 100644
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
+++ b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] m
 REQUIRED_USE=imagemagick? ( !imlib ) imlib? ( !imagemagick )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/783/vdr-text2skin-1.3.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=f1f5e78071f0811430c50d2ee29a1c5b
diff --git a/metadata/md5-cache/media-plugins/vdr-timeline-0.9.0-r2 b/metadata/md5-cache/media-plugins/vdr-timeline-0.9.0-r2
index ec6c121b0f41..70b615bbde96 100644
--- a/metadata/md5-cache/media-plugins/vdr-timeline-0.9.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-timeline-0.9.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.js-home.org:80/vdr/timeline/vdr-timeline-0.9.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=91764ce34d83ef9eb502735cf61b88cd
diff --git a/metadata/md5-cache/media-plugins/vdr-timeline-1.0.141 b/metadata/md5-cache/media-plugins/vdr-timeline-1.0.141
index 331e358cec8c..9a78b18df03f 100644
--- a/metadata/md5-cache/media-plugins/vdr-timeline-1.0.141
+++ b/metadata/md5-cache/media-plugins/vdr-timeline-1.0.141
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.js-home.org:80/vdr/timeline/vdr-timeline-1.0.141.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9dfdfc9a8b440934b7183dddabe26847
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.1.0 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.1.0
index ef8b62841b92..e68857918504 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/96/vdr-ttxtsubs-0.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9eda86fa95aa00131435a00ab21af7a5
diff --git a/metadata/md5-cache/media-plugins/vdr-tvonscreen-0.7.1 b/metadata/md5-cache/media-plugins/vdr-tvonscreen-0.7.1
index 0ca4e0dc5feb..d22ceff63d8e 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvonscreen-0.7.1
+++ b/metadata/md5-cache/media-plugins/vdr-tvonscreen-0.7.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://beejay.vdr-developer.org/patches/vdr-tvonscreen-0.7.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=323a09431b0bff8743b7e558f01eb79c
diff --git a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141 b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141
index bb6dc35b7092..a1400bd6cf23 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141
+++ b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.js-home.org/vdr/tvonscreen/vdr-tvonscreen-1.0.141.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=fe16fce5b50c5f835873b243ab15cb5e
diff --git a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r1 b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r1
index 94a04d533c0f..d7db7c7fa989 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r1
+++ b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.js-home.org/vdr/tvonscreen/vdr-tvonscreen-1.0.141.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=81bd388be591040dfd301da6200dbc41
diff --git a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r2 b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r2
index 8c083269749d..6d14525072d2 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r2
+++ b/metadata/md5-cache/media-plugins/vdr-tvonscreen-1.0.141-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.js-home.org/vdr/tvonscreen/vdr-tvonscreen-1.0.141.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2561d6bf41d1f5812382dd4fdd7279e8
diff --git a/metadata/md5-cache/media-plugins/vdr-tvtv-0.2.12 b/metadata/md5-cache/media-plugins/vdr-tvtv-0.2.12
index 7fea9d8ee27f..5b0ba9b45241 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvtv-0.2.12
+++ b/metadata/md5-cache/media-plugins/vdr-tvtv-0.2.12
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.isis.de/~mgross/tvtv/vdr-tvtv-0.2.12.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9c7419e65e933043117906413a8fac80
diff --git a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.2 b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.2
index 809e2fc97f23..5b749b9662c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.2
+++ b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/grossmar/tvtv/vdr-tvtv-0.3.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=01f395575337ca68e6f110258dcd4f26
diff --git a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3 b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3
index 6b803a71f185..1b1f9033b215 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3
+++ b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/grossmar/tvtv/vdr-tvtv-0.3.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2752d2ae0fc13c0f60569908af36f115
diff --git a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3-r1 b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3-r1
index a93bf3cf9604..e192fb373609 100644
--- a/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-tvtv-0.3.3-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/grossmar/tvtv/vdr-tvtv-0.3.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b6c354b785374a2be715c7e0a072894d
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.6-r1 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.6-r1
index 56a7bbaeca35..6580ecbcaacf 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.6-r1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.6-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fast-info.de/vdr/undelete/vdr-undelete-0.0.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=6db416e57ad056b7426d68d0b2cf9b52
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.7 b/metadata/md5-cache/media-plugins/vdr-vcd-0.7
index d90eeabe3f6e..b942ecdf20c9 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.7
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-vcd-0.7.tgz mirror://vdrfiles/vdr-vcd/vcd-0.7.patch
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=b149e184513992b0accc2d0ea4be2724
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.8 b/metadata/md5-cache/media-plugins/vdr-vcd-0.8
index 0e5cc1e7c3cd..b8e863b9b19d 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.8
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-vcd-0.8.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2ff9a7f97963da13ec924410502f3ede
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9
index 82ebf9d202c9..de1667f1bc44 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-vcd-0.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2ed020ff922381c1ce150a75ac1aaa78
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrcd-0.0.10.1-r1 b/metadata/md5-cache/media-plugins/vdr-vdrcd-0.0.10.1-r1
index 1ace7cae1abc..a5f1065ae13d 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrcd-0.0.10.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vdrcd-0.0.10.1-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.22 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.magoa.net/linux/files/vdr-vdrcd-0.0.10.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=62df5a0e93cefa7bf53e5f16e45a15b3
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r4 b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r4
index 597e9ae46b07..13fa24acbe03 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-video/mplayer-1.0_pre8 sys-process/procps sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.a-land.de/vdr-vdrrip-0.3.0.tgz http://www.a-land.de/queuehandler-fixed-0.3.0.sh
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=19e23bd22478438f57c278ff8beac92e
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r5 b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r5
index 5494c2757357..f5c18161b519 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r5
+++ b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-video/mplayer-1.0_pre8 sys-process/procps sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.a-land.de/vdr-vdrrip-0.3.0.tgz http://www.a-land.de/queuehandler-fixed-0.3.0.sh
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=f8722f7954cc85c20d48e34343b82a72
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r6 b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r6
index 6283952ec3f0..d98efb301073 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r6
+++ b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r6
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-video/mplayer-1.0_pre8 sys-process/procps sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.a-land.de/vdr-vdrrip-0.3.0.tgz http://www.a-land.de/queuehandler-fixed-0.3.0.sh
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=232f4d97f681b8336a0dd9c46054d069
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r7 b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r7
index 4b60aa9cb743..ff655c0277f1 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r7
+++ b/metadata/md5-cache/media-plugins/vdr-vdrrip-0.3.0-r7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.0 >=media-video/mplayer-1.0_pre8 sys-process/procps sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.a-land.de/vdr-vdrrip-0.3.0.tgz http://www.a-land.de/queuehandler-fixed-0.3.0.sh
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=58ae909fa22b682b5b3cfbfacc0ae3c8
diff --git a/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1 b/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
index d5319b5a73aa..ea18e8bb727e 100644
--- a/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-videosystem-0.0.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=bea40bec540b83471dfe5776661e6775
diff --git a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2 b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
index 6970af5bbdd4..e235f640ab13 100644
--- a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/154/vdr-vodcatcher-0.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=cd8e1c53fec36d8f0ab37b8ce1958ff1
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.2.7 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.2.7
index ad1b5cd8edde..140b481358ed 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.2.7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.2.7.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=db204971f18ac489af8420b4616e5544
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1
index 0533638d9db9..2aa374d4915d 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=e7ac062fccee6f50bf195782e0ccdfcb
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
index 261e46e3056a..959f87db625d 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=ecb251db6924d5d33472f752f89fe6c0
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
index 33c23cbd26da..5ad7f367c1c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=99278326b9524668a7613fed6f234546
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
index 16a0a5111f40..d494b651fd03 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3fca8de3def0424382114206fcc27be4
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3
index 6e95cef2f439..fab07561ce02 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=4b7a32e3e4c47c145398f4e23867d436
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index ad53067511e7..3240be0938b1 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=9f22d927089e0c6794a0f7cca658689e
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.2 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.2
index ff0dc0caa3c1..0ce3beea609b 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr !<media-tv/ivtv-0.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://free.pages.at/wirbel4vdr/wirbelscan/vdr-wirbelscan-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=d0fdc2a38d4d8dbe2df4425006484946
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.3 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.3
index cdda9e01fd14..62cbd89742a6 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr !<media-tv/ivtv-0.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://free.pages.at/wirbel4vdr/wirbelscan/vdr-wirbelscan-0.0.3_20070903.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7adbddd18f697590988f263a3e377e20
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.4a b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.4a
index ea0f691e71f3..940023008cb8 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.4a
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.4a
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr !<media-tv/ivtv-0.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.4a_20080515.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2012548ed34053fc2ae7d5e652902e86
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7
index 2eec40bb4a82..d26caf9a538e 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr !<media-tv/ivtv-0.8 || ( >=media-video/vdr-1.6.0[iptv] >=media-video/vdr-1.6.0[pluginparam] >=media-video/vdr-1.7.13 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=7073d5e0d27f16b2e315740d2c42869a
diff --git a/metadata/md5-cache/media-plugins/vdr-xine-0.9.4 b/metadata/md5-cache/media-plugins/vdr-xine-0.9.4
index b073cdbfa0ad..5be79e95ed05 100644
--- a/metadata/md5-cache/media-plugins/vdr-xine-0.9.4
+++ b/metadata/md5-cache/media-plugins/vdr-xine-0.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.9 >=media-libs/xine-lib-1.1.8[vdr] media-video/mjpegtools media-libs/netpbm media-video/y4mscaler >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.vr-web.de/~rnissl/vdr-xine-0.9.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=251ce0148e75ee9b8531b2af5b1432bf
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.2
index 8b0c22985be8..0a4f72c618ce 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-libs/xine-lib-1.1.1 virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xproto x11-proto/renderproto ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5ef19edb2c7a8263edf5f2fb98d2932
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.3 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.3
index 4298858e0b77..d554cb16a07c 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-libs/xine-lib-1.1.1 virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xproto x11-proto/renderproto ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.0.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fc64e4b18bc12f971263a6da003ab89
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4
index c5e2a4b284c3..30dcc0c020ef 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xproto x11-proto/renderproto ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c050fc8552628095aa7b97a01865e1aa
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090810 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090810
index 7b36753fed77..cec79e2d605e 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090810
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090810
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-libs/libX11 x11-libs/libXv x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-xineliboutput-cvs-20090810.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3282cab6095dfc3afbfd896f54810d6
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090820 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090820
index d3e2e3895caa..23d2c487eded 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090820
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20090820
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-libs/libX11 x11-libs/libXv x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-xineliboutput-cvs-20090820.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b29e5f040e70f34c7e89671760bab33
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20091118 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20091118
index b2a1dcd13d21..48cc05ab7c00 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20091118
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.4_p20091118
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-libs/libX11 x11-libs/libXv x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-xineliboutput-cvs-20091118.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d6090a8b8470233cecd719c43182d5e8
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5
index ec0b1dc5d5fd..0a48d1e93e65 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-libs/libX11 x11-libs/libXv x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab73ca371bd962a9ba82554893949c96
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5-r1
index e1dbefb378bc..d1bccaa53b16 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.4.0 !>=media-video/vdr-1.7 ) xine? ( >=media-libs/xine-lib-1.1.1 ) virtual/jpeg libextractor? ( >=media-libs/libextractor-0.5.20 ) X? ( x11-libs/libX11 x11-libs/libXv x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4e2cad5cec1e27d217bd9ba5ebd2282
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index da615bc18ef7..b16f5aff58d0 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -7,5 +7,5 @@ IUSE=caps dbus fbcon jpeg libextractor nls +vdr vdpau +X +xine xinerama vdr
 LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( || ( <media-libs/xine-lib-1.2 ( >=media-libs/xine-lib-1.2 virtual/ffmpeg ) ) fbcon? ( jpeg? ( virtual/jpeg ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg ) ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cvs	a8cc8178ae788d422bd500b4481cb5cc	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cvs	a8cc8178ae788d422bd500b4481cb5cc	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=1407d52b85a2c39a8e2ff9c552f5e392
diff --git a/metadata/md5-cache/media-plugins/vdr-xvdr-9999 b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
index d6b7ee96263d..aa57649e451e 100644
--- a/metadata/md5-cache/media-plugins/vdr-xvdr-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pipelka/vdr-plugin-xvdr
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=2f1e5e183cea23f08e96c389bc081732
diff --git a/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2 b/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2
index fd1e278b6240..2151532b53b3 100644
--- a/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-misc/xxv-0.30 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrtools.de/download/vdr-xxvautotimer-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=3799c46a6b9d4fa9335d0ce5dc6343d2
diff --git a/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2-r1 b/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2-r1
index 1220af12d13f..a52d0c79d18a 100644
--- a/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xxvautotimer-0.1.2-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-misc/xxv-0.30 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrtools.de/download/vdr-xxvautotimer-0.1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=75db6c3a9755de6c3af96b563d9f49ff
diff --git a/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1 b/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1
index 92d420d95b8c..8266fd156ef8 100644
--- a/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/yaepg-0.0.2.1-rev2.tar.bz2 mirror://gentoo/yaepg-0.0.2.1-rev2.patch
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=0869db880a1c4baaed8e1cb3f906950f
diff --git a/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1-r1
index 804c9dba2fc5..721fab555865 100644
--- a/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-yaepg-0.0.2.1-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/yaepg-0.0.2.1-rev2.tar.bz2 mirror://gentoo/yaepg-0.0.2.1-rev2.patch
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=2da59778c7d21dace58602b885e97695
diff --git a/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.5 b/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.5
index 3ed5a500dd05..1f45e6436898 100644
--- a/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.5
+++ b/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vaasa.wi-bw.tfh-wildau.de/~pjuszack/digicam/download/vdr-zaphistory-0.9.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
 _md5_=67ba5182e4227d5d5b477d6375b54a6c
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.4 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.4
index 1d57ee4a469a..e627f3a6a4d4 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/358/vdr-zappilot-0.0.4.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
 _md5_=6bf27a169c0a9949519403037df40cb3
diff --git a/metadata/md5-cache/media-radio/tlf-1.1.1 b/metadata/md5-cache/media-radio/tlf-1.1.1
index 5cffe2b60c3d..add2e7be70a1 100644
--- a/metadata/md5-cache/media-radio/tlf-1.1.1
+++ b/metadata/md5-cache/media-radio/tlf-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 media-libs/hamlib media-sound/sox
 SLOT=0
 SRC_URI=http://www.hs-mittweida.de/tb/tlf-1.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc977d4bba165d35246e88be8ce14d38
diff --git a/metadata/md5-cache/media-radio/tlf-1.1.2 b/metadata/md5-cache/media-radio/tlf-1.1.2
index 21eb7c9c98c4..e488dcf0e89b 100644
--- a/metadata/md5-cache/media-radio/tlf-1.1.2
+++ b/metadata/md5-cache/media-radio/tlf-1.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 media-libs/hamlib media-sound/sox
 SLOT=0
 SRC_URI=mirror://github/Tlf/tlf/tlf-1.1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24b00808319313c23337f1bc1ab0ef7c
diff --git a/metadata/md5-cache/media-radio/unixcw-3.0.2 b/metadata/md5-cache/media-radio/unixcw-3.0.2
index d5ce8ef300f7..7a68be87de48 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.0.2
+++ b/metadata/md5-cache/media-radio/unixcw-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4[qt3support] )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.0.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e3eea12ba502831c072e79374cf9f3fa
diff --git a/metadata/md5-cache/media-radio/wspr-2.00 b/metadata/md5-cache/media-radio/wspr-2.00
index 77ec5fe7289b..a2fa90b60d0f 100644
--- a/metadata/md5-cache/media-radio/wspr-2.00
+++ b/metadata/md5-cache/media-radio/wspr-2.00
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/imaging[tk] dev-python/numpy dev-python/pmw sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran =dev-lang/python-2* =dev-lang/python-2*[tk]
 SLOT=0
 SRC_URI=http://www.physics.princeton.edu/pulsar/K1JT/wspr-2.00.r1714.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=142701a9551a48c70353e87a5b6b59e5
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.23 b/metadata/md5-cache/media-sound/alsa-tools-1.0.23
index c16b0cb37491..e71f8e485cc9 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.23
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.23
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.22 >=dev-python/pyalsa-1.0.22 fltk? ( x11-libs/fltk:1 ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.23.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52fa371d074ebffde04107bbecd5ec97
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1 b/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
index d75c825dc15a..917bdf4a895f 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.24.1 >=dev-python/pyalsa-1.0.24 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.24.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dae8828545715eebe3eff216c2230c7
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.25 b/metadata/md5-cache/media-sound/alsa-tools-1.0.25
index d8a295d81c24..b6f1858f0d2a 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.0.25
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.25 >=dev-python/pyalsa-1.0.25 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.25.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4d2fcfa4adad397bb6780e5d9f128a5
diff --git a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4 b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
index 7b0555be62b3..fd4b53ba0d6c 100644
--- a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
+++ b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://gentoo/alsamixergui-0.9.0rc1-2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5811d1ef0f0553020feb8ef27f745099
diff --git a/metadata/md5-cache/media-sound/amarok-2.4.3-r1 b/metadata/md5-cache/media-sound/amarok-2.4.3-r1
index 6318a7c866eb..208f048bda8d 100644
--- a/metadata/md5-cache/media-sound/amarok-2.4.3-r1
+++ b/metadata/md5-cache/media-sound/amarok-2.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,o
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/amarok/2.4.3/src/amarok-2.4.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ed8cb4e7ab467eda903c4a4dde68100c
diff --git a/metadata/md5-cache/media-sound/amarok-2.5.0-r3 b/metadata/md5-cache/media-sound/amarok-2.5.0-r3
index 5c1e7650fd47..38bd440589de 100644
--- a/metadata/md5-cache/media-sound/amarok-2.5.0-r3
+++ b/metadata/md5-cache/media-sound/amarok-2.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,o
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/unstable/amarok/2.5.0/src/amarok-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bd01c9954923c640e8f896cf4a3b1d87
diff --git a/metadata/md5-cache/media-sound/ams-2.0.1 b/metadata/md5-cache/media-sound/ams-2.0.1
index 9f28db5424c1..f485666416d8 100644
--- a/metadata/md5-cache/media-sound/ams-2.0.1
+++ b/metadata/md5-cache/media-sound/ams-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/ams-2.0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee1405732327a5b83e3766a3f7d2eecb
diff --git a/metadata/md5-cache/media-sound/ardour-2.8.12 b/metadata/md5-cache/media-sound/ardour-2.8.12
index c933f6d182c3..21f6f5538cae 100644
--- a/metadata/md5-cache/media-sound/ardour-2.8.12
+++ b/metadata/md5-cache/media-sound/ardour-2.8.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/aubio media-libs/liblo lv2? ( >=media-libs/slv2-0.6.1 ) sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 dev-cpp/glibmm:2 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=media-sound/jack-audio-connection-kit-0.120 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=mirror://gentoo/ardour-2.8.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd9d7fce816bed2458443b07514ff858
diff --git a/metadata/md5-cache/media-sound/audex-0.74_beta1 b/metadata/md5-cache/media-sound/audex-0.74_beta1
index cf6576386b61..350fbe53ceaf 100644
--- a/metadata/md5-cache/media-sound/audex-0.74_beta1
+++ b/metadata/md5-cache/media-sound/audex-0.74_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] app-arch/xz-utils media-sound/cdparanoia >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde.maniatek.com/audex/files/audex-0.74b1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9e4607c286ee751c3b67dbf99caffb69
diff --git a/metadata/md5-cache/media-sound/audicle-1.0.0.6-r1 b/metadata/md5-cache/media-sound/audicle-1.0.0.6-r1
index 4e5993c5c4b6..de60f833e235 100644
--- a/metadata/md5-cache/media-sound/audicle-1.0.0.6-r1
+++ b/metadata/md5-cache/media-sound/audicle-1.0.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-admin/eselect-audicle
 SLOT=0
 SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.6.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c8e5847f33cdd36f0254e246d791387
diff --git a/metadata/md5-cache/media-sound/audicle-1.0.0.7 b/metadata/md5-cache/media-sound/audicle-1.0.0.7
index c7e48a4e0fef..47ade7f08010 100644
--- a/metadata/md5-cache/media-sound/audicle-1.0.0.7
+++ b/metadata/md5-cache/media-sound/audicle-1.0.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-admin/eselect-audicle
 SLOT=0
 SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6bfdd28bbf553ce4182b2acb86268705
diff --git a/metadata/md5-cache/media-sound/cantata-0.6.1 b/metadata/md5-cache/media-sound/cantata-0.6.1
index 1257cbca1f27..7591e0450cce 100644
--- a/metadata/md5-cache/media-sound/cantata-0.6.1
+++ b/metadata/md5-cache/media-sound/cantata-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/taglib >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/147733-cantata-0.6.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b337dca155909b585ddddcfed0fe3986
diff --git a/metadata/md5-cache/media-sound/cantata-0.7.1 b/metadata/md5-cache/media-sound/cantata-0.7.1
index 83b08bbe0b47..da064bb2d03d 100644
--- a/metadata/md5-cache/media-sound/cantata-0.7.1
+++ b/metadata/md5-cache/media-sound/cantata-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/taglib >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://cantata.googlecode.com/files/cantata-0.7.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6385099ead4acb60825eac070c758b7f
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
index 7ce2c8ba51ac..a149b0a7a3f1 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r4
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-l
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz http://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74f3c37a5e802cbc2d8f123e2caababb
diff --git a/metadata/md5-cache/media-sound/chuck-1.2.1.2 b/metadata/md5-cache/media-sound/chuck-1.2.1.2
index 06d2a9468c33..9f3278863b62 100644
--- a/metadata/md5-cache/media-sound/chuck-1.2.1.2
+++ b/metadata/md5-cache/media-sound/chuck-1.2.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( media-libs/alsa-lib ) media-libs/libsndfile app-admin/eselect
 SLOT=0
 SRC_URI=http://chuck.cs.princeton.edu/release/files/chuck-1.2.1.2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e815167edff4e06441b820ebc0e348f
diff --git a/metadata/md5-cache/media-sound/chuck-1.2.1.3 b/metadata/md5-cache/media-sound/chuck-1.2.1.3
index 7dffa1d42016..b966f16ccf9a 100644
--- a/metadata/md5-cache/media-sound/chuck-1.2.1.3
+++ b/metadata/md5-cache/media-sound/chuck-1.2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( media-libs/alsa-lib ) media-libs/libsndfile app-admin/eselect-chuck
 SLOT=0
 SRC_URI=http://chuck.cs.princeton.edu/release/files/chuck-1.2.1.3.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=940b7c530d989974a7b144fde0943465
diff --git a/metadata/md5-cache/media-sound/clementine-0.7.1-r2 b/metadata/md5-cache/media-sound/clementine-0.7.1-r2
index 3d16e5c52ed1..5b38b3118ff7 100644
--- a/metadata/md5-cache/media-sound/clementine-0.7.1-r2
+++ b/metadata/md5-cache/media-sound/clementine-0.7.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=ios? ( ipod ) udev? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://clementine-player.googlecode.com/files/clementine-0.7.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=036e0e775483f857ff87d8f52c221a2d
diff --git a/metadata/md5-cache/media-sound/clementine-1.0.1-r1 b/metadata/md5-cache/media-sound/clementine-1.0.1-r1
index dbe9a7790399..c776ee4bef2a 100644
--- a/metadata/md5-cache/media-sound/clementine-1.0.1-r1
+++ b/metadata/md5-cache/media-sound/clementine-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-gui-4.5:4[dbus?] >=x11-libs/qt-opengl-4.5:4 >=x11-libs/qt-
 REQUIRED_USE=ios? ( ipod ) udev? ( dbus ) wiimote? ( dbus )
 SLOT=0
 SRC_URI=http://clementine-player.googlecode.com/files/clementine-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1ac9ab15249e3e5a5bce01a9533a6b4f
diff --git a/metadata/md5-cache/media-sound/csound-5.17.11 b/metadata/md5-cache/media-sound/csound-5.17.11
index dd1aaec75beb..ae2a42c3e458 100644
--- a/metadata/md5-cache/media-sound/csound-5.17.11
+++ b/metadata/md5-cache/media-sound/csound-5.17.11
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? (
 REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( cxx )
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound5.17.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a481054f6a66beef48d6b683c40ee521
diff --git a/metadata/md5-cache/media-sound/csound-5.17.6-r1 b/metadata/md5-cache/media-sound/csound-5.17.6-r1
index 96cfc2bcbba4..a154114f6480 100644
--- a/metadata/md5-cache/media-sound/csound-5.17.6-r1
+++ b/metadata/md5-cache/media-sound/csound-5.17.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? (
 REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( cxx )
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound5.17.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d2a630b20854c3e36009a03beb014da
diff --git a/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217 b/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
index 5500fa129f11..7cdc6649e5ab 100644
--- a/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
+++ b/metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-libs/alsa-lib
 SLOT=0
 SRC_URI=http://git.0pointer.de/?p=dbmeasure.git;a=snapshot;h=ed8105083ab72f9afac9d18b7563fbc3d6c1c925;sf=tgz -> dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82c5b278e8c93ff46fd9e9dc8cf516c3
diff --git a/metadata/md5-cache/media-sound/drumstick-0.5.0 b/metadata/md5-cache/media-sound/drumstick-0.5.0
index 072007a20dea..93dc0ed3c790 100644
--- a/metadata/md5-cache/media-sound/drumstick-0.5.0
+++ b/metadata/md5-cache/media-sound/drumstick-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-misc/shared-mime-info dbus? ( x11-libs/qt-dbus:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-0.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b695ac684d610667ecce259bf373735
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.0.9 b/metadata/md5-cache/media-sound/fluidsynth-1.0.9
index 9a88206b6f18..bd5cb6b7a2f9 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.0.9
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.0.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/fluid/fluidsynth-1.0.9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=923ca43e23ed62b78661ee16c3bf32b7
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.3 b/metadata/md5-cache/media-sound/fluidsynth-1.1.3
index f4fff234c694..76b53203b8b8 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.1.3
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6.5:2 alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) dbus? ( >=sys-apps/dbus-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline ) sndfile? ( >=media-libs/libsndfile-1.0.18 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluidsynth/fluidsynth-1.1.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fde1c24062a28d352bfb0943db368db
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.4 b/metadata/md5-cache/media-sound/fluidsynth-1.1.4
index 9048bdd687dd..3b75f56445c8 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.1.4
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6.5:2 alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) dbus? ( >=sys-apps/dbus-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline ) sndfile? ( >=media-libs/libsndfile-1.0.18 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluidsynth/fluidsynth-1.1.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d04d27b8a52c49ed054da56a817ecac
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.5 b/metadata/md5-cache/media-sound/fluidsynth-1.1.5
index 5f8cdb9465db..3a2bb68ba38a 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.1.5
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6.5:2 alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) dbus? ( >=sys-apps/dbus-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline ) sndfile? ( >=media-libs/libsndfile-1.0.18 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluidsynth/fluidsynth-1.1.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3c5d3c0685c95d54144c955e7b324df
diff --git a/metadata/md5-cache/media-sound/galan-0.3.0_beta7 b/metadata/md5-cache/media-sound/galan-0.3.0_beta7
index c1f5ff6d9c8b..edfb63a98752 100644
--- a/metadata/md5-cache/media-sound/galan-0.3.0_beta7
+++ b/metadata/md5-cache/media-sound/galan-0.3.0_beta7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 vorbis? ( >=media-sound/vorbis-tools-1.0 ) alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 ) opengl? ( >=x11-libs/gtkglarea-1.99.0:2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 ) media-libs/liblrdf media-libs/ladspa-sdk media-libs/audiofile media-libs/libsndfile sci-libs/fftw:2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/galan/galan-0.3.0_beta7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=453047d454e3e397410912ffbec1130f
diff --git a/metadata/md5-cache/media-sound/grip-3.3.1-r2 b/metadata/md5-cache/media-sound/grip-3.3.1-r2
index 7718696fca16..e9eb5a6657fa 100644
--- a/metadata/md5-cache/media-sound/grip-3.3.1-r2
+++ b/metadata/md5-cache/media-sound/grip-3.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2:2 x11-libs/vte:0 media-sound/lame media-sound/cdparanoia >=media-libs/id3lib-3.8.3 >=gnome-base/libgnomeui-2.2.0 >=gnome-base/orbit-2 net-misc/curl vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9365e0ae89679415835573523f397ee7
diff --git a/metadata/md5-cache/media-sound/grip-3.3.1-r3 b/metadata/md5-cache/media-sound/grip-3.3.1-r3
index a47a8fee88ce..70518b4ab8c7 100644
--- a/metadata/md5-cache/media-sound/grip-3.3.1-r3
+++ b/metadata/md5-cache/media-sound/grip-3.3.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.2:2 x11-libs/vte:0 media-sound/lame media-sound/cdparanoia >=media-libs/id3lib-3.8.3 >=gnome-base/libgnomeui-2.2.0 >=gnome-base/orbit-2 net-misc/curl vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9ed28db37d49a464f86f3bfd0a5dfb1
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13 b/metadata/md5-cache/media-sound/gsm-1.0.13
index d695a8a26268..4556da305ba0 100644
--- a/metadata/md5-cache/media-sound/gsm-1.0.13
+++ b/metadata/md5-cache/media-sound/gsm-1.0.13
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~
 LICENSE=gsm
 SLOT=0
 SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=809535a008710e87a28922e63da8ca71
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.2.7 b/metadata/md5-cache/media-sound/guayadeque-0.2.7
index 32622bc4238d..01f1cb78fdef 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.2.7
+++ b/metadata/md5-cache/media-sound/guayadeque-0.2.7
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 media-libs/flac media-libs/gstreamer med
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/guayadeque/guayadeque-0.2.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=85f7e62f8af21deb72d5302fac26ca95
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.2.9 b/metadata/md5-cache/media-sound/guayadeque-0.2.9
index 5d06b8c1f94b..0dfac13c398d 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.2.9
+++ b/metadata/md5-cache/media-sound/guayadeque-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 media-libs/flac media-libs/gstreamer med
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/guayadeque/guayadeque-0.2.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=0562d9b9832e96183a9c125ca79413a9
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.3.1 b/metadata/md5-cache/media-sound/guayadeque-0.3.1
index 4637a7371408..6c9961afc45e 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.3.1
+++ b/metadata/md5-cache/media-sound/guayadeque-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 media-libs/flac media-libs/gstreamer med
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/guayadeque/guayadeque-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=c85af1f1e2249d59bfb4867a90475d30
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.3.5 b/metadata/md5-cache/media-sound/guayadeque-0.3.5
index 492d2c5ecc7f..1883c3be5709 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.3.5
+++ b/metadata/md5-cache/media-sound/guayadeque-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 media-libs/flac media-libs/gstreamer med
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/guayadeque/guayadeque-0.3.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1ddd0bd2ed9eab0dea047a4b3bfe8665
diff --git a/metadata/md5-cache/media-sound/hydrogen-0.9.5 b/metadata/md5-cache/media-sound/hydrogen-0.9.5
index 85df3ae15e7d..742c89adda1b 100644
--- a/metadata/md5-cache/media-sound/hydrogen-0.9.5
+++ b/metadata/md5-cache/media-sound/hydrogen-0.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ZLIB
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-core:4 archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) portaudio? ( >=media-libs/portaudio-19_pre )
 SLOT=0
 SRC_URI=mirror://sourceforge/hydrogen/hydrogen-0.9.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=970c8c8493b5b58028a00c772d02fb6c
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.109.2-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.109.2-r1
index 38e12cbca9de..7ded083126dc 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.109.2-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.109.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/libsndfile-1.0.0 sys-libs/ncurses caps? ( sys-libs/libcap ) alsa? ( >=media-libs/alsa-lib-0.9.1 ) netjack? ( media-libs/libsamplerate ) !media-sound/jack-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz netjack? ( mirror://sourceforge/netjack/netjack-0.12.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f83a6303eda160ed066f654c8342a25
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3
index 19618912ad69..e23c1feab5e1 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/libsndfile-1.0.0 sys-libs/ncurses alsa? ( >=media-libs/alsa-lib-1.0.18 ) media-libs/libsamplerate !media-sound/jack-cvs pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=http://www.jackaudio.org/downloads/jack-audio-connection-kit-0.121.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19efc86bc8a10c4d89854482d89536fe
diff --git a/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1 b/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
index a9707294c340..c548d1de8e34 100644
--- a/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
+++ b/metadata/md5-cache/media-sound/jack-rack-1.4.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2 media-libs/liblrdf )
 SLOT=0
 SRC_URI=mirror://sourceforge/jack-rack/jack-rack-1.4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=161218c3d5b5d7047c245901333e22cc
diff --git a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1 b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
index d984b425579b..82557cf7682c 100644
--- a/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
+++ b/metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) virtual/libintl xml? ( dev-libs/libxml2 media-libs/liblrdf )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1.orig.tar.gz mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1-1.debian.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3939b13fad9c0ef290201c0cd789d4ff
diff --git a/metadata/md5-cache/media-sound/k4guitune-1.1.0 b/metadata/md5-cache/media-sound/k4guitune-1.1.0
index d9c45d448219..aa17eedab557 100644
--- a/metadata/md5-cache/media-sound/k4guitune-1.1.0
+++ b/metadata/md5-cache/media-sound/k4guitune-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/117669-k4guitune-1.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6d12535337ec0329b2a7d06859f43c88
diff --git a/metadata/md5-cache/media-sound/k4guitune-1.1.1 b/metadata/md5-cache/media-sound/k4guitune-1.1.1
index dedb80f138ac..9072d61b1c3b 100644
--- a/metadata/md5-cache/media-sound/k4guitune-1.1.1
+++ b/metadata/md5-cache/media-sound/k4guitune-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/117669-k4guitune-1.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bc57eb0f7329218baa97612084e619ee
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3 b/metadata/md5-cache/media-sound/kaudiocreator-1.3
index fc07bee37615..f494b126d32b 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] media-libs/libdiscid >=media-libs/taglib-1.5 >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mk(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/107645-kaudiocreator-1.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=658b2b18cf05a6447c57e18b0d03e120
diff --git a/metadata/md5-cache/media-sound/kenvy24-1.2 b/metadata/md5-cache/media-sound/kenvy24-1.2
index 4fb361bc1027..bc2a41993c43 100644
--- a/metadata/md5-cache/media-sound/kenvy24-1.2
+++ b/metadata/md5-cache/media-sound/kenvy24-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kenvy24/kenvy24-1.2-src.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cc3cae1b5b1091f1a9c8d4606c8d9618
diff --git a/metadata/md5-cache/media-sound/kid3-2.0.1 b/metadata/md5-cache/media-sound/kid3-2.0.1
index f2357424604e..6edb5dcc849c 100644
--- a/metadata/md5-cache/media-sound/kid3-2.0.1
+++ b/metadata/md5-cache/media-sound/kid3-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id
 REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-2.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4ebf15090a2c32d45a362abfbe6a0a37
diff --git a/metadata/md5-cache/media-sound/kid3-2.1 b/metadata/md5-cache/media-sound/kid3-2.1
index 75c0072db036..0c3fe0125883 100644
--- a/metadata/md5-cache/media-sound/kid3-2.1
+++ b/metadata/md5-cache/media-sound/kid3-2.1
@@ -10,5 +10,5 @@ RDEPEND=chroma? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/fla
 REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0b6904eb38663f6b39699973da20f9e4
diff --git a/metadata/md5-cache/media-sound/kmetronome-0.10.0 b/metadata/md5-cache/media-sound/kmetronome-0.10.0
index 115bcbeac6a3..aa16ca699771 100644
--- a/metadata/md5-cache/media-sound/kmetronome-0.10.0
+++ b/metadata/md5-cache/media-sound/kmetronome-0.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/drumstick >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmetronome/kmetronome-0.10.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2ed9d76544c88d937fd354ff95dd3ff1
diff --git a/metadata/md5-cache/media-sound/kmetronome-0.10.1 b/metadata/md5-cache/media-sound/kmetronome-0.10.1
index 97502e28ea77..1553de15a731 100644
--- a/metadata/md5-cache/media-sound/kmetronome-0.10.1
+++ b/metadata/md5-cache/media-sound/kmetronome-0.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/drumstick >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmetronome/kmetronome-0.10.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=72d267e7414321f4cc6cf7511d8f12a8
diff --git a/metadata/md5-cache/media-sound/kmid-2.4.0 b/metadata/md5-cache/media-sound/kmid-2.4.0
index 7274156e7edc..a36c78c50168 100644
--- a/metadata/md5-cache/media-sound/kmid-2.4.0
+++ b/metadata/md5-cache/media-sound/kmid-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.4 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmid2/kmid-2.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=197a2397c2e87e44bea5875770fce880
diff --git a/metadata/md5-cache/media-sound/kmidimon-0.7.4 b/metadata/md5-cache/media-sound/kmidimon-0.7.4
index b013803e75d0..aa3f7a052816 100644
--- a/metadata/md5-cache/media-sound/kmidimon-0.7.4
+++ b/metadata/md5-cache/media-sound/kmidimon-0.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.5 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmidimon/kmidimon-0.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9920cd43eec37e02504b39e11dfea22e
diff --git a/metadata/md5-cache/media-sound/konvertible-1.0.1 b/metadata/md5-cache/media-sound/konvertible-1.0.1
index f354c7c45a7b..1d006f002a83 100644
--- a/metadata/md5-cache/media-sound/konvertible-1.0.1
+++ b/metadata/md5-cache/media-sound/konvertible-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=taglib? ( media-libs/taglib ) virtual/ffmpeg >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/116892-konvertible-1.0.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c17eaa8d710b3d1232927c63540a6cd2
diff --git a/metadata/md5-cache/media-sound/kradio-4.0.4 b/metadata/md5-cache/media-sound/kradio-4.0.4
index 9a295162cc3c..396f2e62613b 100644
--- a/metadata/md5-cache/media-sound/kradio-4.0.4
+++ b/metadata/md5-cache/media-sound/kradio-4.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kradio/kradio4-4.0.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a8ca696f2c5a53127a4c51130ff985a7
diff --git a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r1 b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r1
index cc869c70c272..02073f113a8c 100644
--- a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r1
+++ b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=media-sound/streamripper >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kstreamripper/kstreamripper-0.7.100.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fb9bc8d2cc2aac10b053a7e951979a36
diff --git a/metadata/md5-cache/media-sound/kwave-0.8.7 b/metadata/md5-cache/media-sound/kwave-0.8.7
index c45331de00d8..862efcceb48f 100644
--- a/metadata/md5-cache/media-sound/kwave-0.8.7
+++ b/metadata/md5-cache/media-sound/kwave-0.8.7
@@ -9,5 +9,5 @@ LICENSE=BSD FDL-1.2 GPL-2 LGPL-2
 RDEPEND=media-libs/audiofile >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mad? ( media-libs/id3lib media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kwave/kwave-0.8.7-1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8cc55b26522b94bf71de60dcccf5e175
diff --git a/metadata/md5-cache/media-sound/kwave-0.8.8 b/metadata/md5-cache/media-sound/kwave-0.8.8
index 38d02705b840..5051ddeb3f20 100644
--- a/metadata/md5-cache/media-sound/kwave-0.8.8
+++ b/metadata/md5-cache/media-sound/kwave-0.8.8
@@ -9,5 +9,5 @@ LICENSE=BSD FDL-1.2 GPL-2 LGPL-2
 RDEPEND=media-libs/audiofile >=sci-libs/fftw-3 alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/id3lib media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kwave/kwave-0.8.8-1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=eb2cfa5d58d5159aabacaed45fb574d3
diff --git a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.65 b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.65
index 2fec53ac071b..fca008b0f0f3 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.65
+++ b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 media-libs/liblastfm
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7564a372b2f1f95f139ac39bdcad8dad
diff --git a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.70 b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.70
index 8fb3ad2120de..047e40fa7929 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.70
+++ b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 media-libs/liblastfm
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d806f679256780bd5628a495392772a
diff --git a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-9999 b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-9999
index 6bffd7912ae4..92c1635230eb 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-9999
+++ b/metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 media-libs/liblastfm
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8db415cb68ec566a0d8e1443326a4f83
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-0.4.99 b/metadata/md5-cache/media-sound/leechcraft-lmp-0.4.99
index d8fc9aae0c83..7d5fc7b54797 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-0.4.99
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b11bbb0d39e61e2e15e9d1b9f4055e9e
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.0 b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.0
index f03aa2df9525..83de7765d72b 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.0
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=103161e446078988ab28d62b3ae6b818
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.60 b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.60
index acb9abe7beae..d4cada38a72a 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.60
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c54e73d8b0187f140490a1a51cd34cd5
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.65 b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.65
index 17262f9af09c..663713ee486f 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.65
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8208c6200eeff1111b9fd17f68ceafc3
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.70 b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.70
index 0fd9693ea451..34feef27fa9e 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.70
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon ) media-libs/taglib x11-libs/qt-declarative
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16961c41c1439e09ed883bec9ffe63d1
diff --git a/metadata/md5-cache/media-sound/leechcraft-lmp-9999 b/metadata/md5-cache/media-sound/leechcraft-lmp-9999
index 67f3e640c837..a2c55d0f152d 100644
--- a/metadata/md5-cache/media-sound/leechcraft-lmp-9999
+++ b/metadata/md5-cache/media-sound/leechcraft-lmp-9999
@@ -7,5 +7,5 @@ IUSE=debug kde +mpris
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 kde? ( media-libs/phonon ) !kde? ( x11-libs/qt-phonon ) media-libs/taglib mpris? ( x11-libs/qt-dbus ) x11-libs/qt-declarative
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd4c6981b5833e403580e7dd98194f30
diff --git a/metadata/md5-cache/media-sound/litestream-1.3_rc3 b/metadata/md5-cache/media-sound/litestream-1.3_rc3
index bf94fcc4b920..2ab9a15d7422 100644
--- a/metadata/md5-cache/media-sound/litestream-1.3_rc3
+++ b/metadata/md5-cache/media-sound/litestream-1.3_rc3
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://litestream.org/litestream/litestream-1.3RC3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d28438f1a84ebecd27f3b39f997861a
diff --git a/metadata/md5-cache/media-sound/lmms-0.4.12 b/metadata/md5-cache/media-sound/lmms-0.4.12
index fafe9bcd418f..dded8c687a5d 100644
--- a/metadata/md5-cache/media-sound/lmms-0.4.12
+++ b/metadata/md5-cache/media-sound/lmms-0.4.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4[accessibility] >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.7 x11-libs/libXinerama alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) ogg? ( media-libs/libvorbis media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) stk? ( media-libs/stk ) vst? ( app-emulation/wine ) media-plugins/swh-plugins media-plugins/caps-plugins media-plugins/tap-plugins media-libs/ladspa-cmt
 SLOT=0
 SRC_URI=mirror://sourceforge/lmms/lmms-0.4.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86095bab99ac3c3398da99019faa779a
diff --git a/metadata/md5-cache/media-sound/lmms-0.4.13 b/metadata/md5-cache/media-sound/lmms-0.4.13
index 27a31b623adc..4a9fb299a10d 100644
--- a/metadata/md5-cache/media-sound/lmms-0.4.13
+++ b/metadata/md5-cache/media-sound/lmms-0.4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4[accessibility] >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.7 x11-libs/libXinerama alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) ogg? ( media-libs/libvorbis media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) stk? ( media-libs/stk ) vst? ( app-emulation/wine ) media-plugins/swh-plugins media-plugins/caps-plugins media-plugins/tap-plugins media-libs/ladspa-cmt
 SLOT=0
 SRC_URI=mirror://sourceforge/lmms/lmms-0.4.13.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccf5e55fdafaf296e9012e7a3bd5a5fd
diff --git a/metadata/md5-cache/media-sound/mac-3.99.4.5.7 b/metadata/md5-cache/media-sound/mac-3.99.4.5.7
index 9ab313aa7389..3a241d1e8ca4 100644
--- a/metadata/md5-cache/media-sound/mac-3.99.4.5.7
+++ b/metadata/md5-cache/media-sound/mac-3.99.4.5.7
@@ -9,5 +9,5 @@ LICENSE=mac
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/mac-3.99-u4-b5-s7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d12cef062a36e65d17cbba06c1bf199
diff --git a/metadata/md5-cache/media-sound/mac-3.99.4.5.7-r1 b/metadata/md5-cache/media-sound/mac-3.99.4.5.7-r1
index 3b6e745e6331..80196f205b68 100644
--- a/metadata/md5-cache/media-sound/mac-3.99.4.5.7-r1
+++ b/metadata/md5-cache/media-sound/mac-3.99.4.5.7-r1
@@ -9,5 +9,5 @@ LICENSE=mac
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/mac-3.99-u4-b5-s7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b34374ad7d88cf567bce0186bd6d34a
diff --git a/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r1 b/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r1
index d88a7f76216c..a9f95b0637a9 100644
--- a/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r1
+++ b/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile >=x11-libs/gtk+-2.10:2 x11-libs/wxGTK:2.8[X] app-admin/eselect-miniaudicle
 SLOT=0
 SRC_URI=http://audicle.cs.princeton.edu/mini/release/files/miniAudicle-0.1.3.8.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=5a97106e098575ddf2802b9f3bf16c88
diff --git a/metadata/md5-cache/media-sound/mp3gain-1.4.6-r3 b/metadata/md5-cache/media-sound/mp3gain-1.4.6-r3
index 597a846f3672..15b14150bdb8 100644
--- a/metadata/md5-cache/media-sound/mp3gain-1.4.6-r3
+++ b/metadata/md5-cache/media-sound/mp3gain-1.4.6-r3
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3gain/mp3gain-1_4_6-src.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cdfd55d918ecbebf55b34ac705e1fa6
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.2 b/metadata/md5-cache/media-sound/mpd-0.16.2
index 0624076d2ecc..9633ee35b4c4 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.2
+++ b/metadata/md5-cache/media-sound/mpd-0.16.2
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e7eca70cd776f07f16be3fe2283e0603
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.5 b/metadata/md5-cache/media-sound/mpd-0.16.5
index 3310b1dd4ad3..67d4d2c42540 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.5
+++ b/metadata/md5-cache/media-sound/mpd-0.16.5
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fe8221c36845c1e6f340f89d24835f3
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.6 b/metadata/md5-cache/media-sound/mpd-0.16.6
index dbad2c1c5ede..90464dba6e05 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.6
+++ b/metadata/md5-cache/media-sound/mpd-0.16.6
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fdb2dc0ae4c4cb877e0b738cbb09fda
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.7 b/metadata/md5-cache/media-sound/mpd-0.16.7
index 9cb05f368546..e00176226d24 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.7
+++ b/metadata/md5-cache/media-sound/mpd-0.16.7
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7efac3b18323eee3e08cab7043a19e83
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.8 b/metadata/md5-cache/media-sound/mpd-0.16.8
index 617d2a69de81..0b4cd45df635 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.8
+++ b/metadata/md5-cache/media-sound/mpd-0.16.8
@@ -10,5 +10,5 @@ RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) a
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=738f0db0c3222afdd94fcab7f6e44e39
diff --git a/metadata/md5-cache/media-sound/mpd-9999 b/metadata/md5-cache/media-sound/mpd-9999
index 0bed0f12d560..203b9fbb738e 100644
--- a/metadata/md5-cache/media-sound/mpd-9999
+++ b/metadata/md5-cache/media-sound/mpd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] virtual/cdrtools ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89c9e2d59d89d332f00dc181d7c3b3f4
diff --git a/metadata/md5-cache/media-sound/muine-0.8.11-r2 b/metadata/md5-cache/media-sound/muine-0.8.11-r2
index 44a09fc53ca0..d5288c25b373 100644
--- a/metadata/md5-cache/media-sound/muine-0.8.11-r2
+++ b/metadata/md5-cache/media-sound/muine-0.8.11-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/gnome-icon-theme >=dev-lang/mono-2 >=x11-libs/gtk+-2.6:2 >=dev-dotnet/gtk-sharp-2.12.9:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.6:2 >=dev-dotnet/gconf-sharp-2.6:2 >=dev-dotnet/gnomevfs-sharp-2.6:2 >=dev-dotnet/ndesk-dbus-0.4 >=dev-dotnet/ndesk-dbus-glib-0.3 >=dev-dotnet/taglib-sharp-2.0.3 sys-libs/gdbm media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-gnomevfs:0.10 flac? ( media-plugins/gst-plugins-flac:0.10 ) mad? ( media-plugins/gst-plugins-mad:0.10 ) vorbis? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 )
 SLOT=0
 SRC_URI=http://download.gnome.org/sources/muine/0.8/muine-0.8.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=904961a2d13ce589260bf10cea5ec2b7
diff --git a/metadata/md5-cache/media-sound/multimux-0.2.5.2 b/metadata/md5-cache/media-sound/multimux-0.2.5.2
index a033de710b9d..e45e6152e96d 100644
--- a/metadata/md5-cache/media-sound/multimux-0.2.5.2
+++ b/metadata/md5-cache/media-sound/multimux-0.2.5.2
@@ -5,5 +5,5 @@ KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/multimux-0.2.5.2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b935fde8de88feade16bcc3f6b31c54
diff --git a/metadata/md5-cache/media-sound/musepack-tools-444-r1 b/metadata/md5-cache/media-sound/musepack-tools-444-r1
index fe3a6041dca0..1b158f7a08ca 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-444-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-444-r1
@@ -7,5 +7,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-444 >=media-libs/libreplaygain-444 !media-libs/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-444.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=398860ff008f3d6acea33c809f90bf4f
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465 b/metadata/md5-cache/media-sound/musepack-tools-465
index 688534d0f2f3..1acc5e5dcb84 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465
+++ b/metadata/md5-cache/media-sound/musepack-tools-465
@@ -8,5 +8,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-465 >=media-libs/libreplaygain-465 !media-libs/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f50226e89cb157ac37de27f0449f804
diff --git a/metadata/md5-cache/media-sound/musescore-1.1 b/metadata/md5-cache/media-sound/musescore-1.1
index b74e2fcd5fe9..0016b453910b 100644
--- a/metadata/md5-cache/media-sound/musescore-1.1
+++ b/metadata/md5-cache/media-sound/musescore-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-libs/libsndfile-1.0.19 media-libs/portaudio media-sound/fluidsynth media-sound/jack-audio-connection-kit sys-libs/zlib x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 x11-libs/qt-script:4 x11-libs/qt-svg:4 x11-libs/qtscriptgenerator
 SLOT=0
 SRC_URI=mirror://sourceforge/mscore/mscore-1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b3eac250b2488f778acd8750aad6ac8
diff --git a/metadata/md5-cache/media-sound/musescore-1.2 b/metadata/md5-cache/media-sound/musescore-1.2
index 86b0268d2832..4efb35c4a1a0 100644
--- a/metadata/md5-cache/media-sound/musescore-1.2
+++ b/metadata/md5-cache/media-sound/musescore-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-libs/libsndfile-1.0.19 media-libs/portaudio media-sound/fluidsynth media-sound/jack-audio-connection-kit sys-libs/zlib x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 x11-libs/qt-script:4 x11-libs/qt-svg:4 x11-libs/qtscriptgenerator
 SLOT=0
 SRC_URI=mirror://sourceforge/mscore/mscore-1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00b841e361d2ed7d1cf3fa3d3c35f715
diff --git a/metadata/md5-cache/media-sound/peercast-0.1218-r2 b/metadata/md5-cache/media-sound/peercast-0.1218-r2
index e126434aad2f..c707c1627773 100644
--- a/metadata/md5-cache/media-sound/peercast-0.1218-r2
+++ b/metadata/md5-cache/media-sound/peercast-0.1218-r2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.peercast.org/src/peercast-0.1218-src.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eab84eefa745cc1a3f19068ec8f9a21c
diff --git a/metadata/md5-cache/media-sound/pianobar-2012.05.06 b/metadata/md5-cache/media-sound/pianobar-2012.05.06
index 67e272fb273b..d00b12e33894 100644
--- a/metadata/md5-cache/media-sound/pianobar-2012.05.06
+++ b/metadata/md5-cache/media-sound/pianobar-2012.05.06
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libao net-libs/gnutls dev-libs/libgcrypt dev-libs/json-c aac?
 REQUIRED_USE=|| ( mp3 aac )
 SLOT=0
 SRC_URI=http://6xq.net/static/projects/pianobar/pianobar-2012.05.06.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67a64cc15a8bd8cab3ba00448509a368
diff --git a/metadata/md5-cache/media-sound/pianobar-9999 b/metadata/md5-cache/media-sound/pianobar-9999
index 30c902c3a50e..3be4995966a8 100644
--- a/metadata/md5-cache/media-sound/pianobar-9999
+++ b/metadata/md5-cache/media-sound/pianobar-9999
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libao net-libs/gnutls dev-libs/libgcrypt dev-libs/json-c aac?
 REQUIRED_USE=|| ( mp3 aac )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c78dd738baf0bed296b1000769d5d360
diff --git a/metadata/md5-cache/media-sound/pianobooster-0.6.4b b/metadata/md5-cache/media-sound/pianobooster-0.6.4b
index aaa10fc4c70d..8fc63d7befc5 100644
--- a/metadata/md5-cache/media-sound/pianobooster-0.6.4b
+++ b/metadata/md5-cache/media-sound/pianobooster-0.6.4b
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=fluidsynth? ( media-sound/fluidsynth ) media-libs/alsa-lib virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4
 SLOT=0
 SRC_URI=mirror://sourceforge/pianobooster/pianobooster-src-0.6.4b.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=926aa1095f08727bbabd9ecbd97b2689
diff --git a/metadata/md5-cache/media-sound/projectm-jack-1.2.0 b/metadata/md5-cache/media-sound/projectm-jack-1.2.0
index 15f6c0d2b211..cfaea3b785df 100644
--- a/metadata/md5-cache/media-sound/projectm-jack-1.2.0
+++ b/metadata/md5-cache/media-sound/projectm-jack-1.2.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-jack-1.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6e67c89d559492bf91a873439f5f957
diff --git a/metadata/md5-cache/media-sound/projectm-jack-2.0.1 b/metadata/md5-cache/media-sound/projectm-jack-2.0.1
index 522b12ac7303..e97ba2536e2b 100644
--- a/metadata/md5-cache/media-sound/projectm-jack-2.0.1
+++ b/metadata/md5-cache/media-sound/projectm-jack-2.0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.0.1
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-jack-2.0.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b87cf0124de94990cc0aa291120cdd83
diff --git a/metadata/md5-cache/media-sound/projectm-jack-2.1.0 b/metadata/md5-cache/media-sound/projectm-jack-2.1.0
index 02df2050880b..610ea4131cc5 100644
--- a/metadata/md5-cache/media-sound/projectm-jack-2.1.0
+++ b/metadata/md5-cache/media-sound/projectm-jack-2.1.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/jack-audio-connection-kit >=media-libs/libprojectm-qt-2.1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1fd53cc62a73b9feb5f2aa2a71be102
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.22 b/metadata/md5-cache/media-sound/pulseaudio-0.9.22
index 2571cb72737e..73776cca8397 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.22
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.22
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) <x11-libs/xcb-util-0.3.8 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0019695f18aa426e8c6644e1a3bdee87
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2 b/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
index 0a32b7ec12a9..fa1f4e971cab 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.22-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91993bd68d7049a3860899867d3eacb6
diff --git a/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1 b/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
index 44adfd81f764..161b696b3c29 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-0.9.23-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-0.9.23.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d6b5b9d755f35f3507f9fc1824d1057e
diff --git a/metadata/md5-cache/media-sound/pulseaudio-1.1 b/metadata/md5-cache/media-sound/pulseaudio-1.1
index 7efc3c38ce5c..c02a35ae848c 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-1.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 sys-libs/gdbm dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b657e07b727d72f18d5c4270b02370ed
diff --git a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
index 36c50a155d35..ca8dbe91cd73 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b6653628029dda0d545b0c633a386f2
diff --git a/metadata/md5-cache/media-sound/pulseaudio-2.0 b/metadata/md5-cache/media-sound/pulseaudio-2.0
index 6dadff7064ed..f43377cfaa59 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-2.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/l
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.0.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79f4c9a9c5d8b4883ff472d207b3ed51
diff --git a/metadata/md5-cache/media-sound/pulseaudio-2.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-2.0-r1
index 95468e88914f..0da844ae6fff 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-2.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/l
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.0.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ede89be6f8547e9364bbfea86a9f62ad
diff --git a/metadata/md5-cache/media-sound/pulseaudio-9999 b/metadata/md5-cache/media-sound/pulseaudio-9999
index 33132a67d5ee..220128aa0ec5 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-9999
+++ b/metadata/md5-cache/media-sound/pulseaudio-9999
@@ -9,5 +9,5 @@ PDEPEND=alsa? ( media-plugins/alsa-plugins[pulseaudio] )
 RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gtk? ( x11-libs/gtk+:2 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 dev-python/PyQt4[dbus] ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54ad7925bd905332ac9d7c72df3e7018
diff --git a/metadata/md5-cache/media-sound/pwavecat-0.4.5 b/metadata/md5-cache/media-sound/pwavecat-0.4.5
index 1046e9f56340..16a086463b5b 100644
--- a/metadata/md5-cache/media-sound/pwavecat-0.4.5
+++ b/metadata/md5-cache/media-sound/pwavecat-0.4.5
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/pwavecat-0.4.5.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dc3a54eff4682a19c73ddd3ac0fd921
diff --git a/metadata/md5-cache/media-sound/qarecord-0.5.0 b/metadata/md5-cache/media-sound/qarecord-0.5.0
index 25c3e1e30fe6..8ec762529e56 100644
--- a/metadata/md5-cache/media-sound/qarecord-0.5.0
+++ b/metadata/md5-cache/media-sound/qarecord-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 media-sound/jack-audio-connection-kit media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/qarecord-0.5.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad865c5d7e233dac8e4ddee98a67c195
diff --git a/metadata/md5-cache/media-sound/qastools-0.17.1 b/metadata/md5-cache/media-sound/qastools-0.17.1
index d40ece4a6b8f..3f9427f72d90 100644
--- a/metadata/md5-cache/media-sound/qastools-0.17.1
+++ b/metadata/md5-cache/media-sound/qastools-0.17.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=x11-libs/qt-core-4.6:4 >=x11-libs/qt-gui-4.6:4 >=x11-libs/qt-svg-4.6:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qastools/0.17.1/qastools_0.17.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d81b6b99107efabd8c81a7177b7ec98e
diff --git a/metadata/md5-cache/media-sound/qastools-0.17.2 b/metadata/md5-cache/media-sound/qastools-0.17.2
index 2fa24867cd0e..ad2093949d3e 100644
--- a/metadata/md5-cache/media-sound/qastools-0.17.2
+++ b/metadata/md5-cache/media-sound/qastools-0.17.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=x11-libs/qt-core-4.6:4 >=x11-libs/qt-gui-4.6:4 >=x11-libs/qt-svg-4.6:4
 SLOT=0
 SRC_URI=mirror://sourceforge/qastools/0.17.2/qastools_0.17.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ebb559e1ebf678154d95ea29a363c21
diff --git a/metadata/md5-cache/media-sound/qmidiroute-0.3.0 b/metadata/md5-cache/media-sound/qmidiroute-0.3.0
index 1df0a10edbfd..414b097b057b 100644
--- a/metadata/md5-cache/media-sound/qmidiroute-0.3.0
+++ b/metadata/md5-cache/media-sound/qmidiroute-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/qmidiroute-0.3.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6c6d63e6b35f3b98b07bcaf1fb2e052
diff --git a/metadata/md5-cache/media-sound/qmmp-0.5.4 b/metadata/md5-cache/media-sound/qmmp-0.5.4
index 1256688e9901..4a12e7687fa7 100644
--- a/metadata/md5-cache/media-sound/qmmp-0.5.4
+++ b/metadata/md5-cache/media-sound/qmmp-0.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.5.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3026ee6351ff261dab76b21b8bb731b
diff --git a/metadata/md5-cache/media-sound/qmmp-0.5.5 b/metadata/md5-cache/media-sound/qmmp-0.5.5
index 99b6bbcbe15d..45990d393b54 100644
--- a/metadata/md5-cache/media-sound/qmmp-0.5.5
+++ b/metadata/md5-cache/media-sound/qmmp-0.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.5.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=327b890d34920656b581990086cc8231
diff --git a/metadata/md5-cache/media-sound/qmmp-0.5.6 b/metadata/md5-cache/media-sound/qmmp-0.5.6
index 04311d7abdd4..90abb4048231 100644
--- a/metadata/md5-cache/media-sound/qmmp-0.5.6
+++ b/metadata/md5-cache/media-sound/qmmp-0.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.5.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c972d6caa25208236ba7cfd5410c51f9
diff --git a/metadata/md5-cache/media-sound/qmmp-9999 b/metadata/md5-cache/media-sound/qmmp-9999
index be02a96b0f18..64b9f2cdd3a5 100644
--- a/metadata/md5-cache/media-sound/qmmp-9999
+++ b/metadata/md5-cache/media-sound/qmmp-9999
@@ -7,5 +7,5 @@ IUSE=aac +alsa +dbus bs2b cdda cover enca ffmpeg flac jack game kde ladspa libsa
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) game? ( media-libs/game-music-emu ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) udev? ( sys-fs/udisks:0 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38c6611e31c676e9be43739df49bc0a3
diff --git a/metadata/md5-cache/media-sound/qmpdclient-1.2.1 b/metadata/md5-cache/media-sound/qmpdclient-1.2.1
index e3e208e92192..c8a4bdc2df61 100644
--- a/metadata/md5-cache/media-sound/qmpdclient-1.2.1
+++ b/metadata/md5-cache/media-sound/qmpdclient-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4
 SLOT=0
 SRC_URI=http://dump.bitcheese.net/files/qmpdclient-1.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e11b45d1f77daaa6e6730da57ebf564
diff --git a/metadata/md5-cache/media-sound/qmpdclient-1.2.2 b/metadata/md5-cache/media-sound/qmpdclient-1.2.2
index 593821662e0c..024d80c60929 100644
--- a/metadata/md5-cache/media-sound/qmpdclient-1.2.2
+++ b/metadata/md5-cache/media-sound/qmpdclient-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4
 SLOT=0
 SRC_URI=http://dump.bitcheese.net/files/qmpdclient-1.2.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c832b5bded35b536748b8ffe1646621
diff --git a/metadata/md5-cache/media-sound/qmpdclient-9999 b/metadata/md5-cache/media-sound/qmpdclient-9999
index 1f31177766c5..538e1c5c018b 100644
--- a/metadata/md5-cache/media-sound/qmpdclient-9999
+++ b/metadata/md5-cache/media-sound/qmpdclient-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7463e881807f0f2be2178f8f860f607f
diff --git a/metadata/md5-cache/media-sound/qpitch-1.0.1 b/metadata/md5-cache/media-sound/qpitch-1.0.1
index d624b146089b..9883b542740a 100644
--- a/metadata/md5-cache/media-sound/qpitch-1.0.1
+++ b/metadata/md5-cache/media-sound/qpitch-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 >=media-libs/portaudio-19_pre20071207 >=sci-libs/fftw-3.1.0
 SLOT=0
 SRC_URI=http://download.gna.org/qpitch/releases/qpitch-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5272e0c97eb7edada324eef6d302985
diff --git a/metadata/md5-cache/media-sound/qsynth-0.3.6 b/metadata/md5-cache/media-sound/qsynth-0.3.6
index b54118ebddc0..5ec3aee7275d 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.3.6
+++ b/metadata/md5-cache/media-sound/qsynth-0.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-core-4.2:4 >=x11-libs/qt-gui-4.2:4 >=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?] x11-libs/libX11 !pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.3.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b990b631d321921ff8a99ab70f093bee
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1 b/metadata/md5-cache/media-sound/qtagger-1.0.1
index 52e78d013131..8a2c3071f23b 100644
--- a/metadata/md5-cache/media-sound/qtagger-1.0.1
+++ b/metadata/md5-cache/media-sound/qtagger-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/taglib x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=http://qtagger.googlecode.com/files/qtagger-1.0.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fe1ffbd2e480081ac7730500177e474
diff --git a/metadata/md5-cache/media-sound/qtmpc-0.6.1 b/metadata/md5-cache/media-sound/qtmpc-0.6.1
index 479d2f40972a..753feaf0a049 100644
--- a/metadata/md5-cache/media-sound/qtmpc-0.6.1
+++ b/metadata/md5-cache/media-sound/qtmpc-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://files.lowblog.nl/qtmpc/QtMPC-0.6.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=43479531b51bb5364ba14dd40b56171e
diff --git a/metadata/md5-cache/media-sound/qtractor-0.5.4 b/metadata/md5-cache/media-sound/qtractor-0.5.4
index 2d5bc66bea5f..5a16382c4bcf 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.5.4
+++ b/metadata/md5-cache/media-sound/qtractor-0.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-core-4.2:4 >=x11-libs/qt-gui-4.7:4[gtkstyle] media-libs/alsa-lib media-libs/libsndfile media-sound/jack-audio-connection-kit media-libs/ladspa-sdk dssi? ( media-libs/dssi ) mad? ( media-libs/libmad ) libsamplerate? ( media-libs/libsamplerate ) media-libs/lilv osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) suil? ( media-libs/suil ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.5.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81dd7390e3b55ae2f0005dc0a2b3aaa9
diff --git a/metadata/md5-cache/media-sound/quark-3.21 b/metadata/md5-cache/media-sound/quark-3.21
index 040803026793..15ccb1e75f4f 100644
--- a/metadata/md5-cache/media-sound/quark-3.21
+++ b/metadata/md5-cache/media-sound/quark-3.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/xine-lib x11-libs/gtk+:2 >=gnome-base/gconf-2 gnome-base/gnome-vfs
 SLOT=0
 SRC_URI=http://hsgg.github.com/quark/quark-3.21.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2abaab50f9d6d67e08c88dd9f1253f3
diff --git a/metadata/md5-cache/media-sound/rawrec-0.9.98 b/metadata/md5-cache/media-sound/rawrec-0.9.98
index d994fdb41422..fa7cba2f2e84 100644
--- a/metadata/md5-cache/media-sound/rawrec-0.9.98
+++ b/metadata/md5-cache/media-sound/rawrec-0.9.98
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/rawrec/rawrec-0.9.98.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df1e800df90a6f44cc151ba1b51b9239
diff --git a/metadata/md5-cache/media-sound/rawrec-0.9.991 b/metadata/md5-cache/media-sound/rawrec-0.9.991
index 79028947791e..ab0ad7c4c69f 100644
--- a/metadata/md5-cache/media-sound/rawrec-0.9.991
+++ b/metadata/md5-cache/media-sound/rawrec-0.9.991
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/rawrec/rawrec-0.9.991.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f31de65cb095dab0223eaf85c745964
diff --git a/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2 b/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
index 735e850d66b5..2e0a5d059fbd 100644
--- a/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
+++ b/metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==sci-libs/fftw-2* >=x11-libs/fox-1.6.19:1.6 >=media-libs/audiofile-0.2.3 >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 alsa? ( >=media-libs/alsa-lib-1.0 ) flac? ( >=media-libs/flac-1.1.2[cxx] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-18 ) soundtouch? ( >=media-libs/libsoundtouch-1.2.1 ) vorbis? ( media-libs/libvorbis media-libs/libogg )
 SLOT=0
 SRC_URI=mirror://sourceforge/rezound/rezound-0.12.3beta.tar.gz mirror://gentoo/rezound-0.12.3_beta-patches-5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89de7ff3750600fd07e892f08f563d8e
diff --git a/metadata/md5-cache/media-sound/sexypsf-0.4.7 b/metadata/md5-cache/media-sound/sexypsf-0.4.7
index da3b4f2c502d..0478f5233088 100644
--- a/metadata/md5-cache/media-sound/sexypsf-0.4.7
+++ b/metadata/md5-cache/media-sound/sexypsf-0.4.7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://projects.raphnet.net/sexypsf/sexypsf-0.4.7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7aa0bee83ef143cb2962caabe732765
diff --git a/metadata/md5-cache/media-sound/shell-fm-0.8-r1 b/metadata/md5-cache/media-sound/shell-fm-0.8-r1
index c9d4a79f110a..77ec81e562c9 100644
--- a/metadata/md5-cache/media-sound/shell-fm-0.8-r1
+++ b/metadata/md5-cache/media-sound/shell-fm-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libao media-libs/libmad media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/jkramer/shell-fm/tarball/v0.8 -> shell-fm-0.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56bd91918851a70ccd694960fd5412fe
diff --git a/metadata/md5-cache/media-sound/skype-call-recorder-0.8 b/metadata/md5-cache/media-sound/skype-call-recorder-0.8
index 4d9c3b201654..f4942c8bcf7f 100644
--- a/metadata/md5-cache/media-sound/skype-call-recorder-0.8
+++ b/metadata/md5-cache/media-sound/skype-call-recorder-0.8
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=media-libs/id3lib >=media-libs/libogg-1.2.0 >=media-libs/libvorbis-1.2.0 media-sound/lame >=x11-libs/qt-core-4.4:4 >=x11-libs/qt-dbus-4.4:4 >=x11-libs/qt-gui-4.4:4[dbus] net-im/skype[-qt-static]
 SLOT=0
 SRC_URI=http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=798244110608201009149b054f82a284
diff --git a/metadata/md5-cache/media-sound/snd-12.7 b/metadata/md5-cache/media-sound/snd-12.7
index a449f0281aec..73dd0432c971 100644
--- a/metadata/md5-cache/media-sound/snd-12.7
+++ b/metadata/md5-cache/media-sound/snd-12.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam )
 REQUIRED_USE=portaudio? ( !pulseaudio ) pulseaudio? ( !portaudio ) ^^ ( ( !ruby !s7 ) ( ruby !s7 ) ( !ruby s7 ) )
 SLOT=0
 SRC_URI=ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=652cf869fc2edeb0c31b826887d47797
diff --git a/metadata/md5-cache/media-sound/snd-12.8 b/metadata/md5-cache/media-sound/snd-12.8
index 6e911d44578c..6f78d62efe27 100644
--- a/metadata/md5-cache/media-sound/snd-12.8
+++ b/metadata/md5-cache/media-sound/snd-12.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam )
 REQUIRED_USE=portaudio? ( !pulseaudio ) pulseaudio? ( !portaudio ) ^^ ( ( !ruby !s7 ) ( ruby !s7 ) ( !ruby s7 ) )
 SLOT=0
 SRC_URI=ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a616aa4a2e286d993fd36ed9eb7abb14
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-1.8 b/metadata/md5-cache/media-sound/sonic-visualiser-1.8
deleted file mode 100644
index 0d734306b44b..000000000000
--- a/metadata/md5-cache/media-sound/sonic-visualiser-1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Music audio files viewer and analiser
-EAPI=4
-HOMEPAGE=http://www.sonicvisualiser.org/
-IUSE=fftw id3tag jack mad ogg osc portaudio pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( jack pulseaudio portaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/sv1/sonic-visualiser-1.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4480de9e8a50da2f36683f9b53a0d4d2
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-1.9 b/metadata/md5-cache/media-sound/sonic-visualiser-1.9
index 8622c3ba4791..b8225fd85a77 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-1.9
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-1.9
@@ -3,7 +3,7 @@ DEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/lib
 DESCRIPTION=Music audio files viewer and analiser
 EAPI=4
 HOMEPAGE=http://www.sonicvisualiser.org/
-IUSE=fftw id3tag jack mad ogg osc portaudio pulseaudio
+IUSE=fftw id3tag jack mad ogg osc +portaudio pulseaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( jack pulseaudio portaudio )
 SLOT=0
 SRC_URI=http://code.soundsoftware.ac.uk/attachments/download/194/sonic-visualiser-1.9.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b5a157831eb925ae4a43280ddf69547a
+_md5_=ba8a4d258b790978cf77e1a8ab1fba53
diff --git a/metadata/md5-cache/media-sound/soundkonverter-1.5.0 b/metadata/md5-cache/media-sound/soundkonverter-1.5.0
index cb5066282346..fa6df45cbaeb 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-1.5.0
+++ b/metadata/md5-cache/media-sound/soundkonverter-1.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] media-libs/taglib media-sound/cdparanoia >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/29024-soundkonverter-1.5.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4913c8e5aad59d5fc815d445fdcebe99
diff --git a/metadata/md5-cache/media-sound/soundkonverter-1.6.1 b/metadata/md5-cache/media-sound/soundkonverter-1.6.1
index 2e9e1a93d5d3..9e5ed3a77dce 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-1.6.1
+++ b/metadata/md5-cache/media-sound/soundkonverter-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] media-libs/taglib media-sound/cdparanoia >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/29024-soundkonverter-1.6.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a06e3f7a46826bad6ae0d763a8cbc392
diff --git a/metadata/md5-cache/media-sound/sox-14.3.2-r1 b/metadata/md5-cache/media-sound/sox-14.3.2-r1
index cdc89f75daea..46b34eb1e3d6 100644
--- a/metadata/md5-cache/media-sound/sox-14.3.2-r1
+++ b/metadata/md5-cache/media-sound/sox-14.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) encode? ( >=media-sound/lame-3.98.4 ) flac? ( media-libs/flac ) mad? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) ogg? ( media-libs/libvorbis media-libs/libogg ) ao? ( media-libs/libao ) ffmpeg? ( virtual/ffmpeg ) ladspa? ( media-libs/ladspa-sdk ) >=media-sound/gsm-1.0.12-r1 id3tag? ( media-libs/libid3tag ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/sox/sox-14.3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6a0f6b9d0be796a7722ac2061a2b20b
diff --git a/metadata/md5-cache/media-sound/sox-14.4.0 b/metadata/md5-cache/media-sound/sox-14.4.0
index d810bb3b73ca..4c1fbbe4d14e 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.0
+++ b/metadata/md5-cache/media-sound/sox-14.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-devel/libtool-2.2.6b >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libvorbis media-libs/libogg ) png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/sox/sox-14.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88c44751e0e19bb168ff8b64be8b24b3
diff --git a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5 b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5
index 64b031dcc158..ba1f0d9430c7 100644
--- a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5
+++ b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://taps.cs.princeton.edu/release/files/tapestrea-0.1.0.5.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=354cfbc8997f9c1ca424660208a2521a
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.4.1 b/metadata/md5-cache/media-sound/tomahawk-0.4.1
index 984a7b789913..310fcf8267ea 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.4.1
+++ b/metadata/md5-cache/media-sound/tomahawk-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=app-crypt/qca >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib ) app-crypt/qca-ossl
 SLOT=0
 SRC_URI=http://download.tomahawk-player.org/tomahawk-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae4f806e5cd4747133f654351c769a90
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.4.2 b/metadata/md5-cache/media-sound/tomahawk-0.4.2
index d210ba63aff0..50143c288763 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.4.2
+++ b/metadata/md5-cache/media-sound/tomahawk-0.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=app-crypt/qca >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib ) app-crypt/qca-ossl
 SLOT=0
 SRC_URI=http://download.tomahawk-player.org/tomahawk-0.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c594155d90bbba4ceff0d0019c30c4e7
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index 53716418b1e2..f6f63609f58d 100644
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ b/metadata/md5-cache/media-sound/tomahawk-9999
@@ -7,5 +7,5 @@ IUSE=debug fftw jabber libsamplerate +resolver twitter
 LICENSE=GPL-3 BSD
 RDEPEND=app-crypt/qca >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/qjson-0.7.1 >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 fftw? ( sci-libs/fftw:3.0 ) jabber? ( net-libs/jreen ) libsamplerate? ( media-libs/libsamplerate ) resolver? ( dev-libs/libattica >=dev-libs/quazip-0.4.3 ) twitter? ( net-libs/qtweetlib ) app-crypt/qca-ossl
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9412e68933299e62b125c63a0b42c43
diff --git a/metadata/md5-cache/media-sound/toolame-02l-r3 b/metadata/md5-cache/media-sound/toolame-02l-r3
index d950bb4958a2..61b19b1a52b7 100644
--- a/metadata/md5-cache/media-sound/toolame-02l-r3
+++ b/metadata/md5-cache/media-sound/toolame-02l-r3
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/toolame/toolame-02l.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4e64621a5c9d9f1eff6112dae3c7355
diff --git a/metadata/md5-cache/media-sound/traverso-0.49.2-r1 b/metadata/md5-cache/media-sound/traverso-0.49.2-r1
index de7d72a0f6a4..e6ff067d99db 100644
--- a/metadata/md5-cache/media-sound/traverso-0.49.2-r1
+++ b/metadata/md5-cache/media-sound/traverso-0.49.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 ) >=media-libs/libsndfile-1.0.12 media-libs/libsamplerate >=sci-libs/fftw-3 >=media-sound/wavpack-4.40.0 >=media-libs/libogg-1.1.2 >=media-libs/libvorbis-1.1.2 >=media-libs/flac-1.1.2 lv2? ( >=media-libs/slv2-0.6.1 ) mad? ( >=media-libs/libmad-0.15.0 ) lame? ( media-sound/lame )
 SLOT=0
 SRC_URI=http://traverso-daw.org/download/releases/current/traverso-0.49.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73b7c16283586f9446de4ff070bff14a
diff --git a/metadata/md5-cache/media-sound/vmpk-0.3.1 b/metadata/md5-cache/media-sound/vmpk-0.3.1
index 56216fbef7b5..95bca3ae8ad4 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.3.1
+++ b/metadata/md5-cache/media-sound/vmpk-0.3.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-svg media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ca31dbf8e941ad46c7004a763230269
diff --git a/metadata/md5-cache/media-sound/vmpk-0.3.2 b/metadata/md5-cache/media-sound/vmpk-0.3.2
index a3e993372210..eeb5ef4d06de 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.3.2
+++ b/metadata/md5-cache/media-sound/vmpk-0.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-svg dbus? ( x11-libs/qt-dbus ) media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.3.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=638e6fbdf0a4e9bbe010b74a4a8d537d
diff --git a/metadata/md5-cache/media-sound/vmpk-0.3.3 b/metadata/md5-cache/media-sound/vmpk-0.3.3
index 3bb4834ee4a0..3d2365b812c2 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.3.3
+++ b/metadata/md5-cache/media-sound/vmpk-0.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-svg dbus? ( x11-libs/qt-dbus ) media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.3.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=727aecff8c840689b06ddb7f59a5f8df
diff --git a/metadata/md5-cache/media-sound/vmpk-0.4.0 b/metadata/md5-cache/media-sound/vmpk-0.4.0
index b9ca0b586b79..8184e03670c4 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.4.0
+++ b/metadata/md5-cache/media-sound/vmpk-0.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-svg dbus? ( x11-libs/qt-dbus ) media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac14b1872a977020c60036fb6265592c
diff --git a/metadata/md5-cache/media-sound/waheela-0.3 b/metadata/md5-cache/media-sound/waheela-0.3
index ff35e94aba8c..bb25b95f1d13 100644
--- a/metadata/md5-cache/media-sound/waheela-0.3
+++ b/metadata/md5-cache/media-sound/waheela-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/amarok:4 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://linux.wuertz.org/dists/sid/main/source/waheela_0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e70162b1cbd06b40a547701ee5f0570d
diff --git a/metadata/md5-cache/media-sound/yoshimi-0.060.10 b/metadata/md5-cache/media-sound/yoshimi-0.060.10
index e5000c5c3140..ee2e2919757d 100644
--- a/metadata/md5-cache/media-sound/yoshimi-0.060.10
+++ b/metadata/md5-cache/media-sound/yoshimi-0.060.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/fontconfig x11-libs/fltk:1[opengl] sci-libs/fftw:3.0 >=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 >=media-sound/jack-audio-connection-kit-0.115.6 media-libs/libsndfile
 SLOT=0
 SRC_URI=mirror://sourceforge/yoshimi/yoshimi-0.060.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66dcb2b903396d1681bf5e18d22b90e5
diff --git a/metadata/md5-cache/media-sound/yoshimi-0.060.12 b/metadata/md5-cache/media-sound/yoshimi-0.060.12
index 5ef0f995eb31..9b6c79d60465 100644
--- a/metadata/md5-cache/media-sound/yoshimi-0.060.12
+++ b/metadata/md5-cache/media-sound/yoshimi-0.060.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/fontconfig x11-libs/fltk:1[opengl] sci-libs/fftw:3.0 >=dev-libs/mini-xml-2.5 >=media-libs/alsa-lib-1.0.17 >=media-sound/jack-audio-connection-kit-0.115.6 media-libs/libsndfile
 SLOT=0
 SRC_URI=mirror://sourceforge/yoshimi/yoshimi-0.060.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8e632453bfbb8b99f3a7e93ccaefa78
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-2.4.1 b/metadata/md5-cache/media-sound/zynaddsubfx-2.4.1
index 9eeab0dee69a..fd363cbd3df8 100644
--- a/metadata/md5-cache/media-sound/zynaddsubfx-2.4.1
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mini-xml-2.2.1 sci-libs/fftw:3.0 alsa? ( media-libs/alsa-lib
 REQUIRED_USE=!alsa? ( jack )
 SLOT=0
 SRC_URI=mirror://sourceforge/zynaddsubfx/ZynAddSubFX-2.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c53a9eb1e69a73557ac9afc3a4210ea5
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-2.4.2 b/metadata/md5-cache/media-sound/zynaddsubfx-2.4.2
index 2f25f2a665a4..8a6aa98f40c1 100644
--- a/metadata/md5-cache/media-sound/zynaddsubfx-2.4.2
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-2.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/mini-xml-2.2.1 sci-libs/fftw:3.0 alsa? ( media-libs/alsa-lib
 REQUIRED_USE=!alsa? ( jack )
 SLOT=0
 SRC_URI=mirror://sourceforge/zynaddsubfx/ZynAddSubFX-2.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=343fa11efea55ea8ee679d1420acc6e9
diff --git a/metadata/md5-cache/media-tv/mythtv-0.24.1_p20110524 b/metadata/md5-cache/media-tv/mythtv-0.24.1_p20110524
index 40d8073a71e0..a4b4972d8474 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.24.1_p20110524
+++ b/metadata/md5-cache/media-tv/mythtv-0.24.1_p20110524
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.0 >=media-sound/lame-3.93.1 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] x11-libs/qt-sql:4[qt3support,mysql] x11-libs/qt-opengl:4[qt3support] x11-libs/qt-webkit:4 virtual/mysql virtual/opengl virtual/glu || ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 ) alsa? ( >=media-libs/alsa-lib-0.9 ) autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers ) dvd? ( media-libs/libdvdcss ) ieee1394? ( >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.3 >=media-libs/libiec61883-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP >=dev-perl/libwww-perl-6 ) python? ( dev-python/mysql-python dev-python/lxml ) xvmc? ( x11-libs/libXvMC ) bluray? ( media-libs/libbluray ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-180.06 ) media-fonts/corefonts media-fonts/dejavu !media-tv/mythtv-bindings =dev-lang/python-2*
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/tarball/347cd2477ad82a7aa75ebe7c686db77465f415dc -> mythtv-0.24.1_p20110524.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41263c6b86fa78fd1d553eced2e66ba3
diff --git a/metadata/md5-cache/media-tv/mythtv-0.25.1 b/metadata/md5-cache/media-tv/mythtv-0.25.1
index fd96cfdb8b6a..a077f7f57128 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.25.1
+++ b/metadata/md5-cache/media-tv/mythtv-0.25.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.93.1 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] x11-libs/qt-sql:4[mysql] x11-libs/qt-opengl:4 x11-libs/qt-webkit:4 virtual/mysql virtual/opengl virtual/glu alsa? ( >=media-libs/alsa-lib-1.0.24 ) cec? ( dev-libs/libcec ) dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers ) ieee1394? ( >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.3 >=media-libs/libiec61883-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11 ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) xvmc? ( x11-libs/libXvMC ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu >=media-libs/freetype-2.0 x11-apps/xinit || ( >=net-misc/wget-1.12-r3 >=media-tv/xmltv-0.5.43 ) autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) bluray? ( media-libs/libbluray ) dvd? ( media-libs/libdvdcss )
 SLOT=0
 SRC_URI=ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.25.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=96d8fc5c5d49a4328ca3ed2bf270ae4a
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=83eceb3bc4e2bfbd636dd3f3557f6ccf
diff --git a/metadata/md5-cache/media-tv/mythtv-status-0.10.1 b/metadata/md5-cache/media-tv/mythtv-status-0.10.1
index e81b706fa613..e614a2bfa3ba 100644
--- a/metadata/md5-cache/media-tv/mythtv-status-0.10.1
+++ b/metadata/md5-cache/media-tv/mythtv-status-0.10.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction media-tv/mythtv[perl]
+DEPEND=dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction dev-perl/Config-Auto media-tv/mythtv[perl]
 DESCRIPTION=Displays the current status of MythTV at the command prompt
 EAPI=4
 HOMEPAGE=http://www.etc.gen.nz/projects/mythtv/mythtv-status.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction media-tv/mythtv[perl]
+RDEPEND=dev-perl/libwww-perl dev-perl/XML-LibXML dev-perl/DateManip dev-perl/MIME-tools dev-perl/Sys-SigAction dev-perl/Config-Auto media-tv/mythtv[perl]
 SLOT=0
 SRC_URI=http://www.etc.gen.nz/projects/mythtv/tarballs/mythtv-status-0.10.1.tar.gz
-_md5_=822d16c0fa0371242320745c7c648f1b
+_md5_=59a3f4da03a6fb7d99842cfe73a70487
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.1 b/metadata/md5-cache/media-tv/tvbrowser-3.1
index f4aa9f830e78..2c46ae638c8a 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=930fd1bc02a8ba9b4938d09c8a9744c9
diff --git a/metadata/md5-cache/media-tv/xawtv-3.95-r2 b/metadata/md5-cache/media-tv/xawtv-3.95-r2
index 71411932f027..138732bd64ce 100644
--- a/metadata/md5-cache/media-tv/xawtv-3.95-r2
+++ b/metadata/md5-cache/media-tv/xawtv-3.95-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.1 virtual/jpeg X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/openmotif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng )
 SLOT=0
 SRC_URI=http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz X? ( http://dl.bytesex.org/releases/tv-fonts/tv-fonts-1.1.tar.bz2 ) mirror://gentoo/xawtv-patches-4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87930d1d8aaf63bedd5df6742e2256a0
diff --git a/metadata/md5-cache/media-video/alevt-1.6.2 b/metadata/md5-cache/media-video/alevt-1.6.2
index e68b9294acc4..b5cb64ae36de 100644
--- a/metadata/md5-cache/media-video/alevt-1.6.2
+++ b/metadata/md5-cache/media-video/alevt-1.6.2
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11 >=media-libs/libpng-1.4
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.goron.de/~froese/alevt/alevt-1.6.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d675fe662a33d9bbc5537ce58975840
diff --git a/metadata/md5-cache/media-video/avidemux-2.5.6-r1 b/metadata/md5-cache/media-video/avidemux-2.5.6-r1
index 651f7c27ee9a..d82315940b7d 100644
--- a/metadata/md5-cache/media-video/avidemux-2.5.6-r1
+++ b/metadata/md5-cache/media-video/avidemux-2.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften[cxx] ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) gtk? ( x11-libs/gtk+:2 ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) mp3? ( media-sound/lame ) pulseaudio? ( media-sound/pulseaudio ) qt4? ( >=x11-libs/qt-gui-4.6:4 opengl? ( virtual/opengl >=x11-libs/qt-opengl-4.6:4 ) ) sdl? ( media-libs/libsdl ) truetype? ( media-libs/freetype:2 media-libs/fontconfig ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid )
 SLOT=2
 SRC_URI=mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64521f552ed7ae9e197b540cd9dc4b78
diff --git a/metadata/md5-cache/media-video/bangarang-2.0.1 b/metadata/md5-cache/media-video/bangarang-2.0.1
index 2d7275f4bd0c..f46c33bab73c 100644
--- a/metadata/md5-cache/media-video/bangarang-2.0.1
+++ b/metadata/md5-cache/media-video/bangarang-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/soprano >=kde-base/kdelibs-4.6:4[aqua=,semantic-desktop] >=kde-base/nepomuk-4.6:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.6:4[aqua=] media-libs/taglib media-libs/phonon x11-libs/qt-script >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=http://opendesktop.org/CONTENT/content-files/113305-bangarang-2.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1c0a9987219b9ce5560d70a579e1029a
diff --git a/metadata/md5-cache/media-video/bangarang-2.1 b/metadata/md5-cache/media-video/bangarang-2.1
index 604a049679e4..e8d67759854c 100644
--- a/metadata/md5-cache/media-video/bangarang-2.1
+++ b/metadata/md5-cache/media-video/bangarang-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/soprano >=kde-base/kdelibs-4.6:4[aqua=,semantic-desktop] >=kde-base/nepomuk-4.6:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.6:4[aqua=] media-libs/taglib media-libs/phonon x11-libs/qt-script >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ru(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=http://bangarangissuetracking.googlecode.com/files/bangarang-2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a27352f2b6a680718fe367c32bcbcb6
diff --git a/metadata/md5-cache/media-video/bbtools-1.9 b/metadata/md5-cache/media-video/bbtools-1.9
index 4185737e7576..448a28a364be 100644
--- a/metadata/md5-cache/media-video/bbtools-1.9
+++ b/metadata/md5-cache/media-video/bbtools-1.9
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://files.digital-digest.com/downloads/files/encode/bbtool19_src.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4deaa493aabe603bf7a4504556cc332e
diff --git a/metadata/md5-cache/media-video/bombono-dvd-1.0.0 b/metadata/md5-cache/media-video/bombono-dvd-1.0.0
index 8320cfd93d7a..8e6566272cdc 100644
--- a/metadata/md5-cache/media-video/bombono-dvd-1.0.0
+++ b/metadata/md5-cache/media-video/bombono-dvd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/enca app-cdr/dvd+rw-tools dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/boost <dev-libs/glib-2.32.1 media-libs/libdvdread media-sound/twolame media-video/dvdauthor virtual/ffmpeg >=media-video/mjpegtools-1.8.0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/bombono/bombono-dvd-1.0.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdaec5153109862afdf04d66d044aa3e
diff --git a/metadata/md5-cache/media-video/bombono-dvd-1.2.1 b/metadata/md5-cache/media-video/bombono-dvd-1.2.1
index 9176dd823538..67827b0e3e85 100644
--- a/metadata/md5-cache/media-video/bombono-dvd-1.2.1
+++ b/metadata/md5-cache/media-video/bombono-dvd-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/enca app-cdr/dvd+rw-tools dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.47 media-libs/libdvdread media-sound/twolame media-video/dvdauthor virtual/cdrtools virtual/ffmpeg >=media-video/mjpegtools-1.8.0 x11-libs/gtk+:2 gnome? ( gnome-base/gvfs )
 SLOT=0
 SRC_URI=mirror://sourceforge/bombono/bombono-dvd-1.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=921209ec12a686bf8c3a6b51a63a5eaa
diff --git a/metadata/md5-cache/media-video/cclive-0.7.2 b/metadata/md5-cache/media-video/cclive-0.7.2
index 7b3a4dbb6bbb..c5de96929916 100644
--- a/metadata/md5-cache/media-video/cclive-0.7.2
+++ b/metadata/md5-cache/media-video/cclive-0.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/quvi-0.2.10 >=dev-libs/boost-1.42 >=net-misc/curl-7.20 >=dev-libs/libpcre-8.02[cxx]
 SLOT=0
 SRC_URI=mirror://sourceforge/cclive/0.7/cclive-0.7.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a0245a52e252cd01d35eac6dfc46e61
diff --git a/metadata/md5-cache/media-video/cinelerra-20111223 b/metadata/md5-cache/media-video/cinelerra-20111223
index e9a7e14661cb..5270d5f56809 100644
--- a/metadata/md5-cache/media-video/cinelerra-20111223
+++ b/metadata/md5-cache/media-video/cinelerra-20111223
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 >=media-libs/libpng-1.2:0 media-libs/libsndfile >=media-libs/libtheora-1.1 >=media-libs/libvorbis-1.3 >=media-libs/openexr-1.5 media-libs/tiff:0 media-libs/x264 media-sound/lame >=media-video/mjpegtools-2 >=sci-libs/fftw-3 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXv x11-libs/libXvMC x11-libs/libXxf86vm virtual/ffmpeg virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/cinelerra-20111223.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c7473deb1804575c25b07bd62d606c0
diff --git a/metadata/md5-cache/media-video/dvdauthor-0.7.0 b/metadata/md5-cache/media-video/dvdauthor-0.7.0
index c2ea23978912..74b56c2c8f1b 100644
--- a/metadata/md5-cache/media-video/dvdauthor-0.7.0
+++ b/metadata/md5-cache/media-video/dvdauthor-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread media-libs/libpng graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdauthor/dvdauthor-0.7.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f540833ff4ef9cd1059680f35e2e4c0c
diff --git a/metadata/md5-cache/media-video/dvdimagecmp-0.3-r1 b/metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
index ab034b930acc..f378d81fd802 100644
--- a/metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
+++ b/metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
@@ -5,5 +5,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/dvdimagecmp-0.3.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=289cf1977392ff2eaab5fe0e1e229c81
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r1 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r1
index 6732f852cc1f..a39025781310 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r1
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( virtual/ffmpeg ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da140ef502ea71373364b396249b2a5a
diff --git a/metadata/md5-cache/media-video/em8300-libraries-0.17.4 b/metadata/md5-cache/media-video/em8300-libraries-0.17.4
index bed6c0e812e1..4124b11f0e31 100644
--- a/metadata/md5-cache/media-video/em8300-libraries-0.17.4
+++ b/metadata/md5-cache/media-video/em8300-libraries-0.17.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) ~media-video/em8300-modules-0.17.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dxr3/em8300-0.17.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=475363cc402fd1ddecb92033271427a3
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.2 b/metadata/md5-cache/media-video/ffmpeg-0.10.2
index f14b15de0438..f54921035fe0 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.2
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? (
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ccad7456add814ac369ece6435b552e
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.3 b/metadata/md5-cache/media-video/ffmpeg-0.10.3
index 1562721bf84a..7981d3d8e197 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.3
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=4
 HOMEPAGE=http://ffmpeg.org/
 IUSE=aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f3b7e4798605deb41c42fe10930189d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a0cfd2e45c9896479724d3f707e46c1e
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.11.1 b/metadata/md5-cache/media-video/ffmpeg-0.11.1
index 292d291f9885..6557eeda2392 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.11.1
+++ b/metadata/md5-cache/media-video/ffmpeg-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? (
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95e97c2c92ff51690ce45ba6a9711e2d
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index f546b3e8daf2..0ff4b17a1487 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3955770cd45c331fa8cc616f1e31e83f
diff --git a/metadata/md5-cache/media-video/flumotion-0.8.1 b/metadata/md5-cache/media-video/flumotion-0.8.1
index 03d244d7a739..f3b3f9cacbf2 100644
--- a/metadata/md5-cache/media-video/flumotion-0.8.1
+++ b/metadata/md5-cache/media-video/flumotion-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/gst-python:0.10 dev-python/kiwi dev-python/pycairo =dev-python/pygtk-2* dev-python/twisted media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://www.flumotion.net/src/flumotion/flumotion-0.8.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9feb86b541f9b6533c9531d0dde5ee4e
diff --git a/metadata/md5-cache/media-video/gpac-0.4.5-r4 b/metadata/md5-cache/media-video/gpac-0.4.5-r4
index 3e1abae8e1e0..6c4204eaa90b 100644
--- a/metadata/md5-cache/media-video/gpac-0.4.5-r4
+++ b/metadata/md5-cache/media-video/gpac-0.4.5-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) ffmpeg? ( virtual/ffmpeg ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) javascript? ( >=dev-lang/spidermonkey-1.5 <dev-lang/spidermonkey-1.8.5 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4 ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4 ) wxwidgets? ( =x11-libs/wxGTK-2.8* ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg ) ssl? ( dev-libs/openssl ) pulseaudio? ( media-sound/pulseaudio ) x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/gpac/gpac-0.4.5.tar.gz mirror://gentoo/gpac-0.4.5-patches-8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1bd30ffc08fe922fcb2d8b28ca6ba73f
diff --git a/metadata/md5-cache/media-video/gpac-0.4.5-r5 b/metadata/md5-cache/media-video/gpac-0.4.5-r5
index 6024bc1131a7..a58477344e89 100644
--- a/metadata/md5-cache/media-video/gpac-0.4.5-r5
+++ b/metadata/md5-cache/media-video/gpac-0.4.5-r5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) ffmpeg? ( virtual/ffmpeg ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4 ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4 ) wxwidgets? ( =x11-libs/wxGTK-2.8* ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg ) ssl? ( dev-libs/openssl ) pulseaudio? ( media-sound/pulseaudio ) x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/gpac/gpac-0.4.5.tar.gz mirror://gentoo/gpac-0.4.5-patches-9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=9b3350ed0a092f505c9d456abddebc62
diff --git a/metadata/md5-cache/media-video/kaffeine-1.2.2 b/metadata/md5-cache/media-video/kaffeine-1.2.2
index ea5094a46913..806233686097 100644
--- a/metadata/md5-cache/media-video/kaffeine-1.2.2
+++ b/metadata/md5-cache/media-video/kaffeine-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=x11-libs/libXScrnSaver x11-libs/qt-sql:4[sqlite] >=media-libs/xine-lib-1.1.18.1 >=kde-base/solid-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kaffeine/kaffeine-1.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f8b698e5e2c7291847d97c893a82eea9
diff --git a/metadata/md5-cache/media-video/kamerka-0.6 b/metadata/md5-cache/media-video/kamerka-0.6
index 2a3eb9b714d7..ca548f802c6c 100644
--- a/metadata/md5-cache/media-video/kamerka-0.6
+++ b/metadata/md5-cache/media-video/kamerka-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libv4l >=x11-libs/qt-core-4.7 >=kde-base/phonon-kde-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://dosowisko.net/kamerka/downloads/kamerka-0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1a096ae765d2d2991b560412c07727c2
diff --git a/metadata/md5-cache/media-video/kamerka-0.8.1 b/metadata/md5-cache/media-video/kamerka-0.8.1
index c4b445171da6..bb99043e25aa 100644
--- a/metadata/md5-cache/media-video/kamerka-0.8.1
+++ b/metadata/md5-cache/media-video/kamerka-0.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libv4l >=x11-libs/qt-core-4.7 >=kde-base/phonon-kde-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://dosowisko.net/kamerka/downloads/kamerka-0.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b23e10985aa9f4aa0e437310e7561fc8
diff --git a/metadata/md5-cache/media-video/kdenlive-0.8.2.1 b/metadata/md5-cache/media-video/kdenlive-0.8.2.1
index 996ce2befdd5..c54c73e8933e 100644
--- a/metadata/md5-cache/media-video/kdenlive-0.8.2.1
+++ b/metadata/md5-cache/media-video/kdenlive-0.8.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/qjson >=media-libs/mlt-0.7.6[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kdenlive/kdenlive-0.8.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f55dc5c831b38f6c196364c43d9b64df
diff --git a/metadata/md5-cache/media-video/kdenlive-0.9.2 b/metadata/md5-cache/media-video/kdenlive-0.9.2
index 143e32ef5288..8f0363e6712c 100644
--- a/metadata/md5-cache/media-video/kdenlive-0.9.2
+++ b/metadata/md5-cache/media-video/kdenlive-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/qjson >=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdenlive/0.9.2/src/kdenlive-0.9.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3847b20c62da102920324d6a15566c29
diff --git a/metadata/md5-cache/media-video/kffmpegthumbnailer-1.1.0 b/metadata/md5-cache/media-video/kffmpegthumbnailer-1.1.0
index 8cf502a710e9..414878ab5487 100644
--- a/metadata/md5-cache/media-video/kffmpegthumbnailer-1.1.0
+++ b/metadata/md5-cache/media-video/kffmpegthumbnailer-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/ffmpegthumbnailer-2 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://ffmpegthumbnailer.googlecode.com/files/kffmpegthumbnailer-1.1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=65f5a72717bccd46c6c456018dd99831
diff --git a/metadata/md5-cache/media-video/kmplayer-0.11.3c b/metadata/md5-cache/media-video/kmplayer-0.11.3c
index f4e26ea19856..1849277fcb67 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.11.3c
+++ b/metadata/md5-cache/media-video/kmplayer-0.11.3c
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=media-libs/phonon expat? ( >=dev-libs/expat-2.0.1 ) cairo? ( x11-libs/cairo x11-libs/pango ) npp? ( dev-libs/dbus-glib >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kmplayer.kde.org/pkgs/kmplayer-0.11.3c.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=608a96ad60c584d3060bb3bed013c0c9
diff --git a/metadata/md5-cache/media-video/kmplayer-0.11.3d b/metadata/md5-cache/media-video/kmplayer-0.11.3d
index 70ed584bf59c..217dbad6e1bd 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.11.3d
+++ b/metadata/md5-cache/media-video/kmplayer-0.11.3d
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=media-libs/phonon x11-libs/libX11 expat? ( >=dev-libs/expat-2.0.1 ) cairo? ( x11-libs/cairo x11-libs/pango ) npp? ( dev-libs/dbus-glib >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5eaf7b60662c66715ed862fbf44b4cb5
diff --git a/metadata/md5-cache/media-video/kplayer-0.7.2 b/metadata/md5-cache/media-video/kplayer-0.7.2
index 8bb32e38f347..143fea9827a2 100644
--- a/metadata/md5-cache/media-video/kplayer-0.7.2
+++ b/metadata/md5-cache/media-video/kplayer-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kplayer/0.7.2/src/kplayer-0.7.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=220c43669ff62cb2ebe00c7ba3f9b063
diff --git a/metadata/md5-cache/media-video/leechcraft-laure-0.5.60 b/metadata/md5-cache/media-video/leechcraft-laure-0.5.60
index 12a2414ccc28..8e4d8c29ecb1 100644
--- a/metadata/md5-cache/media-video/leechcraft-laure-0.5.60
+++ b/metadata/md5-cache/media-video/leechcraft-laure-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 sys-apps/file >=media-video/vlc-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=005cd9cb58f101688a3f608f40cb0b14
diff --git a/metadata/md5-cache/media-video/leechcraft-laure-0.5.65 b/metadata/md5-cache/media-video/leechcraft-laure-0.5.65
index 8451df321899..3892711f8dd7 100644
--- a/metadata/md5-cache/media-video/leechcraft-laure-0.5.65
+++ b/metadata/md5-cache/media-video/leechcraft-laure-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 sys-apps/file >=media-video/vlc-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79edd828d79ae0ce44e20b069765fc73
diff --git a/metadata/md5-cache/media-video/leechcraft-laure-0.5.70 b/metadata/md5-cache/media-video/leechcraft-laure-0.5.70
index 72fffeafca8c..122409520fd5 100644
--- a/metadata/md5-cache/media-video/leechcraft-laure-0.5.70
+++ b/metadata/md5-cache/media-video/leechcraft-laure-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 sys-apps/file >=media-video/vlc-2.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57294f97d783294907c6be31344068a2
diff --git a/metadata/md5-cache/media-video/leechcraft-laure-9999 b/metadata/md5-cache/media-video/leechcraft-laure-9999
index 88ae14444d16..aab5c0ee85d1 100644
--- a/metadata/md5-cache/media-video/leechcraft-laure-9999
+++ b/metadata/md5-cache/media-video/leechcraft-laure-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 sys-apps/file >=media-video/vlc-2.0.0
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19e12a1a8e5894a15e43699d1b43008f
diff --git a/metadata/md5-cache/media-video/libav-0.8.2 b/metadata/md5-cache/media-video/libav-0.8.2
index 72c367ef8c94..5f664b558654 100644
--- a/metadata/md5-cache/media-video/libav-0.8.2
+++ b/metadata/md5-cache/media-video/libav-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( g
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libav.org/releases/libav-0.8.2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a0c1d06593cbce0ca82e033a7d8ac99
diff --git a/metadata/md5-cache/media-video/libav-0.8.2-r2 b/metadata/md5-cache/media-video/libav-0.8.2-r2
index f20c5e24c233..373e0dfe290c 100644
--- a/metadata/md5-cache/media-video/libav-0.8.2-r2
+++ b/metadata/md5-cache/media-video/libav-0.8.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/open
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode )
 SLOT=0
 SRC_URI=http://libav.org/releases/libav-0.8.2.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8115e7ba916e7e3ee85d7774b4cbd017
diff --git a/metadata/md5-cache/media-video/libav-0.8.3 b/metadata/md5-cache/media-video/libav-0.8.3
index 107525e0c527..a18393c4cec1 100644
--- a/metadata/md5-cache/media-video/libav-0.8.3
+++ b/metadata/md5-cache/media-video/libav-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/open
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode )
 SLOT=0
 SRC_URI=http://libav.org/releases/libav-0.8.3.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f896b215fdb7f58a69d0aebd31f5baea
diff --git a/metadata/md5-cache/media-video/libav-0.8.9999 b/metadata/md5-cache/media-video/libav-0.8.9999
index 652182fd0f7a..41da6c620715 100644
--- a/metadata/md5-cache/media-video/libav-0.8.9999
+++ b/metadata/md5-cache/media-video/libav-0.8.9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/open
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode )
 SLOT=0
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76b4fade45763a2132f5a940502ddb23
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index 047fefb4b15e..1a4bcd39e503 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/open
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode zlib )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=122a9a59c576f09edeb8505a98b57a0f
diff --git a/metadata/md5-cache/media-video/loopy-0.5.3 b/metadata/md5-cache/media-video/loopy-0.5.3
index 68d4311e7ca8..d8c193b35adc 100644
--- a/metadata/md5-cache/media-video/loopy-0.5.3
+++ b/metadata/md5-cache/media-video/loopy-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120880-loopy_0.5.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=985d53e08704cba96244908c98a9513b
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r1 b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r1
index 258971d44edb..9eb9fc1b3194 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r1
+++ b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/l
 REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6b8f3527712b4f01ce52b4efff3a0b0
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r2 b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r2
index abfedb797b1e..317a55c3b141 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.0.0-r2
+++ b/metadata/md5-cache/media-video/mjpegtools-2.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/l
 REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a85eeccc7f6b2e7c3b05af7511180641
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1 b/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
index 3b89c99d71b3..17bf03e40100 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
+++ b/metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=4
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
 IUSE=bzip2 debug lzo pch wxwidgets
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.0.1.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=c0e3c9c906f10e882202305b3020be0d
+_md5_=0c23e2ef989a963389409809411a72f8
diff --git a/metadata/md5-cache/media-video/mpglen-0.1 b/metadata/md5-cache/media-video/mpglen-0.1
index efd9bd5156fd..d9527db0c37a 100644
--- a/metadata/md5-cache/media-video/mpglen-0.1
+++ b/metadata/md5-cache/media-video/mpglen-0.1
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.iamnota.net/mpglen/mpglen.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4290c8675a535d5061851523827642b
diff --git a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20110322-r1 b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20110322-r1
index 2af0c3d60f2b..35296cbc9d98 100644
--- a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20110322-r1
+++ b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20110322-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib !bindist? ( x86? ( win32co
 REQUIRED_USE=bindist? ( !amr !faac !win32codecs )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~scarabeus/mplayer-1.0_rc4_p20110322.tar.xz mirror://gentoo/mplayer-1.0_rc4_p20110322.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee39f60b267b5e29671ada017d55ec28
diff --git a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120213 b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120213
index ccc0fa847284..35e74908d4cf 100644
--- a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120213
+++ b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120213
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-0.10
 REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) xinerama? ( X ) dga? ( X ) opengl? ( X ) osdmenu? ( X ) vdpau? ( X ) vidix? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=mirror://gentoo/mplayer-1.0_rc4_p20120213.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b0e3182aa31e131b26f184c08e660ab
diff --git a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120405 b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120405
index ed035736c35e..eca91471eacd 100644
--- a/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120405
+++ b/metadata/md5-cache/media-video/mplayer-1.0_rc4_p20120405
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-0.10.
 REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) xinerama? ( X ) dga? ( X ) opengl? ( X ) osdmenu? ( X ) vdpau? ( X ) vidix? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=mirror://gentoo/mplayer-1.0_rc4_p20120405.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fcbd079ee13150783cfb3877adb4d33
diff --git a/metadata/md5-cache/media-video/mplayer-1.1-r1 b/metadata/md5-cache/media-video/mplayer-1.1-r1
index 12b8799e965d..c88f271155ce 100644
--- a/metadata/md5-cache/media-video/mplayer-1.1-r1
+++ b/metadata/md5-cache/media-video/mplayer-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-0.10.
 REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) xinerama? ( X ) dga? ( X ) opengl? ( X ) osdmenu? ( X ) vdpau? ( X ) vidix? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.1.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d60f91b2e00d0f6f66723f406f4137f2
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index fd60db2a319f..76f1d19f5b06 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-0.11.
 REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) dxr3? ( X ) ggi? ( X ) xinerama? ( X ) dga? ( X ) opengl? ( X ) osdmenu? ( X ) vdpau? ( X ) vidix? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f23e9c36384dc2248a07fe2505331c69
diff --git a/metadata/md5-cache/media-video/mplayer2-2.0_p20120309 b/metadata/md5-cache/media-video/mplayer2-2.0_p20120309
index 9a8abf7b1559..e3d6248b30da 100644
--- a/metadata/md5-cache/media-video/mplayer2-2.0_p20120309
+++ b/metadata/md5-cache/media-video/mplayer2-2.0_p20120309
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-l
 REQUIRED_USE=bindist? ( !win32codecs ) cdio? ( !cdparanoia ) cddb? ( || ( cdio cdparanoia ) network ) dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) radio? ( || ( dvb v4l ) ) dxr3? ( X ) ggi? ( X ) opengl? ( X ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/mplayer2-2.0_p20120309.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=770fd774a252bd3812010e3952ae43d3
diff --git a/metadata/md5-cache/media-video/mplayer2-9999 b/metadata/md5-cache/media-video/mplayer2-9999
index f7775b1762c9..c2b948282472 100644
--- a/metadata/md5-cache/media-video/mplayer2-9999
+++ b/metadata/md5-cache/media-video/mplayer2-9999
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-l
 REQUIRED_USE=libass? ( truetype ) bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) dxr3? ( X ) ggi? ( X ) opengl? ( X ) radio? ( || ( dvb v4l ) ) truetype? ( iconv ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b37ba4ccce50720e87fdfe67a984a0e
diff --git a/metadata/md5-cache/media-video/noad-0.7.3 b/metadata/md5-cache/media-video/noad-0.7.3
index 3b2b4cab5e5f..fd1e00d1ec34 100644
--- a/metadata/md5-cache/media-video/noad-0.7.3
+++ b/metadata/md5-cache/media-video/noad-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad
 SLOT=0
 SRC_URI=http://noad.heliohost.org/noad-0.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5b68833a8d15cd07f16ae28c007645e
diff --git a/metadata/md5-cache/media-video/nvidia-settings-260.19.29 b/metadata/md5-cache/media-video/nvidia-settings-260.19.29
index a581dc583424..70fae349165e 100644
--- a/metadata/md5-cache/media-video/nvidia-settings-260.19.29
+++ b/metadata/md5-cache/media-video/nvidia-settings-260.19.29
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-base/xorg-server x11-libs/libXt x11-libs/pango[X] =x11-drivers/nvidia-drivers-2*
 SLOT=0
 SRC_URI=ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-260.19.29.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0de075ac37cccb41b4a4f1e627dd3ea7
diff --git a/metadata/md5-cache/media-video/ogmrip-0.13.8 b/metadata/md5-cache/media-video/ogmrip-0.13.8
new file mode 100644
index 000000000000..e7ac714c780d
--- /dev/null
+++ b/metadata/md5-cache/media-video/ogmrip-0.13.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4
+EAPI=4
+HOMEPAGE=http://ogmrip.sourceforge.net/
+IUSE=aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
+SLOT=0
+SRC_URI=mirror://sourceforge/ogmrip/ogmrip-0.13.8.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=63a825369dea49857d20de21cb76b5d2
diff --git a/metadata/md5-cache/media-video/qx11grab-0.4.3 b/metadata/md5-cache/media-video/qx11grab-0.4.3
index ce4080196db5..51cc11e59f61 100644
--- a/metadata/md5-cache/media-video/qx11grab-0.4.3
+++ b/metadata/md5-cache/media-video/qx11grab-0.4.3
@@ -10,5 +10,5 @@ PDEPEND=virtual/freedesktop-icon-theme
 RDEPEND=>=media-libs/alsa-lib-1.0.24 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.4:2 >=sys-apps/dbus-1.4.16 >=x11-libs/libX11-1.3.4 >=x11-libs/libXrandr-1.3 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-dbus-4.7.2:4 >=x11-libs/qt-gui-4.7.2:4[dbus] >=virtual/ffmpeg-0.10.2-r1[X,encode,truetype] kde? ( kde-base/kdelibs:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://qx11grab.hjcms.de/downloads/0.4.3/qx11grab-0.4.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1bef738986752b23951d14081636b46
diff --git a/metadata/md5-cache/media-video/smplayer2-0.7.0_pre20111120 b/metadata/md5-cache/media-video/smplayer2-0.7.0_pre20111120
index c6e3b40418bc..40c001711242 100644
--- a/metadata/md5-cache/media-video/smplayer2-0.7.0_pre20111120
+++ b/metadata/md5-cache/media-video/smplayer2-0.7.0_pre20111120
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 download-subs? ( dev-libs/quazip ) media-video/mplayer2[libass,png]
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/smplayer2-0.7.0_pre20111120.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87fd307256a20e4a9f2b488260885a65
diff --git a/metadata/md5-cache/media-video/smplayer2-0.7.1_p20120301 b/metadata/md5-cache/media-video/smplayer2-0.7.1_p20120301
index 1720a70ed2f3..fd5609645202 100644
--- a/metadata/md5-cache/media-video/smplayer2-0.7.1_p20120301
+++ b/metadata/md5-cache/media-video/smplayer2-0.7.1_p20120301
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 download-subs? ( dev-libs/quazip ) media-video/mplayer2[libass,png]
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/smplayer2-0.7.1_p20120301.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a347e29669e8eb6f011cb1a61aff89cc
diff --git a/metadata/md5-cache/media-video/smplayer2-9999 b/metadata/md5-cache/media-video/smplayer2-9999
index f7d7d1d46ef5..314d40f4ff7d 100644
--- a/metadata/md5-cache/media-video/smplayer2-9999
+++ b/metadata/md5-cache/media-video/smplayer2-9999
@@ -7,5 +7,5 @@ IUSE=debug +download-subs linguas_bg linguas_ca linguas_cs linguas_da linguas_de
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 download-subs? ( dev-libs/quazip ) media-video/mplayer2[libass,png]
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bdc4f8ecd3911507a00b56897c2a2abe
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.5.3 b/metadata/md5-cache/media-video/subtitlecomposer-0.5.3
index 5ac3533dec3b..d9038f595d01 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.5.3
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gstreamer? ( media-libs/gstreamer ) xine? ( media-libs/xine-lib ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/subcomposer/subtitlecomposer-0.5.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c15a0bfcc56a5b5b3a4575ea47bd220a
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.37.1 b/metadata/md5-cache/media-video/subtitleeditor-0.37.1
index 564b23fa9876..812a0cf13191 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.37.1
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.37.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-cpp/gtkmm-2.14:2.4 >=dev-cpp/glibmm-2.16.3:2 >=dev-cpp/libxmlpp-2.20:2.6 >=app-text/enchant-1.4 >=dev-cpp/gstreamermm-0.10.4 >=media-libs/gst-plugins-good-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10:0.10 opengl? ( >=dev-cpp/gtkglextmm-1.2 )
 SLOT=0
 SRC_URI=http://download.gna.org/subtitleeditor/0.37/subtitleeditor-0.37.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0f8d1d0648e6fe81f53c9f55536c90f
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.40.0 b/metadata/md5-cache/media-video/subtitleeditor-0.40.0
index 0f85b06ff9e4..4196590f2f10 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.40.0
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.40.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-cpp/gtkmm-2.14:2.4 >=dev-cpp/glibmm-2.16.3:2 >=dev-cpp/libxmlpp-2.20:2.6 >=app-text/enchant-1.4 >=dev-cpp/gstreamermm-0.10.4 >=media-libs/gst-plugins-good-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10:0.10 opengl? ( >=dev-cpp/gtkglextmm-1.2 )
 SLOT=0
 SRC_URI=http://download.gna.org/subtitleeditor/0.40/subtitleeditor-0.40.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=23a2395baf763145afed1bd0e5e1b27b
diff --git a/metadata/md5-cache/media-video/super_demux-0.3 b/metadata/md5-cache/media-video/super_demux-0.3
index 43db325fcda6..f30e8aae60fe 100644
--- a/metadata/md5-cache/media-video/super_demux-0.3
+++ b/metadata/md5-cache/media-video/super_demux-0.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/super_demux-0.3.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b35394d63b25afcfbd896aef078ff481
diff --git a/metadata/md5-cache/media-video/vdr-1.6.0_p2-r10 b/metadata/md5-cache/media-video/vdr-1.6.0_p2-r10
index 24988024b0e1..f26be6a570b3 100644
--- a/metadata/md5-cache/media-video/vdr-1.6.0_p2-r10
+++ b/metadata/md5-cache/media-video/vdr-1.6.0_p2-r10
@@ -11,5 +11,5 @@ RDEPEND=virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/
 REQUIRED_USE=setup? ( !menuorg ) menuorg? ( !setup )
 SLOT=0
 SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-1.6.0.tar.bz2 ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff http://www.zulu-entertainment.de/files/patches/VDR-Extensions-Patch-72.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19d7f087f550372d794bca683e15a084
diff --git a/metadata/md5-cache/media-video/vdr-1.6.0_p2-r7 b/metadata/md5-cache/media-video/vdr-1.6.0_p2-r7
index 8af1820427da..8114d12f2ebb 100644
--- a/metadata/md5-cache/media-video/vdr-1.6.0_p2-r7
+++ b/metadata/md5-cache/media-video/vdr-1.6.0_p2-r7
@@ -11,5 +11,5 @@ RDEPEND=virtual/jpeg sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/
 REQUIRED_USE=setup? ( !menuorg ) menuorg? ( !setup )
 SLOT=0
 SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-1.6.0.tar.bz2 ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff http://www.zulu-entertainment.de/files/patches/VDR-Extensions-Patch-72.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a29a2d7e7eb6704bd5c98583200e5707
diff --git a/metadata/md5-cache/media-video/vlc-1.1.13 b/metadata/md5-cache/media-video/vlc-1.1.13
index 088f28c31025..862dfcb490ae 100644
--- a/metadata/md5-cache/media-video/vlc-1.1.13
+++ b/metadata/md5-cache/media-video/vlc-1.1.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libtiger? ( media-libs/libtiger ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2008.07.06 ) lua? ( >=dev-lang/lua-5.1 ) matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 media-libs/freetype media-fonts/dejavu ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) svga? ( media-libs/svgalib ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( libv4l2? ( media-libs/libv4l ) libv4l? ( media-libs/libv4l ) ) vaapi? ( x11-libs/libva virtual/ffmpeg ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd x11-libs/libX11 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/1.1.13/vlc-1.1.13.tar.bz2 mirror://gentoo/vlc-patches-105.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4	ce12a7430a29e80fc9130a324af5c328	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4	ce12a7430a29e80fc9130a324af5c328	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4d2055730aed0083878363941be18e4
diff --git a/metadata/md5-cache/media-video/vlc-2.0.1 b/metadata/md5-cache/media-video/vlc-2.0.1
index 927f702f1b07..f430a8c0cc08 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.1
+++ b/metadata/md5-cache/media-video/vlc-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz mirror://gentoo/vlc-patches-109.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28adec5561b5ecc591d5acf21d383820
diff --git a/metadata/md5-cache/media-video/vlc-2.0.9999 b/metadata/md5-cache/media-video/vlc-2.0.9999
index ac73b980e9c6..bdb7172101a3 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.9999
+++ b/metadata/md5-cache/media-video/vlc-2.0.9999
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-101.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a43f96519b125273adc4ebd8c8b8cc7
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 765ed26aff11..948df93e45b0 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-108.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b631d505387f89b2dd5a6630b1b3f084
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20111220 b/metadata/md5-cache/media-video/x264-encoder-0.0.20111220
index 73121dbbc32d..5d38d2ebd467 100644
--- a/metadata/md5-cache/media-video/x264-encoder-0.0.20111220
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20111220
@@ -10,5 +10,5 @@ RDEPEND=ffmpeg? ( virtual/ffmpeg ) ffmpegsource? ( media-libs/ffmpegsource ) mp4
 REQUIRED_USE=ffmpegsource? ( ffmpeg )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111220-2245.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fca5400eabe2928bed5f23e21f701096
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20120327 b/metadata/md5-cache/media-video/x264-encoder-0.0.20120327
index 9389ef6ceee2..bb5644652926 100644
--- a/metadata/md5-cache/media-video/x264-encoder-0.0.20120327
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20120327
@@ -10,5 +10,5 @@ RDEPEND=ffmpeg? ( virtual/ffmpeg ) ffmpegsource? ( media-libs/ffmpegsource ) mp4
 REQUIRED_USE=ffmpegsource? ( ffmpeg )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-2245.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e68036d057c4e69451160d3211a20bb
diff --git a/metadata/md5-cache/media-video/xanim-export-2.80.1-r4 b/metadata/md5-cache/media-video/xanim-export-2.80.1-r4
index f679abbc313d..e214a32f0300 100644
--- a/metadata/md5-cache/media-video/xanim-export-2.80.1-r4
+++ b/metadata/md5-cache/media-video/xanim-export-2.80.1-r4
@@ -7,5 +7,5 @@ LICENSE=XAnim
 RDEPEND=virtual/jpeg media-libs/libpng x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=http://heroine.linuxave.net/xanim_exporting_edition.tar.gz sparc? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_sparcELF.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_sparcELF.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_iv32_sparcELF.o.Z ) ppc? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxPPC.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxPPC.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_iv32_linuxPPC.o.Z ) x86? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxELFg21.o.gz ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxELFg21.o.gz ftp://xanim.va.pubnix.com/modules/xa2.1_iv32_linuxELFg21.o.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09a7b5c95a9ce8d0621a0675bf9d1cd2
diff --git a/metadata/md5-cache/media-video/xanim-export-2.80.1-r5 b/metadata/md5-cache/media-video/xanim-export-2.80.1-r5
index 7404481081a4..d2bb2fbdcdb2 100644
--- a/metadata/md5-cache/media-video/xanim-export-2.80.1-r5
+++ b/metadata/md5-cache/media-video/xanim-export-2.80.1-r5
@@ -7,5 +7,5 @@ LICENSE=XAnim
 RDEPEND=virtual/jpeg media-libs/libpng x11-libs/libXext x11-libs/libXt media-libs/libquicktime
 SLOT=0
 SRC_URI=http://heroine.linuxave.net/xanim_exporting_edition.tar.gz sparc? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_sparcELF.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_sparcELF.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_iv32_sparcELF.o.Z ) ppc? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxPPC.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxPPC.o.Z ftp://xanim.va.pubnix.com/modules/xa2.0_iv32_linuxPPC.o.Z ) x86? ( ftp://xanim.va.pubnix.com/modules/xa1.0_cyuv_linuxELFg21.o.gz ftp://xanim.va.pubnix.com/modules/xa2.0_cvid_linuxELFg21.o.gz ftp://xanim.va.pubnix.com/modules/xa2.1_iv32_linuxELFg21.o.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bac36ec025e95e471676be3d96114778
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.1-r1 b/metadata/md5-cache/net-analyzer/arpon-2.1-r1
index bbc70f5c26bb..6ef7533e1a07 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.1-r1
+++ b/metadata/md5-cache/net-analyzer/arpon-2.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=04aa98977c2425d9f1d60f326b87a440
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.6-r1 b/metadata/md5-cache/net-analyzer/arpon-2.6-r1
index d0babfc022a5..055324e69b93 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.6-r1
+++ b/metadata/md5-cache/net-analyzer/arpon-2.6-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1fe68ab327e99f678ef6444ff078ee0b
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7 b/metadata/md5-cache/net-analyzer/arpon-2.7
index 3163d6560b27..aef17bb85558 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7
@@ -8,5 +8,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9dad4a3c4e2a85331b625468c02049e3
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7-r1 b/metadata/md5-cache/net-analyzer/arpon-2.7-r1
index f96f2c2d14e5..cc2560f8dcd6 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7-r1
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7-r1
@@ -8,5 +8,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e1f88180ec85de18367adc78a6ab179
diff --git a/metadata/md5-cache/net-analyzer/bsnmp-1.11a b/metadata/md5-cache/net-analyzer/bsnmp-1.11a
index 7b3da2c9f77d..9d93d69814f1 100644
--- a/metadata/md5-cache/net-analyzer/bsnmp-1.11a
+++ b/metadata/md5-cache/net-analyzer/bsnmp-1.11a
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://people.freebsd.org/~harti/bsnmp/bsnmp-1.11a.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16d67d55a9159a2315a9a88fa3d6cb59
diff --git a/metadata/md5-cache/net-analyzer/bsnmp-1.12 b/metadata/md5-cache/net-analyzer/bsnmp-1.12
index 64f38c6775a8..be7d56a1d9da 100644
--- a/metadata/md5-cache/net-analyzer/bsnmp-1.12
+++ b/metadata/md5-cache/net-analyzer/bsnmp-1.12
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://people.freebsd.org/~harti/bsnmp/bsnmp-1.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a185c8e4acd6811350e87fe8d6eb47d
diff --git a/metadata/md5-cache/net-analyzer/bwmon-1.3 b/metadata/md5-cache/net-analyzer/bwmon-1.3
index d03bea918953..25387a0ebde6 100644
--- a/metadata/md5-cache/net-analyzer/bwmon-1.3
+++ b/metadata/md5-cache/net-analyzer/bwmon-1.3
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/ncurses
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/bwmon/bwmon-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2bb1da4b40c5f856f77a9144b074316
diff --git a/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r3 b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r3
index 7e7670b91548..2ffc95bfed09 100644
--- a/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r3
+++ b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r2
 SLOT=0
 SRC_URI=http://www.net.princeton.edu/software/dhcp_probe/dhcp_probe-1.3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2436190eb6216d32d0b95f606133d16f
diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.8 b/metadata/md5-cache/net-analyzer/dnstracer-1.8
index 5e6f96542e2b..7bad13b1e1e7 100644
--- a/metadata/md5-cache/net-analyzer/dnstracer-1.8
+++ b/metadata/md5-cache/net-analyzer/dnstracer-1.8
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://www.mavetju.org/download/dnstracer-1.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1e76d544c2dcccd560d6c4d09c10702
diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.9 b/metadata/md5-cache/net-analyzer/dnstracer-1.9
index 80210602ed68..c6dc621e5d87 100644
--- a/metadata/md5-cache/net-analyzer/dnstracer-1.9
+++ b/metadata/md5-cache/net-analyzer/dnstracer-1.9
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://www.mavetju.org/download/dnstracer-1.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a9d57657cd79d0e8164313a67d96345
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6-r4 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6-r4
index 7fd9d7040966..3eada6959400 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6-r4
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/giflib media-libs/libpng net-libs/libpcap gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/driftnet/driftnet_0.1.6.orig.tar.gz mirror://debian/pool/main/d/driftnet/driftnet_0.1.6-8.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6be9a7fa0738dd568a625eed8f355207
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401
index 95df03d874bc..18f43e2ccbdd 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg media-libs/giflib media-libs/libpng ) mp3? ( media-sound/mpg123 )
 SLOT=0
 SRC_URI=mirror://github/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62d678d77a0e028b3a4963d3465c943e
diff --git a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4 b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
index 4e901a77c458..6cce128ba18a 100644
--- a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
+++ b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 >=dev-libs/openssl-0.9.6e >=sys-libs/db-4.2.52_p4 sys-apps/sed X? ( x11-libs/libXmu )
 SLOT=0
 SRC_URI=http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=649b4096a1264c3f8954f6cd51dee61f
diff --git a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5 b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
index a949302a1878..5726d322de71 100644
--- a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
+++ b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 >=dev-libs/openssl-0.9.6e >=sys-libs/db-4.2.52_p4 X? ( x11-libs/libXmu )
 SLOT=0
 SRC_URI=http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b35b148caa7e5448b885568bb43db0c
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.7.3-r4 b/metadata/md5-cache/net-analyzer/ettercap-0.7.3-r4
index 317c28ab337c..04a2eb11da7b 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.7.3-r4
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.7.3-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool ncurses? ( sys-libs/ncurses ) ssl? ( dev-libs/openssl ) gtk? ( >=x11-libs/gtk+-2.2.2:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ettercap/ettercap-NG-0.7.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e16248afe5653b9b2219fd63ec45585c
diff --git a/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1 b/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
index 4edfdcc54403..b2311432c500 100644
--- a/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
+++ b/metadata/md5-cache/net-analyzer/fping-2.4_beta2_p161-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64
 LICENSE=fping
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fping/fping_2.4b2-to-ipv6.orig.tar.gz mirror://debian/pool/main/f/fping/fping_2.4b2-to-ipv6-16.1.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ab91d1a89692af955e5faad2c95472d
diff --git a/metadata/md5-cache/net-analyzer/fping-3.0 b/metadata/md5-cache/net-analyzer/fping-3.0
index d0193e7c819b..bdcbc7f6a247 100644
--- a/metadata/md5-cache/net-analyzer/fping-3.0
+++ b/metadata/md5-cache/net-analyzer/fping-3.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64
 LICENSE=fping
 SLOT=0
 SRC_URI=http://fping.org/dist/fping-3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9e11e0689bdbdf884063619b59db7ef
diff --git a/metadata/md5-cache/net-analyzer/fping-3.1 b/metadata/md5-cache/net-analyzer/fping-3.1
index 8c94164f2870..087972a3353f 100644
--- a/metadata/md5-cache/net-analyzer/fping-3.1
+++ b/metadata/md5-cache/net-analyzer/fping-3.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 LICENSE=fping
 SLOT=0
 SRC_URI=http://fping.org/dist/fping-3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4eab6f4d971598e5d53cf4cc7e6c421
diff --git a/metadata/md5-cache/net-analyzer/fping-3.2 b/metadata/md5-cache/net-analyzer/fping-3.2
index a2a57852f99a..e7f383157db5 100644
--- a/metadata/md5-cache/net-analyzer/fping-3.2
+++ b/metadata/md5-cache/net-analyzer/fping-3.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebs
 LICENSE=fping
 SLOT=0
 SRC_URI=http://fping.org/dist/fping-3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0945e1044bba0739507923aa4fa48e48
diff --git a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r1 b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r1
index 5a152ddfaae1..3707a84f3d7c 100644
--- a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r1
+++ b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b89e68d44a12ed915e818dd87f76cb4f
diff --git a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r2 b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r2
index 89fd562d3c1e..0c28ecf27930 100644
--- a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r2
+++ b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-l
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c26b8ef0ab9550088956f7f2e26d216d
diff --git a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r3 b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r3
index 8da6af0fd8a2..e1a44a58f30a 100644
--- a/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r3
+++ b/metadata/md5-cache/net-analyzer/gnu-netcat-0.7.1-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f09731420f142f4929f7fe82493126e
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-2.0.1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-2.0.1
index 69f0982ffae0..c89538129a2f 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-2.0.1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4 dev-libs/libxslt net-libs/libmicrohttpd
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/857/greenbone-security-assistant-2.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a4ab71f8be6cc16fbe51cd53ca15257f
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-desktop-1.2.0 b/metadata/md5-cache/net-analyzer/greenbone-security-desktop-1.2.0
index 014fb9f11274..75d82ebba6ed 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-desktop-1.2.0
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-desktop-1.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4 x11-libs/qt-gui x11-libs/qt-webkit
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/861/greenbone-security-desktop-1.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2debd615a8b28ee7e71deaf58481144
diff --git a/metadata/md5-cache/net-analyzer/httping-1.5.2 b/metadata/md5-cache/net-analyzer/httping-1.5.2
index 36b6f57cf3b9..deda451015d9 100644
--- a/metadata/md5-cache/net-analyzer/httping-1.5.2
+++ b/metadata/md5-cache/net-analyzer/httping-1.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5 ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/httping/httping-1.5.2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=936b5effe0f032ccc0496900d0d46de7
diff --git a/metadata/md5-cache/net-analyzer/httping-1.5.3 b/metadata/md5-cache/net-analyzer/httping-1.5.3
index 3935221d3740..e619bb8db0a5 100644
--- a/metadata/md5-cache/net-analyzer/httping-1.5.3
+++ b/metadata/md5-cache/net-analyzer/httping-1.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5 ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/httping/httping-1.5.3.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=158bc9d77606616a3d766fdc1b96ae6a
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.4.99 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.4.99
index a41e8ee792de..f7a031d545a2 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.4.99
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=02f9fb1442079c29375e7431f3f98c86
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.0 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.0
index f82b25f4df28..de47dbc4ad1b 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.0
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0fed710623a3eddb57d0e4ff4d12763a
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.60 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.60
index 604b424b5505..6feed71e3d76 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.60
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d63d4acd4463c72c92f18b08db340ed6
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.65 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.65
index 53a90ad23b24..3d17aa1fe156 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.65
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea00f2c7b0185e93a999c9db2ecf29dc
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.70 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.70
index 4706c5296fc0..c6f905d02d98 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.70
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c5193fe360d0c7fa3688a4cae06635fa
diff --git a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-9999 b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-9999
index 1bacd556799e..f7973a46683a 100644
--- a/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-9999
+++ b/metadata/md5-cache/net-analyzer/leechcraft-networkmonitor-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97470f9573dace66e11f223e9283bb18
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.82 b/metadata/md5-cache/net-analyzer/mtr-0.82
index bb7c822ec565..087aba4e20e6 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.82
+++ b/metadata/md5-cache/net-analyzer/mtr-0.82
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.82.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23f317307ff0a5b64a53140da8610dae
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.4.2.1-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.4.2.1-r5
index af7609167af7..7655b29808e3 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.4.2.1-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.4.2.1-r5
@@ -9,5 +9,5 @@ LICENSE=as-is BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.4.2.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e6df14a80a4118c1914a71d33ed3c08
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.4.3-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.4.3-r1
index ee4e06a75b49..d8cf1a8409e1 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.4.3-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=as-is BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.4.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a6325e3b9a7c4ed0da4b3ed58dd033a
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.5 b/metadata/md5-cache/net-analyzer/net-snmp-5.5
index ed2cc5c4f957..9d0340d9440c 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.5
@@ -9,5 +9,5 @@ LICENSE=as-is BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc8bf566b701268c62340b72f3377655
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.6.1 b/metadata/md5-cache/net-analyzer/net-snmp-5.6.1
index c89396c7ed38..68a1728fdf7d 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.6.1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.6.1
@@ -9,5 +9,5 @@ LICENSE=as-is BSD
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/net-snmp/net-snmp-5.6.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=967d6870aabda3f2fa1f2cc5b92ad7ad
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r8 b/metadata/md5-cache/net-analyzer/netcat-110-r8
index c4773027672c..fd0911a99183 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110-r8
+++ b/metadata/md5-cache/net-analyzer/netcat-110-r8
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=crypt? ( dev-libs/libmix )
 SLOT=0
 SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0c5fb0527274ebc575fb482e317e995
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r9 b/metadata/md5-cache/net-analyzer/netcat-110-r9
index e4e28f3b337c..f540ab49a2c8 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110-r9
+++ b/metadata/md5-cache/net-analyzer/netcat-110-r9
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=!static? ( crypt? ( dev-libs/libmix ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=713c99dd0f384cc6e5bec138de2dbc72
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.4.4-r1 b/metadata/md5-cache/net-analyzer/netperf-2.4.4-r1
index f37dd9885e3e..5445ee506441 100644
--- a/metadata/md5-cache/net-analyzer/netperf-2.4.4-r1
+++ b/metadata/md5-cache/net-analyzer/netperf-2.4.4-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=netperf
 SLOT=0
 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.4.4.tar.gz mirror://gentoo/netperf-2.4.4-svn_trunk_20071205.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6accdb1e94bacf1ce2cf686dbc2dc141
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.3-r1 b/metadata/md5-cache/net-analyzer/netselect-0.3-r1
index 2f0efddd7848..f147a7575b06 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.3-r1
+++ b/metadata/md5-cache/net-analyzer/netselect-0.3-r1
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://alumnit.ca/~apenwarr/netselect/netselect-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b28a5f495f49c9143d309b977e4e09e
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.3-r2 b/metadata/md5-cache/net-analyzer/netselect-0.3-r2
index 2fdbd7fcc7a7..423c839fe7bd 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.3-r2
+++ b/metadata/md5-cache/net-analyzer/netselect-0.3-r2
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://alumnit.ca/~apenwarr/netselect/netselect-0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8880537cf21d8c7d7d5579e213d49d78
diff --git a/metadata/md5-cache/net-analyzer/netsniff-ng-0.5.6 b/metadata/md5-cache/net-analyzer/netsniff-ng-0.5.6
index 7726dba88b29..8ad62654e2b4 100644
--- a/metadata/md5-cache/net-analyzer/netsniff-ng-0.5.6
+++ b/metadata/md5-cache/net-analyzer/netsniff-ng-0.5.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-0.5.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bf333ab1e5ba18b1bc23f4108ea9f9f
diff --git a/metadata/md5-cache/net-analyzer/nipper-0.12.0 b/metadata/md5-cache/net-analyzer/nipper-0.12.0
index ff4c66edb7bb..2b294fdfff92 100644
--- a/metadata/md5-cache/net-analyzer/nipper-0.12.0
+++ b/metadata/md5-cache/net-analyzer/nipper-0.12.0
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/nipper/nipper-cli-0.12.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48327bc7a87509c5cd5f7ae9ab993468
diff --git a/metadata/md5-cache/net-analyzer/nmap-5.21-r1 b/metadata/md5-cache/net-analyzer/nmap-5.21-r1
index 50e0a29620ed..38127a6450ad 100644
--- a/metadata/md5-cache/net-analyzer/nmap-5.21-r1
+++ b/metadata/md5-cache/net-analyzer/nmap-5.21-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre net-libs/libpcap gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) ssl? ( dev-libs/openssl ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-5.21.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cab4d227d17f3c650c69a75faabb38d7
diff --git a/metadata/md5-cache/net-analyzer/nmap-5.35 b/metadata/md5-cache/net-analyzer/nmap-5.35
index 53c5e7b7db25..f220be503caa 100644
--- a/metadata/md5-cache/net-analyzer/nmap-5.35
+++ b/metadata/md5-cache/net-analyzer/nmap-5.35
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre net-libs/libpcap gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) ssl? ( dev-libs/openssl ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-5.35DC1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28b8e149fa69846a4a79dfcd36bb1dc3
diff --git a/metadata/md5-cache/net-analyzer/nmap-5.51 b/metadata/md5-cache/net-analyzer/nmap-5.51
index 5a1fc1375820..36328a84ce13 100644
--- a/metadata/md5-cache/net-analyzer/nmap-5.51
+++ b/metadata/md5-cache/net-analyzer/nmap-5.51
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre net-libs/libpcap gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) ssl? ( dev-libs/openssl ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-5.51.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd78b84d12c8826d7f007d21928db3c1
diff --git a/metadata/md5-cache/net-analyzer/nmap-6.00 b/metadata/md5-cache/net-analyzer/nmap-6.00
index 8304d9dd4383..c0c2600af782 100644
--- a/metadata/md5-cache/net-analyzer/nmap-6.00
+++ b/metadata/md5-cache/net-analyzer/nmap-6.00
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre net-libs/libpcap dev-libs/apr gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) ssl? ( dev-libs/openssl ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-6.00.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df638455b0c803f769b733c6cd2a8167
diff --git a/metadata/md5-cache/net-analyzer/nmap-6.01 b/metadata/md5-cache/net-analyzer/nmap-6.01
index 57815a3dede7..d174d9195ccb 100644
--- a/metadata/md5-cache/net-analyzer/nmap-6.01
+++ b/metadata/md5-cache/net-analyzer/nmap-6.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre net-libs/libpcap dev-libs/apr gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-6.01.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35973182eb8d70f0469c4377d9ca2b86
diff --git a/metadata/md5-cache/net-analyzer/nmapsi-0.2.1 b/metadata/md5-cache/net-analyzer/nmapsi-0.2.1
index 762ad22e2a80..0952bce256b2 100644
--- a/metadata/md5-cache/net-analyzer/nmapsi-0.2.1
+++ b/metadata/md5-cache/net-analyzer/nmapsi-0.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-webkit:4 net-analyzer/nmap
 SLOT=0
 SRC_URI=http://nmapsi4.googlecode.com/files/nmapsi4-0.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=146decbddea279a4c137a01492f5ae38
diff --git a/metadata/md5-cache/net-analyzer/nmapsi-0.3.1 b/metadata/md5-cache/net-analyzer/nmapsi-0.3.1
index 8c1e10b1020a..e20bbd7ac6cd 100644
--- a/metadata/md5-cache/net-analyzer/nmapsi-0.3.1
+++ b/metadata/md5-cache/net-analyzer/nmapsi-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 net-analyzer/nmap
 SLOT=0
 SRC_URI=http://nmapsi4.googlecode.com/files/nmapsi4-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3efe129d24d12f6e5b32290ad1e0f001
diff --git a/metadata/md5-cache/net-analyzer/openvas-administrator-1.1.1 b/metadata/md5-cache/net-analyzer/openvas-administrator-1.1.1
index 77a7f562616e..b42adc536c40 100644
--- a/metadata/md5-cache/net-analyzer/openvas-administrator-1.1.1
+++ b/metadata/md5-cache/net-analyzer/openvas-administrator-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/853/openvas-administrator-1.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd1f6c4516e67dc89f13e66857c12171
diff --git a/metadata/md5-cache/net-analyzer/openvas-cli-1.1.2 b/metadata/md5-cache/net-analyzer/openvas-cli-1.1.2
index a161d12769ba..e9958a2e5f86 100644
--- a/metadata/md5-cache/net-analyzer/openvas-cli-1.1.2
+++ b/metadata/md5-cache/net-analyzer/openvas-cli-1.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4 !net-analyzer/openvas-client
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/851/openvas-cli-1.1.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb6016e8b1fc0ff7e3835c0f8ee5d634
diff --git a/metadata/md5-cache/net-analyzer/openvas-libraries-4.0.5 b/metadata/md5-cache/net-analyzer/openvas-libraries-4.0.5
index e63e25757007..2c9739425fe9 100644
--- a/metadata/md5-cache/net-analyzer/openvas-libraries-4.0.5
+++ b/metadata/md5-cache/net-analyzer/openvas-libraries-4.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12 net-libs/gnutls net-libs/libpcap app-crypt/gpgme !net-analyzer/openvas-libnasl
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/872/openvas-libraries-4.0.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5be4a6825ca09234da2f8c6dd076bda7
diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-2.0.4 b/metadata/md5-cache/net-analyzer/openvas-manager-2.0.4
index 2411600879af..8049e29fc233 100644
--- a/metadata/md5-cache/net-analyzer/openvas-manager-2.0.4
+++ b/metadata/md5-cache/net-analyzer/openvas-manager-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4 >=dev-db/sqlite-3
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/871/openvas-manager-2.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0835e1eb1bf519daca4156e2205ef4f
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-3.2.4 b/metadata/md5-cache/net-analyzer/openvas-scanner-3.2.4
index 62caf0b60944..76d9adf45a21 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-3.2.4
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-3.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-4 !net-analyzer/openvas-plugins !net-analyzer/openvas-server
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/873/openvas-scanner-3.2.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ca95e58124b3fa6288c9207b6afbdf1
diff --git a/metadata/md5-cache/net-analyzer/pinger-0.32d b/metadata/md5-cache/net-analyzer/pinger-0.32d
index c91687d2649b..c63d3dc76f39 100644
--- a/metadata/md5-cache/net-analyzer/pinger-0.32d
+++ b/metadata/md5-cache/net-analyzer/pinger-0.32d
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( >=x11-libs/gtk+-2.4:2 ) sys-libs/ncurses
 SLOT=0
 SRC_URI=http://aa.vslib.cz/silk/projekty/pinger/download/pinger-0.32d.tar.gz mirror://gentoo/gtk-2.0-for-pinger.m4.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8322944e8794a76ee53b2db863e85d4
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
index 8b66504b258d..15b988d9f6cc 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=450c6f3e0eae7fc591bc1702a50d40b5
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
index 080507a8d4bf..e5f1230f44b4 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41206e8d55c9ea1a76bf6b787c53087b
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7
index c29a5f7ff8c6..6fc38ab91f99 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.7
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.5.10 >=dev-libs/libxml2-2.7.8 >=x11-libs/cairo-1.10.2[svg] >=dev-libs/glib-2.28.7 >=x11-libs/pango-1.28 lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) dbi? ( dev-db/libdbi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4da098a7a19da2d9ef60ea64f52d648
diff --git a/metadata/md5-cache/net-analyzer/scli-0.2.12 b/metadata/md5-cache/net-analyzer/scli-0.2.12
index dca94fa5affd..4033d357480a 100644
--- a/metadata/md5-cache/net-analyzer/scli-0.2.12
+++ b/metadata/md5-cache/net-analyzer/scli-0.2.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/glib-1.2* >=sys-libs/ncurses-5 >=sys-libs/readline-4 dev-libs/libxml2 sys-libs/zlib debug? ( dev-libs/dmalloc )
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/scli/scli-0.2.12.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e703dbd82ba9e9aff79111c5daeacd29
diff --git a/metadata/md5-cache/net-analyzer/scli-0.4.0 b/metadata/md5-cache/net-analyzer/scli-0.4.0
index f4f788af678b..b8b303bf42ac 100644
--- a/metadata/md5-cache/net-analyzer/scli-0.4.0
+++ b/metadata/md5-cache/net-analyzer/scli-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 net-libs/gnet net-libs/gsnmp sys-libs/ncurses sys-libs/readline sys-libs/zlib debug? ( dev-libs/dmalloc )
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/scli/scli-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0138e615de7de1a110cdb4cf62620bb
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.24 b/metadata/md5-cache/net-analyzer/sflowtool-3.24
index c5b93936b4e3..145e9c6f7679 100644
--- a/metadata/md5-cache/net-analyzer/sflowtool-3.24
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.24
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ppc x86
 LICENSE=inmon-sflow
 SLOT=0
 SRC_URI=http://www.inmon.com/bin/sflowtool-3.24.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a75aa0b5e1c94d79ebd141546169ce51
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.25 b/metadata/md5-cache/net-analyzer/sflowtool-3.25
index e028be52f810..1a32d025672e 100644
--- a/metadata/md5-cache/net-analyzer/sflowtool-3.25
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.25
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=inmon-sflow
 SLOT=0
 SRC_URI=http://www.inmon.com/bin/sflowtool-3.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5a7c3e6705a105125413a84de153e68
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.26 b/metadata/md5-cache/net-analyzer/sflowtool-3.26
index 7b18a0b5093f..8026d29e427b 100644
--- a/metadata/md5-cache/net-analyzer/sflowtool-3.26
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.26
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=inmon-sflow
 SLOT=0
 SRC_URI=http://www.inmon.com/bin/sflowtool-3.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88f97e87f2b37e9d809fa6cd291cbd44
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-3.9.8 b/metadata/md5-cache/net-analyzer/tcpdump-3.9.8
index 316e69ca5635..15d6251f3952 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-3.9.8
+++ b/metadata/md5-cache/net-analyzer/tcpdump-3.9.8
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-3.9.8.tar.gz http://www.jp.tcpdump.org/release/tcpdump-3.9.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1efa93944061ca13f718a6438b8d7380
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-3.9.8-r1 b/metadata/md5-cache/net-analyzer/tcpdump-3.9.8-r1
index 30458a20ee67..d6429d293e5b 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-3.9.8-r1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-3.9.8-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-3.9.8.tar.gz http://www.jp.tcpdump.org/release/tcpdump-3.9.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62c6269003e12a0883e08dbad0d98b0b
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.1.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.1.1
index 77f922db321a..3d6253111b37 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.1.1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0136584f54180c2b90346825dc1d2211
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.2.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.2.0
index d05ba1118160..7deb00c6e527 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.2.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.2.0.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.2.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c54fdf4971a6277a25dbb9cf0b2ed239
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.2.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.2.1
index aa10b02c02a0..e1b2ffba5231 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.2.1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.2.1.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75a348e14fced5fdfd557660644a7e7c
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.3.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
index bb18af221524..d52fbba6576e 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.3.0.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcb318b45f9c288a473009408f654d13
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
index f4e28bab43b5..85d037d5bb65 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ca81e0953c169e6b5c29827ab2bd0a0
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7
index 21f0d9455019..e31a80ca010c 100644
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0de498b05ad43ec61c0637364191ba72
diff --git a/metadata/md5-cache/net-analyzer/tcptraceroute-1.4-r3 b/metadata/md5-cache/net-analyzer/tcptraceroute-1.4-r3
index fb1df1d784d4..9ce0894f7201 100644
--- a/metadata/md5-cache/net-analyzer/tcptraceroute-1.4-r3
+++ b/metadata/md5-cache/net-analyzer/tcptraceroute-1.4-r3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap <net-libs/libnet-1.1 >=net-libs/libnet-1.0.2a-r3
 SLOT=0
 SRC_URI=http://michael.toren.net/code/tcptraceroute/tcptraceroute-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffbbcc52388233cd1c5980311f41d6de
diff --git a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r1 b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r1
index 6b476f0499de..71f8a782db61 100644
--- a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r1
+++ b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet
 SLOT=0
 SRC_URI=http://michael.toren.net/code/tcptraceroute/tcptraceroute-1.5beta7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f18cb18a75bbe512a87dbc274983245
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.0.18 b/metadata/md5-cache/net-analyzer/traceroute-2.0.18
index 66c7132d9e31..b05ff3de1b18 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.0.18
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.0.18
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.0.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8e3b4b96e7aaf2594a78ab8b607c117
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.6.8 b/metadata/md5-cache/net-analyzer/wireshark-1.6.8
index 791350d13170..ede8f8ce4eb0 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.6.8
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.6.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk x11-misc/xdg-utils ) ssl? ( <net-libs/gnutls-3 ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.6.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=519d7ca120bf5b003c2b87f2fa7b4d1d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-1.8.11-r2 b/metadata/md5-cache/net-analyzer/zabbix-1.8.11-r2
index 881a6a06c845..5ea934ba76ba 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-1.8.11-r2
+++ b/metadata/md5-cache/net-analyzer/zabbix-1.8.11-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.11.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=c9c5cc8ca6d59af67a13fb961b2cb423
diff --git a/metadata/md5-cache/net-analyzer/zabbix-1.8.13-r1 b/metadata/md5-cache/net-analyzer/zabbix-1.8.13-r1
index 8b155077f394..4e60ad2f3df0 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-1.8.13-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-1.8.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=14e8aec79c1229ff6172c6d675a1d7f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.0-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.0.0-r1
index 4d641a7b85c3..fe71939f7381 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.0-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls] media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=af25097fec5693ce0a8070b695170d71
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.1_rc2 b/metadata/md5-cache/net-analyzer/zabbix-2.0.1_rc2
index 9c4fdca1a95a..f83f954c742f 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.1_rc2
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.1_rc2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls] media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1rc2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=595299e42ae195ab47d2c53d66206bc3
diff --git a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r5 b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r5
index a60f883db354..fb7192d7580f 100644
--- a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r5
+++ b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils virtual/mta
 SLOT=0
 SRC_URI=http://www.capisuite.de/capisuite-0.4.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e525fcd6f65e86417406dd060b565a9c
diff --git a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6 b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
index 98d0a42119bd..a7cc7e9a1a81 100644
--- a/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
+++ b/metadata/md5-cache/net-dialup/capisuite-0.4.5-r6
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python media-sound/sox >=media-libs/tiff-3.7.1 media-gfx/jpeg2ps media-gfx/sfftobmp app-text/ghostscript-gpl net-dialup/capi4k-utils virtual/mta
 SLOT=0
 SRC_URI=http://www.capisuite.de/capisuite-0.4.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a772f969e1253c1553b8adc63d715ae3
diff --git a/metadata/md5-cache/net-dialup/cutecom-0.20.0-r1 b/metadata/md5-cache/net-dialup/cutecom-0.20.0-r1
index e79e8f14fa09..f3347d2627d8 100644
--- a/metadata/md5-cache/net-dialup/cutecom-0.20.0-r1
+++ b/metadata/md5-cache/net-dialup/cutecom-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 net-dialup/lrzsz
 SLOT=0
 SRC_URI=http://cutecom.sourceforge.net/cutecom-0.20.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b68d4b5951127e34192ec4b1385fbf4
diff --git a/metadata/md5-cache/net-dialup/cutecom-0.22.0 b/metadata/md5-cache/net-dialup/cutecom-0.22.0
index efc73d33f65a..733d0e74c6a2 100644
--- a/metadata/md5-cache/net-dialup/cutecom-0.22.0
+++ b/metadata/md5-cache/net-dialup/cutecom-0.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 net-dialup/lrzsz
 SLOT=0
 SRC_URI=http://cutecom.sourceforge.net/cutecom-0.22.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e912f34d576c1155109c31edbf728794
diff --git a/metadata/md5-cache/net-dialup/diald-1.0-r2 b/metadata/md5-cache/net-dialup/diald-1.0-r2
index bfde64fd1a83..ff7b2b35f5ea 100644
--- a/metadata/md5-cache/net-dialup/diald-1.0-r2
+++ b/metadata/md5-cache/net-dialup/diald-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) sys-apps/tcp-wrappers net-dialup/ppp
 SLOT=0
 SRC_URI=mirror://sourceforge/diald/diald-1.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12b72203dea8a559c5999334227adf2f
diff --git a/metadata/md5-cache/net-dialup/freeradius-2.1.11 b/metadata/md5-cache/net-dialup/freeradius-2.1.11
index 78f4accf47da..dbbd967e2827 100644
--- a/metadata/md5-cache/net-dialup/freeradius-2.1.11
+++ b/metadata/md5-cache/net-dialup/freeradius-2.1.11
@@ -10,5 +10,5 @@ RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-li
 REQUIRED_USE=frxp? ( threads )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.11.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ed1b0fee2b027c4380d27414db68aa7
diff --git a/metadata/md5-cache/net-dialup/freeradius-2.1.12 b/metadata/md5-cache/net-dialup/freeradius-2.1.12
index bb803eb488b7..e37f9503b264 100644
--- a/metadata/md5-cache/net-dialup/freeradius-2.1.12
+++ b/metadata/md5-cache/net-dialup/freeradius-2.1.12
@@ -10,5 +10,5 @@ RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-li
 REQUIRED_USE=frxp? ( threads )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.12.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9fccb887fa911e501203d264a6f2cb03
diff --git a/metadata/md5-cache/net-dialup/gnuradius-1.5 b/metadata/md5-cache/net-dialup/gnuradius-1.5
index 1b4ffcff7e61..181d87aba4ef 100644
--- a/metadata/md5-cache/net-dialup/gnuradius-1.5
+++ b/metadata/md5-cache/net-dialup/gnuradius-1.5
@@ -9,5 +9,5 @@ RDEPEND=!net-dialup/freeradius !net-dialup/cistronradius guile? ( >=dev-scheme/g
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/radius/radius-1.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd6fcb67e32fe2f40b837ac4e7e8de8d
diff --git a/metadata/md5-cache/net-dialup/gnuradius-1.6.1 b/metadata/md5-cache/net-dialup/gnuradius-1.6.1
index d6390b0a073d..8ef6377a575c 100644
--- a/metadata/md5-cache/net-dialup/gnuradius-1.6.1
+++ b/metadata/md5-cache/net-dialup/gnuradius-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=!net-dialup/freeradius !net-dialup/cistronradius guile? ( >=dev-scheme/g
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/radius/radius-1.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73bae3d56e4f8120a753745fd07c3940
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.4.1-r2 b/metadata/md5-cache/net-dialup/linux-atm-2.4.1-r2
index 720a02748a81..c438a605c9a3 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.4.1-r2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.4.1-r2
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.4.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84d3025188d54b1108b6758822f605e0
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.0 b/metadata/md5-cache/net-dialup/linux-atm-2.5.0
index fe8743c31e17..bfeba2b4afb7 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.0
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.0
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83fd56d3f6ddc0f8b000c16562829178
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
index 23fc71f94055..ec15a6f8b044 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f66dc6b960dc5b57c14fb1f9c609f16
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.1.36-r3 b/metadata/md5-cache/net-dialup/mgetty-1.1.36-r3
index 55e6ede50c38..8152ab81d633 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.1.36-r3
+++ b/metadata/md5-cache/net-dialup/mgetty-1.1.36-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/latex-base virtual/texi2dvi ) >=sys-apps/sed-4 sys-apps/gawk sys-apps/groff dev-lang/perl sys-apps/texinfo fax? ( !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty1.1.36-Jun15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=837dfbae4625062581a7b6e0f464e0e3
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.4-r25 b/metadata/md5-cache/net-dialup/ppp-2.4.4-r25
index 28d56e36eb67..0a9fd7cd8a88 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.4-r25
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.4-r25
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=activefilter? ( >=net-libs/libpcap-0.9.4 ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( >=x11-libs/gtk+-2.8:2 ) eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz mirror://gentoo/ppp-2.4.4-gentoo-20091116.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b62f7e0189f3f08ef3d9b2c0849eef9
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.5-r1 b/metadata/md5-cache/net-dialup/ppp-2.4.5-r1
index dfecd5858019..b575a76fd65f 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.5-r1
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz mirror://gentoo/ppp-2.4.5-gentoo-20101127.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9b5e20b16ac23fd9b4f1eb864ae5be8
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.5-r2 b/metadata/md5-cache/net-dialup/ppp-2.4.5-r2
index 84e9b99ccd53..c98f0ed2dc52 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.5-r2
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.5-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz http://dev.gentoo.org/~flameeyes/qa-copies/ppp-2.4.5-gentoo-20111111.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d73d43992b1b1daf64e7a8600790c6ed
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4 b/metadata/md5-cache/net-dialup/pptpd-1.3.4
index 07f08f468b56..8456771591fc 100644
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4
+++ b/metadata/md5-cache/net-dialup/pptpd-1.3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70dd74b3ff4e9029b66370c5944566ce
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1 b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1
index cfda2546284f..379ff421d3b3 100644
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1
+++ b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d020a7f353c671091268d09e9011cd6f
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1 b/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
index 67b32ca63ca6..4dfc8c550791 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp X? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.10.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f311298cdcd58716f8ad839ae5a3b038
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2 b/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
index 54854dde1046..8e9b66fb0695 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.8-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp X? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.roaringpenguin.com/penguin/pppoe/rp-pppoe-3.8.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=661dcc34e76acf9fda1987894b82b731
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.2.4 b/metadata/md5-cache/net-dialup/xl2tpd-1.2.4
index ad00b7ef4c71..3652cd301d66 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.2.4
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-dialup/ppp
 SLOT=0
 SRC_URI=ftp://ftp.xelerance.com/xl2tpd/xl2tpd-1.2.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eac9ee5ddb193d34f7504d3e02529a0b
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.30-r1 b/metadata/md5-cache/net-dns/avahi-0.6.30-r1
index 4346370d8bf6..e05c80100893 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.30-r1
+++ b/metadata/md5-cache/net-dns/avahi-0.6.30-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.30.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a17637d9e89034c0b1dca0565dc4474
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.30-r3 b/metadata/md5-cache/net-dns/avahi-0.6.30-r3
index 14b769e91bfd..b9f5fc2ad370 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.30-r3
+++ b/metadata/md5-cache/net-dns/avahi-0.6.30-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.30.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50adedf892203bc4f1cf028d4a2d835e
diff --git a/metadata/md5-cache/net-dns/bind-9.8.1_p1 b/metadata/md5-cache/net-dns/bind-9.8.1_p1
index fc642c041542..dcd8cc62cd0f 100644
--- a/metadata/md5-cache/net-dns/bind-9.8.1_p1
+++ b/metadata/md5-cache/net-dns/bind-9.8.1_p1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.8.1-P1/bind-9.8.1-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.8.0-P1-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c01c8d5592ca73c2181af5d4c65a7d25
diff --git a/metadata/md5-cache/net-dns/bind-9.8.3_p1 b/metadata/md5-cache/net-dns/bind-9.8.3_p1
index ce0df08417f2..2b90f6b00d9b 100644
--- a/metadata/md5-cache/net-dns/bind-9.8.3_p1
+++ b/metadata/md5-cache/net-dns/bind-9.8.3_p1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.8.3-P1/bind-9.8.3-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.8.3-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd84735ea35090ca9bfcf6e09222e153
diff --git a/metadata/md5-cache/net-dns/bind-9.9.1_p1 b/metadata/md5-cache/net-dns/bind-9.9.1_p1
index c755954c0918..410cb3e9c1c2 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.1_p1
+++ b/metadata/md5-cache/net-dns/bind-9.9.1_p1
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc?
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.1-P1/bind-9.9.1-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.9.1-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8703b42130f3eadc83cba515fcb72714
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.8.1 b/metadata/md5-cache/net-dns/bind-tools-9.8.1
index b5f625af2154..11137f42c6e4 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.8.1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.8.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.8.1/bind-9.8.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c9aef7f74b75d39271503bdd3dedd23
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.8.3_p1 b/metadata/md5-cache/net-dns/bind-tools-9.8.3_p1
index d2196d8abea2..05831dbb2d96 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.8.3_p1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.8.3_p1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.8.3-P1/bind-9.8.3-P1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfaecd8de2e26b0bf4b3def0c1303e6a
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p1 b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p1
index 814617449b1c..582647e1be3f 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.9.1_p1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.9.1_p1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.1-P1/bind-9.9.1-P1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=671bc6c7e7482b46d11c4e9cd558db67
diff --git a/metadata/md5-cache/net-dns/cagibi-0.1.1 b/metadata/md5-cache/net-dns/cagibi-0.1.1
index d1d4220a947a..43e9d43347c4 100644
--- a/metadata/md5-cache/net-dns/cagibi-0.1.1
+++ b/metadata/md5-cache/net-dns/cagibi-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-dbus:4
 SLOT=0
 SRC_URI=mirror://kde/stable/cagibi/cagibi-0.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c04e64bd31d36af72827199f12db9aae
diff --git a/metadata/md5-cache/net-dns/cagibi-0.2.0 b/metadata/md5-cache/net-dns/cagibi-0.2.0
index 42e01fe34b94..98b633afcbc8 100644
--- a/metadata/md5-cache/net-dns/cagibi-0.2.0
+++ b/metadata/md5-cache/net-dns/cagibi-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-dbus:4
 SLOT=0
 SRC_URI=mirror://kde/stable/cagibi/cagibi-0.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e099fd9f986223b435ffa5886662cb9
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r23 b/metadata/md5-cache/net-dns/djbdns-1.05-r23
index c09cd65b3164..cf53714cc0cd 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r23
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r23
@@ -7,5 +7,5 @@ LICENSE=public-domain
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp doc? ( app-doc/djbdns-man ) selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test23.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05616372be92631a22e85d445eb8aa01
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r24 b/metadata/md5-cache/net-dns/djbdns-1.05-r24
index 7f94284926b2..7dbb9e2179df 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r24
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r24
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp doc? ( app-doc/djbdns-man ) selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test23.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f03d9ec0b13fff4802e01f8fb8c849fb
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r25 b/metadata/md5-cache/net-dns/djbdns-1.05-r25
index c3912b7c594a..1526e1eb694c 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r25
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r25
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp doc? ( app-doc/djbdns-man ) selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test23.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0986c447e7e76c4ba9175eb7541644d3
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r26 b/metadata/md5-cache/net-dns/djbdns-1.05-r26
index adc8765bc0af..5e3180914dc2 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r26
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r26
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp doc? ( app-doc/djbdns-man ) selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test23.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9c7216699c1aa46e0cb8c91a99cc21d7
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.57 b/metadata/md5-cache/net-dns/dnsmasq-2.57
index abc33e69a7e9..e8f5b715a03f 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.57
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.57
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext net-dns/libidn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.57.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9e2c601cff16b7ab77182354978bb90
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.57-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.57-r1
index 64200baaec38..021bc9555c5a 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.57-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.57-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext net-dns/libidn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.57.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4193ef9ef5c84395e674cade1f3b1dd3
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.59 b/metadata/md5-cache/net-dns/dnsmasq-2.59
index a43f2e6451ab..ee324dae4ec7 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.59
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.59
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.59.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=368a914faad0e7c66281eaacfb122452
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.60 b/metadata/md5-cache/net-dns/dnsmasq-2.60
index c0774b9c60b4..e994a99e1819 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.60
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.60
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) co
 REQUIRED_USE=lua? ( script )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.60.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d9bc0d1a28d37b65e944416da270bd5
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.61 b/metadata/md5-cache/net-dns/dnsmasq-2.61
index 111fcb50a62e..c092b6adddff 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.61
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.61
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) co
 REQUIRED_USE=lua? ( script )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.61.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f18fa58fa85c93d53d8433fd58394d35
diff --git a/metadata/md5-cache/net-dns/dnssec-check-1.12.3 b/metadata/md5-cache/net-dns/dnssec-check-1.12.3-r1
similarity index 76%
rename from metadata/md5-cache/net-dns/dnssec-check-1.12.3
rename to metadata/md5-cache/net-dns/dnssec-check-1.12.3-r1
index ec8c29ddbd42..408fcb45db01 100644
--- a/metadata/md5-cache/net-dns/dnssec-check-1.12.3
+++ b/metadata/md5-cache/net-dns/dnssec-check-1.12.3-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-dns/dnssec-tools x11-libs/qt-declarative:4
+DEPEND=net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
 DESCRIPTION=tests local resolver for support of DNSSEC validation
 EAPI=4
 HOMEPAGE=http://www.dnssec-tools.org
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-dns/dnssec-tools x11-libs/qt-declarative:4
+RDEPEND=net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
 SLOT=0
 SRC_URI=http://www.dnssec-tools.org/download/dnssec-check-1.12.3.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d292e7bb8cb76ca7f26454341b43c63
+_md5_=06e04e8f6e0ff413e80c358efbc4cb3b
diff --git a/metadata/md5-cache/net-dns/dnssec-check-1.13 b/metadata/md5-cache/net-dns/dnssec-check-1.13
new file mode 100644
index 000000000000..de0aae257d0d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-check-1.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=net-dns/dnssec-validator[threads] x11-libs/qt-declarative:4
+DESCRIPTION=tests local resolver for support of DNSSEC validation
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-dns/dnssec-validator[threads] x11-libs/qt-declarative:4
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/dnssec-check-1.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aa6cf8ca691afa9354c483ea3b983e33
diff --git a/metadata/md5-cache/net-dns/dnssec-lookup-1.13 b/metadata/md5-cache/net-dns/dnssec-lookup-1.13
new file mode 100644
index 000000000000..0bb6486ae77b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-lookup-1.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=net-dns/dnssec-validator[threads] x11-libs/qt-gui
+DESCRIPTION=DNS lookup utility that supports DNSSEC validation
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=net-dns/dnssec-validator[threads] x11-libs/qt-gui
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/lookup-1.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c44f50e17ef26aa45c1dc5cef1f300f6
diff --git a/metadata/md5-cache/net-dns/dnssec-nodes-1.12 b/metadata/md5-cache/net-dns/dnssec-nodes-1.12-r1
similarity index 82%
rename from metadata/md5-cache/net-dns/dnssec-nodes-1.12
rename to metadata/md5-cache/net-dns/dnssec-nodes-1.12-r1
index 8426a4ac4641..142fb7194928 100644
--- a/metadata/md5-cache/net-dns/dnssec-nodes-1.12
+++ b/metadata/md5-cache/net-dns/dnssec-nodes-1.12-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-dns/dnssec-tools
+DEPEND=net-dns/dnssec-tools[threads]
 DESCRIPTION=graphically depicts the DNSSEC results from a lookup from logfiles
 EAPI=4
 HOMEPAGE=http://www.dnssec-tools.org
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-dns/dnssec-tools
+RDEPEND=net-dns/dnssec-tools[threads]
 SLOT=0
 SRC_URI=http://www.dnssec-tools.org/download/dnssec-nodes-1.12.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7df981984df87849731372956c44eb1e
+_md5_=0428a5308587391b3f1160b353172b3c
diff --git a/metadata/md5-cache/net-dns/dnssec-nodes-1.13 b/metadata/md5-cache/net-dns/dnssec-nodes-1.13
new file mode 100644
index 000000000000..55318b14ca8f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-nodes-1.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=net-dns/dnssec-validator[threads]
+DESCRIPTION=graphically depicts the DNSSEC results from a lookup via logfiles
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-dns/dnssec-validator[threads]
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/dnssec-nodes-1.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b08bfa8bd40d558c40704bbf77c3a90f
diff --git a/metadata/md5-cache/net-dns/dnssec-system-tray-1.13 b/metadata/md5-cache/net-dns/dnssec-system-tray-1.13
new file mode 100644
index 000000000000..68ae2a30f2e1
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-system-tray-1.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/qt-gui
+DESCRIPTION=display DNSSEC resolver logs in system tray
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=x11-libs/qt-gui
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/dnssec-system-tray-1.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c8705740cb0b663946f83d947d2ec1f3
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-1.13 b/metadata/md5-cache/net-dns/dnssec-tools-1.13
new file mode 100644
index 000000000000..6f53db78d1bd
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-tools-1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=dev-lang/perl dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/XML-Simple
+DESCRIPTION=tools to ease the deployment of DNSSEC related technologies
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/perl dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/XML-Simple
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/dnssec-tools-1.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4fb53986bac9203d8aea5722533a67b1
diff --git a/metadata/md5-cache/net-dns/dnssec-validator-1.13 b/metadata/md5-cache/net-dns/dnssec-validator-1.13
new file mode 100644
index 000000000000..32d3b06d7cf9
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-validator-1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13 !net-dns/dnsval
+DESCRIPTION=DNSSEC validator (dnsval)
+EAPI=4
+HOMEPAGE=http://www.dnssec-tools.org/
+IUSE=ipv6 static-libs +threads
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13 !net-dns/dnsval
+SLOT=0
+SRC_URI=http://www.dnssec-tools.org/download/dnsval-1.13.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f4df4069b601d3b5948f2b52891bd5e3
diff --git a/metadata/md5-cache/net-dns/hesinfo-3.1.0 b/metadata/md5-cache/net-dns/hesinfo-3.1.0
index deb0481f3285..0de075808248 100644
--- a/metadata/md5-cache/net-dns/hesinfo-3.1.0
+++ b/metadata/md5-cache/net-dns/hesinfo-3.1.0
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=>=net-dns/hesiod-3.1.0
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-3.1.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d43bf8a211fe01cf0b8d78da56a5e8a3
diff --git a/metadata/md5-cache/net-dns/hesiod-3.0.2-r2 b/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
index bd0326bb9fd6..3c8d9833acac 100644
--- a/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
+++ b/metadata/md5-cache/net-dns/hesiod-3.0.2-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.0.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cddfa5a76b804e347cd956fd56b2df2c
diff --git a/metadata/md5-cache/net-dns/hesiod-3.1.0 b/metadata/md5-cache/net-dns/hesiod-3.1.0
index fe38a4712ece..23d183e5b25a 100644
--- a/metadata/md5-cache/net-dns/hesiod-3.1.0
+++ b/metadata/md5-cache/net-dns/hesiod-3.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd
 LICENSE=ISC
 SLOT=0
 SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.1.0.tar.gz mirror://gentoo/hesiod-3.1.0-patches.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f05f93f0f3a41e32ff02491934657820
diff --git a/metadata/md5-cache/net-dns/maradns-2.0.06 b/metadata/md5-cache/net-dns/maradns-2.0.06
index d8d846775001..c15b1b8cba77 100644
--- a/metadata/md5-cache/net-dns/maradns-2.0.06
+++ b/metadata/md5-cache/net-dns/maradns-2.0.06
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~mips
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.maradns.org/download/2.0/2.0.06/maradns-2.0.06.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e3b58c3a004accabd3b072c88236a32
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-3.1.7.2 b/metadata/md5-cache/net-dns/pdns-recursor-3.1.7.2
index 93c3bf7bc88e..122f422962c2 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-3.1.7.2
+++ b/metadata/md5-cache/net-dns/pdns-recursor-3.1.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( >=dev-lang/lua-5.1 ) !<net-dns/pdns-2.9.20-r1
 SLOT=0
 SRC_URI=http://downloads.powerdns.com/releases/pdns-recursor-3.1.7.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f18379fe89865d00feec817aeb43fb1b
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-3.2 b/metadata/md5-cache/net-dns/pdns-recursor-3.2
index b4b6c4d92b54..a3a4708d7501 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-3.2
+++ b/metadata/md5-cache/net-dns/pdns-recursor-3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( >=dev-lang/lua-5.1 ) !<net-dns/pdns-2.9.20-r1
 SLOT=0
 SRC_URI=http://downloads.powerdns.com/releases/pdns-recursor-3.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbe864e5a873510cc49c4a4950cfc7b4
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-3.3 b/metadata/md5-cache/net-dns/pdns-recursor-3.3
index c7f3408aefc5..5c95b23f8c56 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-3.3
+++ b/metadata/md5-cache/net-dns/pdns-recursor-3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( >=dev-lang/lua-5.1 ) !<net-dns/pdns-2.9.20-r1
 SLOT=0
 SRC_URI=http://downloads.powerdns.com/releases/pdns-recursor-3.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbb7ba5579ebcce97fff4d7e67f146ba
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.13_p2 b/metadata/md5-cache/net-dns/unbound-1.4.13_p2
index b273f3a7f9ee..6deda1eeced7 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.13_p2
+++ b/metadata/md5-cache/net-dns/unbound-1.4.13_p2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.5[ssl,gost?] net-dns/dnssec-root python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.13p2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ad3c343f7c2947d16f712d04ae451eb
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.14 b/metadata/md5-cache/net-dns/unbound-1.4.14
index 93e43c9a516a..86bb8a0ef62b 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.14
+++ b/metadata/md5-cache/net-dns/unbound-1.4.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.5[ssl,gost?] net-dns/dnssec-root python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae100b4521b3552f50d023c238455477
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.15 b/metadata/md5-cache/net-dns/unbound-1.4.15
index 1c56d39637ed..1a54edc49784 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.15
+++ b/metadata/md5-cache/net-dns/unbound-1.4.15
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.5[ssl,gost?] net-dns/dnssec-root python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13595116b710f55f7d2468d30be61a6d
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.16 b/metadata/md5-cache/net-dns/unbound-1.4.16
index 82a5e2790cdb..db15bb1b25bf 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.16
+++ b/metadata/md5-cache/net-dns/unbound-1.4.16
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.5[ssl,gost?] selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9655ff33d0a3b5cc8b4b9a216f2e34d8
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.10.2 b/metadata/md5-cache/net-firewall/ebtables-2.0.10.2
index 6d184331def5..0ffe6837efec 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.10.2
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.10.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ebtables/ebtables-v2.0.10-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0200db6626c7481a28e08b7cbb77a6b5
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.10.4 b/metadata/md5-cache/net-firewall/ebtables-2.0.10.4
index 8afb0f4a0293..4621246adb8f 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.10.4
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.10.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ebtables/ebtables-v2.0.10-4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=977f6e488b10ee344a487bae3faed3c7
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r1 b/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r1
index 9d2e88f6a79b..bb69d32b4d64 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r1
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ebtables/ebtables-v2.0.9-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64deb3585ce6bcd4fa39b639a62f7adc
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r2 b/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r2
index 9f0c8921ff56..451c4d160d1a 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r2
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.9.2-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ebtables/ebtables-v2.0.9-2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=56c2562ad770b262215b976ac2e2f68a
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3 b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
index 0bb5484c58a3..4b642ea99bf5 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!sparc? ( >=sys-kernel/linux-headers-2.6 ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74caa566f101ae518d1b50408cabeb4d
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1 b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
index 4ea09330a78a..cc9c3acb8714 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=211aa75f7bda012eb9f5894d286c9b50
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
index 2d05226661d0..68ba67a3af95 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline ) selinux? ( sys-libs/libselinux sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5295a3512841b7e810e2f63ab98b4882
diff --git a/metadata/md5-cache/net-firewall/itval-1.1 b/metadata/md5-cache/net-firewall/itval-1.1
index 4261ca32bc93..7b3df86179cd 100644
--- a/metadata/md5-cache/net-firewall/itval-1.1
+++ b/metadata/md5-cache/net-firewall/itval-1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/itval/ITVal-1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=297814ea271377cb97191f9a77d03e77
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.21 b/metadata/md5-cache/net-firewall/nufw-2.2.21
index 42c2976710ee..932421b5a92b 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.21
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.21
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy
 SLOT=0
 SRC_URI=http://www.nufw.org/download/nufw/nufw-2.2.21.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e63a65ab4e1f1f5b2f4dfe0642a3895f
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22 b/metadata/md5-cache/net-firewall/nufw-2.2.22
index 4c6127dd1c23..17bf960cd3a1 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libgcrypt >=dev-libs/cyrus-sasl-2 net-firewall/iptables >=net-libs/gnutls-1.1 ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql-server ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) nfconntrack? ( net-libs/libnetfilter_conntrack ) prelude? ( dev-libs/libprelude ) dev-python/ipy
 SLOT=0
 SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77c0bee4f0412ee03a52cae6a819a1a8
diff --git a/metadata/md5-cache/net-firewall/pftop-0.5 b/metadata/md5-cache/net-firewall/pftop-0.5
index f23a8e868122..89493324709c 100644
--- a/metadata/md5-cache/net-firewall/pftop-0.5
+++ b/metadata/md5-cache/net-firewall/pftop-0.5
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.eee.metu.edu.tr/~canacar/pftop-0.5.tar.gz
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00388d61a842e86049cbaebe39a29d3e
diff --git a/metadata/md5-cache/net-firewall/pftop-0.7 b/metadata/md5-cache/net-firewall/pftop-0.7
index 72d474f3b7fe..8fc7ae4fbdaa 100644
--- a/metadata/md5-cache/net-firewall/pftop-0.7
+++ b/metadata/md5-cache/net-firewall/pftop-0.7
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.eee.metu.edu.tr/~canacar/pftop-0.7.tar.gz mirror://gentoo/pftop-0.7-patches-1.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57794fd5993a9e1fa9ee54d80f1abe15
diff --git a/metadata/md5-cache/net-firewall/pftop-0.7-r1 b/metadata/md5-cache/net-firewall/pftop-0.7-r1
index 3791388b0704..c8db57dd5567 100644
--- a/metadata/md5-cache/net-firewall/pftop-0.7-r1
+++ b/metadata/md5-cache/net-firewall/pftop-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.eee.metu.edu.tr/~canacar/pftop-0.7.tar.gz mirror://gentoo/pftop-0.7-patches-2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0140711cb7241907f404c56d0a9eec4f
diff --git a/metadata/md5-cache/net-firewall/shapecfg-36 b/metadata/md5-cache/net-firewall/shapecfg-36
index 71fe92aff835..cd76fc7c3dad 100644
--- a/metadata/md5-cache/net-firewall/shapecfg-36
+++ b/metadata/md5-cache/net-firewall/shapecfg-36
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/shaper.36.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f27f940e94cb5037f8f04423b34e854d
diff --git a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r2 b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r2
index f92f9471e22f..037b25b5cc52 100644
--- a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r2
+++ b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) pam? ( virtual/pam ) php? ( || ( dev-lang/php virtual/httpd-php ) )
 SLOT=0
 SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f56fffc5706ba60c5d6dd2efcea88bf0
diff --git a/metadata/md5-cache/net-fs/netatalk-2.0.5-r1 b/metadata/md5-cache/net-fs/netatalk-2.0.5-r1
index c8dc3d67619b..79b0124620e3 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.0.5-r1
+++ b/metadata/md5-cache/net-fs/netatalk-2.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/db-4.2.52 cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) cups? ( net-print/cups ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/netatalk-2.0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2a0617208eb06c084933b25b26347d3
diff --git a/metadata/md5-cache/net-fs/netatalk-2.2.1-r3 b/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
index 7f371816fedc..d2d85d09c4bc 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
+++ b/metadata/md5-cache/net-fs/netatalk-2.2.1-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/netatalk-2.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac410236c08b30cd85bdea1e2f760ed4
diff --git a/metadata/md5-cache/net-fs/netatalk-2.2.2 b/metadata/md5-cache/net-fs/netatalk-2.2.2
index 8c52e2d5a76a..b72556f20b54 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.2.2
+++ b/metadata/md5-cache/net-fs/netatalk-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/netatalk-2.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5b82fb7c1dc3da98d40058b4e5e3dfb
diff --git a/metadata/md5-cache/net-fs/netatalk-2.2.3 b/metadata/md5-cache/net-fs/netatalk-2.2.3
index 7933b45c3275..2c43a0d4428e 100644
--- a/metadata/md5-cache/net-fs/netatalk-2.2.3
+++ b/metadata/md5-cache/net-fs/netatalk-2.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=ldap? ( acl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netatalk/2.2.3/netatalk-2.2.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=108d78a8ec37d3eb5a9c0cdc45d7b2c1
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.1.4-r1 b/metadata/md5-cache/net-fs/nfs-utils-1.1.4-r1
index b946225e72f3..9af0238c8381 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.1.4-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) sys-libs/e2fsprogs-libs >=net-nds/portmap-5b-r6 !nonfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0be389bbe9a7ad01e2ccd0bd60319179
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.1.5 b/metadata/md5-cache/net-fs/nfs-utils-1.1.5
index eb7a013a51d5..44e092aa7c8e 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.1.5
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) sys-libs/e2fsprogs-libs >=net-nds/portmap-5b-r6 !nonfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=add346457191390f2cba794aba0600c0
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.1.6-r1 b/metadata/md5-cache/net-fs/nfs-utils-1.1.6-r1
index b211e0ac0432..32e3c9baec14 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.1.6-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.1.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) sys-libs/e2fsprogs-libs !net-nds/portmap net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue app-crypt/mit-krb5 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.1.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee1b00bcec9b08895cc4aa52e74cccc2
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.0 b/metadata/md5-cache/net-fs/nfs-utils-1.2.0
index 25f322959e13..bdf6dda89746 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.0
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue app-crypt/mit-krb5 ) ) !net-nds/portmap
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4de7c2ca091847287a307c454481131b
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.1 b/metadata/md5-cache/net-fs/nfs-utils-1.2.1
index 9e427c4825ce..dedd1ae7363f 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.1
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) !net-nds/portmap
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d222873c448ab2e65ed8f27d91620fc1
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2 b/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
index f63e111e08a5..e7b7cca31f9c 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a23cf5969ff9f769aaf9e6574361dd0b
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.3 b/metadata/md5-cache/net-fs/nfs-utils-1.2.3
index 5e4107abd598..9e2d73302df5 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.3
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73d43449f7826e8202b48d28de51d106
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.3-r1 b/metadata/md5-cache/net-fs/nfs-utils-1.2.3-r1
index de20f0ee7c5a..be963ad224b5 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.3-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27a2087642f52af191a8e7ef3561dd61
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.4 b/metadata/md5-cache/net-fs/nfs-utils-1.2.4
index e39a54a246d8..3a14166a5f3e 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.4
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=685dca1f8fb1b96d296e5efe94513004
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.5 b/metadata/md5-cache/net-fs/nfs-utils-1.2.5
index d995cc56d1a3..c2f63fb349b1 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.5
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ac55531572610e0f199511a3014cfc2
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.6 b/metadata/md5-cache/net-fs/nfs-utils-1.2.6
index fa46227330fe..edbc07767071 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.2.6
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a5a5aed519422abcac71fd39dda270d
diff --git a/metadata/md5-cache/net-fs/openafs-1.4.14-r1 b/metadata/md5-cache/net-fs/openafs-1.4.14-r1
index 0c11a870b8a5..bd30ec3aa3fa 100644
--- a/metadata/md5-cache/net-fs/openafs-1.4.14-r1
+++ b/metadata/md5-cache/net-fs/openafs-1.4.14-r1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2 sun-rpc
 RDEPEND=~net-fs/openafs-kernel-1.4.14 pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/1.4.14/openafs-1.4.14-src.tar.bz2 http://openafs.org/dl/1.4.14/openafs-1.4.14-doc.tar.bz2 mirror://gentoo/openafs-1.4.14-patches-2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=437209495ac93776fdad3c8c34f547cf
diff --git a/metadata/md5-cache/net-fs/openafs-1.4.14.1 b/metadata/md5-cache/net-fs/openafs-1.4.14.1
index d67bbf9702a8..77edb91013c6 100644
--- a/metadata/md5-cache/net-fs/openafs-1.4.14.1
+++ b/metadata/md5-cache/net-fs/openafs-1.4.14.1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2 sun-rpc
 RDEPEND=~net-fs/openafs-kernel-1.4.14.1 pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/1.4.14.1/openafs-1.4.14.1-src.tar.bz2 http://openafs.org/dl/1.4.14.1/openafs-1.4.14.1-doc.tar.bz2 mirror://gentoo/openafs-1.4.14.1-patches-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ceac42833b8941a9e77579bbc9ec0f0b
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.0 b/metadata/md5-cache/net-fs/openafs-1.6.0
index 4642cc74e6cb..a1288888aa24 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.0
+++ b/metadata/md5-cache/net-fs/openafs-1.6.0
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2 sun-rpc
 RDEPEND=~net-fs/openafs-kernel-1.6.0 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2 http://openafs.org/dl/openafs/1.6.0/openafs-1.6.0-doc.tar.bz2 mirror://gentoo/openafs-1.6.0-patches-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee852e3e55430a487480b69aeb9d6ef0
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.1 b/metadata/md5-cache/net-fs/openafs-1.6.1
index 10b1d49f2ee1..e9aa00a54297 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.1
+++ b/metadata/md5-cache/net-fs/openafs-1.6.1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2 sun-rpc
 RDEPEND=~net-fs/openafs-kernel-1.6.1 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2 http://openafs.org/dl/openafs/1.6.1/openafs-1.6.1-doc.tar.bz2 mirror://gentoo/openafs-1.6.1-patches-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=984a90da9cf6b11947fe38ce4892f2fa
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.1_pre1 b/metadata/md5-cache/net-fs/openafs-1.6.1_pre1
index 1b7c4dcadf48..ec044cc78bdd 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.1_pre1
+++ b/metadata/md5-cache/net-fs/openafs-1.6.1_pre1
@@ -9,5 +9,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2 sun-rpc
 RDEPEND=~net-fs/openafs-kernel-1.6.1_pre1 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 SLOT=0
 SRC_URI=http://openafs.org/dl/candidate/1.6.1pre1/openafs-1.6.1pre1-src.tar.bz2 http://openafs.org/dl/candidate/1.6.1pre1/openafs-1.6.1pre1-doc.tar.bz2 mirror://gentoo/openafs-1.6.1_pre1-patches-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71e22250bc4e4b75842c00fcb29a807e
diff --git a/metadata/md5-cache/net-fs/samba-3.5.14 b/metadata/md5-cache/net-fs/samba-3.5.14
index 6abf2b6f231e..3d631c3522c9 100644
--- a/metadata/md5-cache/net-fs/samba-3.5.14
+++ b/metadata/md5-cache/net-fs/samba-3.5.14
@@ -11,5 +11,5 @@ REQUIRED_USE=ads? ( ldap ) swat? ( server )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/samba-3.5.14.tar.gz http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18c835090addae0c6c0ce817c7ccb9c4
diff --git a/metadata/md5-cache/net-fs/samba-3.5.15 b/metadata/md5-cache/net-fs/samba-3.5.15
index f46e37d9ca5a..7499e194c396 100644
--- a/metadata/md5-cache/net-fs/samba-3.5.15
+++ b/metadata/md5-cache/net-fs/samba-3.5.15
@@ -11,5 +11,5 @@ REQUIRED_USE=ads? ( ldap ) swat? ( server )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/samba-3.5.15.tar.gz http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11d5cdb8d4982d8affd57b838ebc8336
diff --git a/metadata/md5-cache/net-fs/samba-3.6.5 b/metadata/md5-cache/net-fs/samba-3.6.5
index 54034f36800b..93a10af35a29 100644
--- a/metadata/md5-cache/net-fs/samba-3.6.5
+++ b/metadata/md5-cache/net-fs/samba-3.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=ads? ( ldap ) swat? ( server )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/samba-3.6.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13c55c493251611631e283179ac67a3f
diff --git a/metadata/md5-cache/net-fs/smbtad-1.2.3 b/metadata/md5-cache/net-fs/smbtad-1.2.3
index 77faba2bd4be..4efefa63721a 100644
--- a/metadata/md5-cache/net-fs/smbtad-1.2.3
+++ b/metadata/md5-cache/net-fs/smbtad-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-fs/samba[smbtav2]
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtad-1.2.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8177e381466bb017d865ba2172df4c7b
diff --git a/metadata/md5-cache/net-fs/smbtad-1.2.4 b/metadata/md5-cache/net-fs/smbtad-1.2.4
index 0ce0ae548547..9c8c538a5ab0 100644
--- a/metadata/md5-cache/net-fs/smbtad-1.2.4
+++ b/metadata/md5-cache/net-fs/smbtad-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-fs/samba[smbtav2]
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtad-1.2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08eff4e1baebd26e1a3ebb4631af621f
diff --git a/metadata/md5-cache/net-fs/smbtad-1.2.5 b/metadata/md5-cache/net-fs/smbtad-1.2.5
index dc48ecbb2ae3..ec8c31217888 100644
--- a/metadata/md5-cache/net-fs/smbtad-1.2.5
+++ b/metadata/md5-cache/net-fs/smbtad-1.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=( || ( <net-fs/samba-3.6[smbtav2] >=net-fs/samba-3.6 ) )
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtad-1.2.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b78c8db0ffef5982954a8c10bf6e05c6
diff --git a/metadata/md5-cache/net-fs/smbtatools-1.2.3 b/metadata/md5-cache/net-fs/smbtatools-1.2.3
index 56e94eb801eb..d56e5ec21e23 100644
--- a/metadata/md5-cache/net-fs/smbtatools-1.2.3
+++ b/metadata/md5-cache/net-fs/smbtatools-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-fs/smbtad
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtatools-1.2.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8aad987ce207494f0912e329e7ae9e57
diff --git a/metadata/md5-cache/net-fs/smbtatools-1.2.4 b/metadata/md5-cache/net-fs/smbtatools-1.2.4
index 171a3b3b9f27..ddf68fa1ebce 100644
--- a/metadata/md5-cache/net-fs/smbtatools-1.2.4
+++ b/metadata/md5-cache/net-fs/smbtatools-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-fs/smbtad-1.2.4
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtatools-1.2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5012125dde3b85bddbc64deefc38b324
diff --git a/metadata/md5-cache/net-fs/smbtatools-1.2.5 b/metadata/md5-cache/net-fs/smbtatools-1.2.5
index bc9521b6f389..0c2378ffe2cb 100644
--- a/metadata/md5-cache/net-fs/smbtatools-1.2.5
+++ b/metadata/md5-cache/net-fs/smbtatools-1.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-fs/smbtad
 SLOT=0
 SRC_URI=http://morelias.org/smbta/smbtatools-1.2.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc5ff2f52ac160a886cd767c7a42b79c
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7-r1 b/metadata/md5-cache/net-ftp/atftp-0.7-r1
index db47e31a4d76..e30d4c27af13 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.7-r1
+++ b/metadata/md5-cache/net-ftp/atftp-0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-tftp ) readline? ( sys-libs/readline ) pcre? ( dev-libs/libpcre ) !net-ftp/netkit-tftp !net-ftp/tftp-hpa
 SLOT=0
 SRC_URI=ftp://ftp.mamalinux.com/pub/atftp/atftp-0.7.tar.gz mirror://debian/pool/main/a/atftp/atftp_0.7-11.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5bbc53b278c2ba486a3d85e6b78579f
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7-r2 b/metadata/md5-cache/net-ftp/atftp-0.7-r2
index 8d9b42ee3695..4e73a748b438 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.7-r2
+++ b/metadata/md5-cache/net-ftp/atftp-0.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-tftp ) readline? ( sys-libs/readline ) pcre? ( dev-libs/libpcre ) !net-ftp/netkit-tftp !net-ftp/tftp-hpa
 SLOT=0
 SRC_URI=ftp://ftp.mamalinux.com/pub/atftp/atftp-0.7.tar.gz mirror://debian/pool/main/a/atftp/atftp_0.7-11.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=614e814d270199a0a7a98fad65f63aea
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.5.1 b/metadata/md5-cache/net-ftp/filezilla-3.5.1
index db70a53b9b64..c95bdfef47ef 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.5.1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.5.1_src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=f6d4e476809e0d32c814fda6fe119ac9
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.5.2 b/metadata/md5-cache/net-ftp/filezilla-3.5.2
index 6ff837f97e06..f89fe111c433 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.5.2
+++ b/metadata/md5-cache/net-ftp/filezilla-3.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.5.2_src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=e0d88dcbc9a456a39eb2b775537bd4c5
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.5.3 b/metadata/md5-cache/net-ftp/filezilla-3.5.3
index c2d5d868cf66..2f8a602e0625 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.5.3
+++ b/metadata/md5-cache/net-ftp/filezilla-3.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.5.3_src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1bd10eeb45399d4f6eff8d51ea19e979
diff --git a/metadata/md5-cache/net-ftp/ftp-0.17-r7 b/metadata/md5-cache/net-ftp/ftp-0.17-r7
index e74970512c51..23dfcac1d1d3 100644
--- a/metadata/md5-cache/net-ftp/ftp-0.17-r7
+++ b/metadata/md5-cache/net-ftp/ftp-0.17-r7
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=sys-libs/ncurses-5.2 ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-0.17.tar.gz mirror://gentoo/netkit-ftp-0.17-patches-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c67369c75a3ddb20d7064cb204497c4d
diff --git a/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1 b/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
index d8ffbc4a03db..73a9cf652e85 100644
--- a/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
+++ b/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=sys-libs/ncurses-5.2 readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/netkit-ftp-0.17.tar.gz mirror://debian/pool/main/n/netkit-ftp-ssl/netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz mirror://gentoo/netkit-ftp-0.17-patches-2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a8dee90a446736bf2768cc13cc07003
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.00 b/metadata/md5-cache/net-ftp/ftpbase-0.00
index 75f5afc40663..b5b3c401e45f 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.00
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.00
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=pam? ( || ( virtual/pam sys-libs/pam ) ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42c4e5b7d5264fad18d9013bf8166317
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01 b/metadata/md5-cache/net-ftp/ftpbase-0.01
index d5f3e8e925f3..dcf596f66426 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 RDEPEND=pam? ( || ( virtual/pam sys-libs/pam ) ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70a80d57d47620c8b61f668b667b16cc
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r1 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r1
index 3b8494e40e98..e8fc250d26d9 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r1
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e51edce6f387ceae06be678f11117ac
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r2 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r2
index d5f1bffb0b4c..e91677bce1d9 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r2
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd7c29bd5b912d0e3b266f9ad5260b81
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.4.99 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.4.99
index b16e431bf54d..b2a25201a186 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.4.99
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1bdc4334bf1fb2c03554065957a7f65f
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.0 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.0
index d1c68c7e9c2c..ab92f6cbe228 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.0
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f36572562db41ab393a3655eecd0c69
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.60 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.60
index fe1bd2da7fba..57b4b08757c7 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.60
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5d807d04af4402c1136e0cb069db8519
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.65 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.65
index 2d1e0432c529..6592e7f6959f 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.65
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ad2b7dc67219cd7fe28028491a67ff22
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.70 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.70
index 39240a2365ca..e2fcc5c7bfb9 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.70
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5d5d6a0261523b07ce4e1b2ccc6e55a
diff --git a/metadata/md5-cache/net-ftp/leechcraft-lcftp-9999 b/metadata/md5-cache/net-ftp/leechcraft-lcftp-9999
index 9ff926155eb6..5e0e0ad86703 100644
--- a/metadata/md5-cache/net-ftp/leechcraft-lcftp-9999
+++ b/metadata/md5-cache/net-ftp/leechcraft-lcftp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 >=net-misc/curl-7.19.4 virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91ec0641c5a36594a7998b8f701aea19
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.29-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.29-r1
index 72783b411a6c..0ce712a390fd 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.29-r1
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.29-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.29.tar.bz2
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0adb109170fac14e512093d221e5ee79
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.32-r2 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.32-r2
index ba15338ab58f..e2b0c554179e 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.32-r2
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.32-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.32.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.32.tar.bz2
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1577398c01ceff6691ba02e684148865
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
index 48bef593cf8c..f3e390e20505 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.bz2
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2173957ffbb7d8364aeb1a5ce96e758
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
index 3891e6e53eb3..7b5ef3b6e912 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.36.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.36.tar.bz2
-_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb5b7d03215da2a736809c3209b7cf81
diff --git a/metadata/md5-cache/net-im/choqok-1.3 b/metadata/md5-cache/net-im/choqok-1.3
index d3f53d2bc66b..5d5548680629 100644
--- a/metadata/md5-cache/net-im/choqok-1.3
+++ b/metadata/md5-cache/net-im/choqok-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/qjson >=dev-libs/qoauth-1.0.1 ayatana? ( dev-libs/libindicate-qt ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sq(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/choqok/choqok-1.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6206e0b31f3da8e299ef778fe4d0b008
diff --git a/metadata/md5-cache/net-im/ejabberd-2.1.10 b/metadata/md5-cache/net-im/ejabberd-2.1.10
index f226e5522ffc..31c4b1c86b05 100644
--- a/metadata/md5-cache/net-im/ejabberd-2.1.10
+++ b/metadata/md5-cache/net-im/ejabberd-2.1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-lang/erlang-12.2.5[ssl] odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib ) >=sys-apps/shadow-4.1.4.2-r3 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/2.1.10/ejabberd-2.1.10.tar.gz mod_statsdx? ( mirror://gentoo/ejabberd-mod_statsdx-1080.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd15ca38499d93fbf1dd611734479609
diff --git a/metadata/md5-cache/net-im/ejabberd-2.1.11 b/metadata/md5-cache/net-im/ejabberd-2.1.11
index 3c6151284b37..b9d826f11dad 100644
--- a/metadata/md5-cache/net-im/ejabberd-2.1.11
+++ b/metadata/md5-cache/net-im/ejabberd-2.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 >=dev-lang/erlang-12.2.5[ssl] odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) >=dev-libs/openssl-0.9.8e captcha? ( media-gfx/imagemagick[truetype,png] ) zlib? ( sys-libs/zlib ) >=sys-apps/shadow-4.1.4.2-r3 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://www.process-one.net/downloads/ejabberd/2.1.11/ejabberd-2.1.11.tgz mod_statsdx? ( mirror://gentoo/ejabberd-mod_statsdx-1080.patch.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad6f8486cc93855ea9d6dc847d323b1a
diff --git a/metadata/md5-cache/net-im/jabberd2-2.2.1 b/metadata/md5-cache/net-im/jabberd2-2.2.1
index 3655c015acb7..44dba01ac49d 100644
--- a/metadata/md5-cache/net-im/jabberd2-2.2.1
+++ b/metadata/md5-cache/net-im/jabberd2-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/udns >=net-dns/libidn-0.3 virtual/gsasl berkdb? ( >=sys-libs/db-4.1.24 ) mysql? ( virtual/mysql ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6b ) sqlite? ( >=dev-db/sqlite-3 ) zlib? ( sys-libs/zlib ) >=net-im/jabber-base-0.01 !net-im/jabberd
 SLOT=0
 SRC_URI=http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.1.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69b8f53b63afd0d5e28f63a1242106c6
diff --git a/metadata/md5-cache/net-im/jabberd2-2.2.4 b/metadata/md5-cache/net-im/jabberd2-2.2.4
index 3b977fdc5d7e..82ee42a34c1c 100644
--- a/metadata/md5-cache/net-im/jabberd2-2.2.4
+++ b/metadata/md5-cache/net-im/jabberd2-2.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/udns >=net-dns/libidn-0.3 virtual/gsasl berkdb? ( >=sys-libs/db-4.1.25 ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-2.1.0 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6b ) sqlite? ( >=dev-db/sqlite-3 ) zlib? ( sys-libs/zlib ) >=net-im/jabber-base-0.01 !net-im/jabberd
 SLOT=0
 SRC_URI=http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.4.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=615a4d12123c8a3a2868bc494e5e837e
diff --git a/metadata/md5-cache/net-im/jabberd2-2.2.5 b/metadata/md5-cache/net-im/jabberd2-2.2.5
index 3710debbbeca..cba6f405b2e7 100644
--- a/metadata/md5-cache/net-im/jabberd2-2.2.5
+++ b/metadata/md5-cache/net-im/jabberd2-2.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/udns >=net-dns/libidn-0.3 virtual/gsasl berkdb? ( >=sys-libs/db-4.1.25 ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-2.1.0 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6b ) sqlite? ( >=dev-db/sqlite-3 ) zlib? ( sys-libs/zlib ) >=net-im/jabber-base-0.01 !net-im/jabberd
 SLOT=0
 SRC_URI=http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.5.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a4100cad9c4ddb3a878968ad002d8e3
diff --git a/metadata/md5-cache/net-im/jabberd2-2.2.8 b/metadata/md5-cache/net-im/jabberd2-2.2.8
index 6af419162f1e..d133b1fbda60 100644
--- a/metadata/md5-cache/net-im/jabberd2-2.2.8
+++ b/metadata/md5-cache/net-im/jabberd2-2.2.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/udns >=net-dns/libidn-0.3 virtual/gsasl berkdb? ( >=sys-libs/db-4.1.25 ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-2.1.0 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6b ) sqlite? ( >=dev-db/sqlite-3 ) zlib? ( sys-libs/zlib ) >=net-im/jabber-base-0.01 !net-im/jabberd
 SLOT=0
 SRC_URI=http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.8.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d8f8957827b9f37164f67d8f18d3c86
diff --git a/metadata/md5-cache/net-im/kadu-0.11.3 b/metadata/md5-cache/net-im/kadu-0.11.3
index c3adc29175bd..430cf176b8ac 100644
--- a/metadata/md5-cache/net-im/kadu-0.11.3
+++ b/metadata/md5-cache/net-im/kadu-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/qca-2.0.0-r2 x11-libs/libX11 x11-libs/libXfixes x11-libs/lib
 REQUIRED_USE=|| ( gadu xmpp )
 SLOT=0
 SRC_URI=http://download.kadu.im/stable/kadu-0.11.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ae30775dcb636a5c459cf55da1ed516
diff --git a/metadata/md5-cache/net-im/kmess-2.0.6-r3 b/metadata/md5-cache/net-im/kmess-2.0.6-r3
index 260ea8ddcff0..989a00556351 100644
--- a/metadata/md5-cache/net-im/kmess-2.0.6-r3
+++ b/metadata/md5-cache/net-im/kmess-2.0.6-r3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt g
 RESTRICT=test
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/kmess-2.0.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=28fb42d36db7d53b96a411d1deee4584
diff --git a/metadata/md5-cache/net-im/kmess-2.0.6.2 b/metadata/md5-cache/net-im/kmess-2.0.6.2
index b43430918f2d..6b42bbb74e39 100644
--- a/metadata/md5-cache/net-im/kmess-2.0.6.2
+++ b/metadata/md5-cache/net-im/kmess-2.0.6.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt g
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/kmess/Latest%20versions/2.0.6.2/kmess-2.0.6.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=64fae73c145579cdb0be8dc76a5f327a
diff --git a/metadata/md5-cache/net-im/kmess-2.0.9999 b/metadata/md5-cache/net-im/kmess-2.0.9999
index 0e8630e660e9..8ae3b99a4bd8 100644
--- a/metadata/md5-cache/net-im/kmess-2.0.9999
+++ b/metadata/md5-cache/net-im/kmess-2.0.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt gif? ( media-libs/giflib ) konqueror? ( >=kde-base/libkonq-4.4:4[aqua=] ) libnotify? ( >=kde-base/knotify-4.4:4[aqua=] ) xscreensaver? ( x11-libs/libXScrnSaver ) !net-im/kmess:0 konqueror? ( >=kde-base/konqueror-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=088d86d8219100895bd9ff065780c3dc
diff --git a/metadata/md5-cache/net-im/kmess-9999 b/metadata/md5-cache/net-im/kmess-9999
index 73e6e69b24a3..80669774403e 100644
--- a/metadata/md5-cache/net-im/kmess-9999
+++ b/metadata/md5-cache/net-im/kmess-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt gif? ( media-libs/giflib ) konqueror? ( >=kde-base/libkonq-4.4:4[aqua=] ) libnotify? ( >=kde-base/knotify-4.4:4[aqua=] ) xscreensaver? ( x11-libs/libXScrnSaver ) !net-im/kmess:0 konqueror? ( >=kde-base/konqueror-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2fe07ad8a219a3510fa06736e6ca4dde
diff --git a/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.0 b/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.0
index ab58eaae3d84..2ac2363a2cc5 100644
--- a/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 net-im/telepathy-mission-control net-libs/telepathy-glib >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mai(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-accounts-kcm-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cef6dbcdfc264ab135389c56c8cb904e
diff --git a/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.1 b/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.1
index dd0cd91ea5bc..e34d5680caa6 100644
--- a/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-accounts-kcm-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 net-im/telepathy-mission-control net-libs/telepathy-glib >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-accounts-kcm-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8981aaf64421da224b2da5623a34d62e
diff --git a/metadata/md5-cache/net-im/ktp-approver-0.3.0 b/metadata/md5-cache/net-im/ktp-approver-0.3.0
index 36a666c113c0..a7a06a8e99d3 100644
--- a/metadata/md5-cache/net-im/ktp-approver-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-approver-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-approver-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aaedeee9bbe70884f354809b8ff3996c
diff --git a/metadata/md5-cache/net-im/ktp-approver-0.3.1 b/metadata/md5-cache/net-im/ktp-approver-0.3.1
index 3115fdf72efd..fb79d054bc66 100644
--- a/metadata/md5-cache/net-im/ktp-approver-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-approver-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.1 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-approver-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=04e83321589ca2034cac70e9fb3ff28e
diff --git a/metadata/md5-cache/net-im/ktp-auth-handler-0.3.0 b/metadata/md5-cache/net-im/ktp-auth-handler-0.3.0
index a05e7e25554f..8289e0b13127 100644
--- a/metadata/md5-cache/net-im/ktp-auth-handler-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-auth-handler-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-auth-handler-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e17c491fb21a2ad0cf0f365fd9df68a6
diff --git a/metadata/md5-cache/net-im/ktp-auth-handler-0.3.1 b/metadata/md5-cache/net-im/ktp-auth-handler-0.3.1
index dc1cd1420a58..c8afcb3d37ba 100644
--- a/metadata/md5-cache/net-im/ktp-auth-handler-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-auth-handler-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-auth-handler-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7655d64ee4dc2197c5e12b47a2ae2dda
diff --git a/metadata/md5-cache/net-im/ktp-common-internals-0.3.0 b/metadata/md5-cache/net-im/ktp-common-internals-0.3.0
index da053759d7b2..f2d425a85c0f 100644
--- a/metadata/md5-cache/net-im/ktp-common-internals-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-common-internals-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-common-internals-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7f72f9c97cd1850f648b3c7b7154ddac
diff --git a/metadata/md5-cache/net-im/ktp-common-internals-0.3.1 b/metadata/md5-cache/net-im/ktp-common-internals-0.3.1
index 0d0e47e91e26..207227bd0aaf 100644
--- a/metadata/md5-cache/net-im/ktp-common-internals-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-common-internals-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-common-internals-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6293fac5ec6f8cdb17e5203e38319811
diff --git a/metadata/md5-cache/net-im/ktp-contact-applet-0.3.0-r1 b/metadata/md5-cache/net-im/ktp-contact-applet-0.3.0-r1
index 8cc9db21fb09..32347c981c86 100644
--- a/metadata/md5-cache/net-im/ktp-contact-applet-0.3.0-r1
+++ b/metadata/md5-cache/net-im/ktp-contact-applet-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-contact-applet-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=704fba5cd4539866d1e6a4ac4ea49cd9
diff --git a/metadata/md5-cache/net-im/ktp-contact-applet-0.3.1 b/metadata/md5-cache/net-im/ktp-contact-applet-0.3.1
index 1f1cc2d80908..5776b0e77798 100644
--- a/metadata/md5-cache/net-im/ktp-contact-applet-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-contact-applet-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.1 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-contact-applet-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8a8967c65a839e7d4a903ac55c266631
diff --git a/metadata/md5-cache/net-im/ktp-contact-list-0.3.0 b/metadata/md5-cache/net-im/ktp-contact-list-0.3.0
index 787c79c9e60a..1a2078bd9e8e 100644
--- a/metadata/md5-cache/net-im/ktp-contact-list-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-contact-list-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-accounts-kcm-0.3.0 >=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-contact-list-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5d41abd8beba578703c4611219545060
diff --git a/metadata/md5-cache/net-im/ktp-contact-list-0.3.1 b/metadata/md5-cache/net-im/ktp-contact-list-0.3.1
index 9a3d0dde4820..37406515ea7a 100644
--- a/metadata/md5-cache/net-im/ktp-contact-list-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-contact-list-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-accounts-kcm-0.3.1 >=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-contact-list-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f5c01ad2249a47fb9900cbc0eb950398
diff --git a/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.0 b/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.0
index 2d5b9b8eb918..1bbedb37a1ac 100644
--- a/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-filetransfer-handler-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ff476bda9d224ffae9ed2da45b176cb1
diff --git a/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.1 b/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.1
index 8506829a7dc7..cc25756b132f 100644
--- a/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-filetransfer-handler-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-filetransfer-handler-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=6fd754065f935ed5b56f655965711d69
diff --git a/metadata/md5-cache/net-im/ktp-kded-module-0.3.0 b/metadata/md5-cache/net-im/ktp-kded-module-0.3.0
index 3c05b377fb62..4ce81e72f783 100644
--- a/metadata/md5-cache/net-im/ktp-kded-module-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-kded-module-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-kded-integration-module-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b8776bb0437eaa1435113855a0d4ada0
diff --git a/metadata/md5-cache/net-im/ktp-kded-module-0.3.1 b/metadata/md5-cache/net-im/ktp-kded-module-0.3.1
index 5116a5b35d30..b70c6f4ce030 100644
--- a/metadata/md5-cache/net-im/ktp-kded-module-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-kded-module-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-kded-integration-module-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f019187c4e1ca02a7bc4dd19279221c7
diff --git a/metadata/md5-cache/net-im/ktp-presence-applet-0.3.0-r1 b/metadata/md5-cache/net-im/ktp-presence-applet-0.3.0-r1
index 347eba15a720..8a60447ef70a 100644
--- a/metadata/md5-cache/net-im/ktp-presence-applet-0.3.0-r1
+++ b/metadata/md5-cache/net-im/ktp-presence-applet-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-presence-applet-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f03f3ef216bc83fb3da430a519d86331
diff --git a/metadata/md5-cache/net-im/ktp-presence-applet-0.3.1 b/metadata/md5-cache/net-im/ktp-presence-applet-0.3.1
index e9199a882d90..9f6f5d996bbe 100644
--- a/metadata/md5-cache/net-im/ktp-presence-applet-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-presence-applet-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.1 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-presence-applet-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1981102ffed0ffe89356329d920ad7dd
diff --git a/metadata/md5-cache/net-im/ktp-send-file-0.3.0 b/metadata/md5-cache/net-im/ktp-send-file-0.3.0
index de2b992dcc6e..615969790a64 100644
--- a/metadata/md5-cache/net-im/ktp-send-file-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-send-file-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.0 >=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.0 >=net-im/ktp-filetransfer-handler-0.3.0 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-send-file-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ac89fc870834f77da860cf7541ca5eaa
diff --git a/metadata/md5-cache/net-im/ktp-send-file-0.3.1 b/metadata/md5-cache/net-im/ktp-send-file-0.3.1
index b16d037c8832..ac0f78e02027 100644
--- a/metadata/md5-cache/net-im/ktp-send-file-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-send-file-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=net-im/ktp-common-internals-0.3.1 >=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.1 >=net-im/ktp-filetransfer-handler-0.3.1 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-send-file-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d64603e59527086035545334a2dceefe
diff --git a/metadata/md5-cache/net-im/ktp-text-ui-0.3.0 b/metadata/md5-cache/net-im/ktp-text-ui-0.3.0
index 125b327deecd..a887db7aecb0 100644
--- a/metadata/md5-cache/net-im/ktp-text-ui-0.3.0
+++ b/metadata/md5-cache/net-im/ktp-text-ui-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.0/src/ktp-text-ui-0.3.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=128bdcd6233230936fd120192485ec88
diff --git a/metadata/md5-cache/net-im/ktp-text-ui-0.3.1 b/metadata/md5-cache/net-im/ktp-text-ui-0.3.1
index 9d0077f11830..f9ed1cfd2483 100644
--- a/metadata/md5-cache/net-im/ktp-text-ui-0.3.1
+++ b/metadata/md5-cache/net-im/ktp-text-ui-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/telepathy-qt-0.9.0 >=net-im/ktp-contact-list-0.3.1 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/kde-telepathy/0.3.1/src/ktp-text-ui-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=47ee249c004098b045d52bed95abc0fa
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.4.99 b/metadata/md5-cache/net-im/leechcraft-azoth-0.4.99
index b0132ac309d9..771ecd2c46c3 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-0.4.99
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 x11-libs/qt-webkit x11-libs/qt-multimedia otroid? ( net-libs/libotr ) xoox? ( net-libs/qxmpp[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64453b1e481acecbd9c081bb5487707d
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.0 b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.0
index 29dbdcaa469b..add0921a4d7e 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.0
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) otroid? ( net-libs/libotr ) xoox? ( net-libs/qxmpp[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54322acd5c666cce159e3669d07ac223
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.60 b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.60
index ec1c375b95a4..c589a31447f6 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.60
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c52477d166397ff05cf9a481fd655e09
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.65 b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.65
index cf1f976d9f2a..61f831cb0d81 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.65
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38c53b5397b51140dc08f6f24d00e83f
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70 b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70
index 95bfaee3dbe3..d43304614370 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( >=net-libs/qxmpp-0.3.47[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8d0c7f5330303b5081df8dfc484ea29
diff --git a/metadata/md5-cache/net-im/leechcraft-azoth-9999 b/metadata/md5-cache/net-im/leechcraft-azoth-9999
index ee90700ebdd9..fc4a0f69ae9f 100644
--- a/metadata/md5-cache/net-im/leechcraft-azoth-9999
+++ b/metadata/md5-cache/net-im/leechcraft-azoth-9999
@@ -7,5 +7,5 @@ IUSE=debug astrality +acetamide +adiumstyles +autoidler +autopaste +chathistory
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-webkit x11-libs/qt-multimedia autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( x11-libs/qt-multimedia ) rosenthal? ( app-text/hunspell ) xoox? ( =net-libs/qxmpp-9999[extras] media-libs/speex ) xtazy? ( x11-libs/qt-dbus ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) zheet? ( net-libs/libmsn ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) modnok? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e77dabd9c1c9232af327a967ac06d75
diff --git a/metadata/md5-cache/net-im/licq-1.3.8-r1 b/metadata/md5-cache/net-im/licq-1.3.8-r1
index be1a389e5227..de54eb9d80cb 100644
--- a/metadata/md5-cache/net-im/licq-1.3.8-r1
+++ b/metadata/md5-cache/net-im/licq-1.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1 ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) ssl? ( >=dev-libs/openssl-0.9.5a ) qt4? ( x11-libs/qt-gui:4 ) xosd? ( x11-libs/xosd )
 SLOT=2
 SRC_URI=mirror://sourceforge/licq/licq-1.3.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc26b458d142e79c7aa01aa041697af4
diff --git a/metadata/md5-cache/net-im/licq-1.3.9 b/metadata/md5-cache/net-im/licq-1.3.9
index f67b4e6e06b2..59874734d7d3 100644
--- a/metadata/md5-cache/net-im/licq-1.3.9
+++ b/metadata/md5-cache/net-im/licq-1.3.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1 ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) ssl? ( >=dev-libs/openssl-0.9.5a ) qt4? ( x11-libs/qt-gui:4 ) xosd? ( x11-libs/xosd )
 SLOT=2
 SRC_URI=mirror://sourceforge/licq/licq-1.3.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01e7c35c32bb5a4fe640190233cad83a
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.0 b/metadata/md5-cache/net-im/mcabber-0.10.0
index 061efa87c671..87f55dcf31ad 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.0
+++ b/metadata/md5-cache/net-im/mcabber-0.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( net-libs/loudmouth[ssl] ) crypt? ( >=app-crypt/gpgme-1.0.0 ) >=net-libs/loudmouth-1.4.3 otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.10.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c25c10fb8169929f9cd4c990531e5f4d
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.0-r1 b/metadata/md5-cache/net-im/mcabber-0.10.0-r1
index 8083bec4e150..60932f0e0b08 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.0-r1
+++ b/metadata/md5-cache/net-im/mcabber-0.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.10.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad8673def04413d49c1758636da55c0d
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.1 b/metadata/md5-cache/net-im/mcabber-0.10.1
index eb9856a3156a..f4022fe16a96 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.1
+++ b/metadata/md5-cache/net-im/mcabber-0.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.10.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d84454eb77eff94799f3d0d012c2275e
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.1-r1 b/metadata/md5-cache/net-im/mcabber-0.10.1-r1
index 2e410818a216..aca6e9c47965 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.1-r1
+++ b/metadata/md5-cache/net-im/mcabber-0.10.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.10.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adcc9849a52a1ba1ea5bbb87dd896b56
diff --git a/metadata/md5-cache/net-im/mcabber-0.9.10 b/metadata/md5-cache/net-im/mcabber-0.9.10
index e3422934ae93..cd084c0dafba 100644
--- a/metadata/md5-cache/net-im/mcabber-0.9.10
+++ b/metadata/md5-cache/net-im/mcabber-0.9.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7-r1 ) crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-0.9.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9567540dde16ee6afbd1dbe93166856
diff --git a/metadata/md5-cache/net-im/minbif-1.0.1 b/metadata/md5-cache/net-im/minbif-1.0.1
index b7c9f2d50938..e665fef40a9c 100644
--- a/metadata/md5-cache/net-im/minbif-1.0.1
+++ b/metadata/md5-cache/net-im/minbif-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.6[gstreamer?] libcaca? ( media-libs/libcaca media-libs/imlib2 ) virtual/logger xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://symlink.me/attachments/download/39/minbif-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd694d71c425b3c710a865fa7fbb9ad2
diff --git a/metadata/md5-cache/net-im/minbif-1.0.3 b/metadata/md5-cache/net-im/minbif-1.0.3
index 2e55dceef4fc..072ee5394729 100644
--- a/metadata/md5-cache/net-im/minbif-1.0.3
+++ b/metadata/md5-cache/net-im/minbif-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.6 video? ( >=net-im/pidgin-2.6[gstreamer] net-libs/farsight2 ) libcaca? ( media-libs/libcaca media-libs/imlib2 ) imlib? ( media-libs/imlib2 ) pam? ( sys-libs/pam ) gnutls? ( net-libs/gnutls ) virtual/logger xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://symlink.me/attachments/download/50/minbif-1.0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f3892e82bf5ae77c06f21d482791520
diff --git a/metadata/md5-cache/net-im/minbif-1.0.4 b/metadata/md5-cache/net-im/minbif-1.0.4
index d6d3bd559c27..677ab3474653 100644
--- a/metadata/md5-cache/net-im/minbif-1.0.4
+++ b/metadata/md5-cache/net-im/minbif-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.6 video? ( >=net-im/pidgin-2.6[gstreamer] net-libs/farsight2 ) libcaca? ( media-libs/libcaca media-libs/imlib2 ) imlib? ( media-libs/imlib2 ) pam? ( sys-libs/pam ) gnutls? ( net-libs/gnutls ) virtual/logger xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://symlink.me/attachments/download/90/minbif-1.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b353896346900d9491da734f07afa56
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.4 b/metadata/md5-cache/net-im/pidgin-2.10.4
index 4a9c18ca90f3..f048ba20759f 100644
--- a/metadata/md5-cache/net-im/pidgin-2.10.4
+++ b/metadata/md5-cache/net-im/pidgin-2.10.4
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45791ba289169dda9f5796215166484e
diff --git a/metadata/md5-cache/net-im/qutecom-2.2_p20110210 b/metadata/md5-cache/net-im/qutecom-2.2_p20110210
index 49a1cb3e4b8a..420f4f518008 100644
--- a/metadata/md5-cache/net-im/qutecom-2.2_p20110210
+++ b/metadata/md5-cache/net-im/qutecom-2.2_p20110210
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-libs/glib dev-libs/openssl alsa? ( media-libs/alsa-lib ) media-libs/libsamplerate media-libs/libsndfile portaudio? ( media-libs/portaudio ) media-libs/speex net-im/pidgin[gnutls] net-libs/gnutls >=net-libs/libosip-3 >=net-libs/libeXosip-3 net-misc/curl virtual/ffmpeg x11-libs/libX11 x11-libs/qt-gui x11-libs/qt-svg x11-libs/qt-webkit xv? ( x11-libs/libXv )
 SLOT=0
 SRC_URI=mirror://gentoo/qutecom-2.2_p20110210.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09941e9ee12f2a2dd15cd2797f0ab145
diff --git a/metadata/md5-cache/net-im/qutim-0.3.1 b/metadata/md5-cache/net-im/qutim-0.3.1
index 10146e65c402..4bb8c6a92065 100644
--- a/metadata/md5-cache/net-im/qutim-0.3.1
+++ b/metadata/md5-cache/net-im/qutim-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libqxt >=x11-libs/qt-core-4.7.0:4[ssl?] >=x11-libs/qt-gui-4.7.0
 REQUIRED_USE=oscar? ( ssl )
 SLOT=0
 SRC_URI=http://www.qutim.org/downloads/qutim-0.3.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c308e85ec0558e7075e61dddd29f270
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.11 b/metadata/md5-cache/net-im/silc-server-1.1.11
index d1669f5fec1a..98c3750a73c6 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.11
+++ b/metadata/md5-cache/net-im/silc-server-1.1.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=739c86d8b24774baffb1b60e7bf39117
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.14 b/metadata/md5-cache/net-im/silc-server-1.1.14
index eff1b6b5a59e..a5890bf131d6 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.14
+++ b/metadata/md5-cache/net-im/silc-server-1.1.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.14.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cceaa16b0a1102bb7123389882a0018
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.2 b/metadata/md5-cache/net-im/silc-server-1.1.2
index 16685512cc2a..770cc6701cf5 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.2
+++ b/metadata/md5-cache/net-im/silc-server-1.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ebd43ced2a9e2df28ea0983d82018b1
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.6 b/metadata/md5-cache/net-im/silc-server-1.1.6
index 27c48f58df7d..55a782705a0a 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.6
+++ b/metadata/md5-cache/net-im/silc-server-1.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c3b252f1d3056c8cb135e6bf52a2382
diff --git a/metadata/md5-cache/net-im/silc-server-1.1.8 b/metadata/md5-cache/net-im/silc-server-1.1.8
index 9fc6a29eb4d4..801a45f97091 100644
--- a/metadata/md5-cache/net-im/silc-server-1.1.8
+++ b/metadata/md5-cache/net-im/silc-server-1.1.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<=net-im/silc-toolkit-0.9.12-r1 !<=net-im/silc-client-1.0.1
 SLOT=0
 SRC_URI=http://www.silcnet.org/download/server/sources/silc-server-1.1.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=411fb8fe7221001008cc817dc23fd4fd
diff --git a/metadata/md5-cache/net-im/vacuum-1.1.1 b/metadata/md5-cache/net-im/vacuum-1.1.1
index 7a17aa4d97d2..bd4ca4ff4dc2 100644
--- a/metadata/md5-cache/net-im/vacuum-1.1.1
+++ b/metadata/md5-cache/net-im/vacuum-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.5:4[ssl] >=x11-libs/qt-gui-4.5:4 >=dev-libs/openssl
 REQUIRED_USE=annotations? ( privatestorage ) avatars? ( vcard ) bookmarks? ( privatestorage ) captchaforms? ( dataforms ) commands? ( dataforms ) datastreamsmanager? ( dataforms ) filestreamsmanager? ( datastreamsmanager ) filetransfer? ( filestreamsmanager datastreamsmanager ) pepmanager? ( servicediscovery ) registration? ( dataforms ) remotecontrol? ( commands dataforms ) sessionnegotiation? ( dataforms )
 SLOT=0
 SRC_URI=http://vacuum-im.googlecode.com/files/vacuum-1.1.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a111b7bbf78ad1c7709125fd2e4c9b55
diff --git a/metadata/md5-cache/net-im/vacuum-1.1.2 b/metadata/md5-cache/net-im/vacuum-1.1.2
index c4c9b2e2c742..13360965c6e4 100644
--- a/metadata/md5-cache/net-im/vacuum-1.1.2
+++ b/metadata/md5-cache/net-im/vacuum-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.5:4[ssl] >=x11-libs/qt-gui-4.5:4 >=dev-libs/openssl
 REQUIRED_USE=annotations? ( privatestorage ) avatars? ( vcard ) bookmarks? ( privatestorage ) captchaforms? ( dataforms ) commands? ( dataforms ) datastreamsmanager? ( dataforms ) filestreamsmanager? ( datastreamsmanager ) filetransfer? ( filestreamsmanager datastreamsmanager ) pepmanager? ( servicediscovery ) registration? ( dataforms ) remotecontrol? ( commands dataforms ) sessionnegotiation? ( dataforms )
 SLOT=0
 SRC_URI=http://vacuum-im.googlecode.com/files/vacuum-1.1.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acf25507f3406293dcdae382046e4c1b
diff --git a/metadata/md5-cache/net-im/vacuum-9999 b/metadata/md5-cache/net-im/vacuum-9999
index ac9c6c1212e6..20d91c199b85 100644
--- a/metadata/md5-cache/net-im/vacuum-9999
+++ b/metadata/md5-cache/net-im/vacuum-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-core-4.5:4[ssl] >=x11-libs/qt-gui-4.5:4 >=dev-libs/openssl-0.9.8k adiummessagestyle? ( >=x11-libs/qt-webkit-4.5:4 ) net-dns/libidn x11-libs/libXScrnSaver sys-libs/zlib[minizip]
 REQUIRED_USE=annotations? ( privatestorage ) avatars? ( vcard ) bookmarks? ( privatestorage ) captchaforms? ( dataforms ) commands? ( dataforms ) datastreamsmanager? ( dataforms ) filestreamsmanager? ( datastreamsmanager ) filetransfer? ( filestreamsmanager datastreamsmanager ) pepmanager? ( servicediscovery ) registration? ( dataforms ) remotecontrol? ( commands dataforms ) sessionnegotiation? ( dataforms )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6f562247a5a8e7c25dec735c832a597
diff --git a/metadata/md5-cache/net-irc/asuka-1.2.1 b/metadata/md5-cache/net-irc/asuka-1.2.1
index 124c309c8857..e519e7d6a4d7 100644
--- a/metadata/md5-cache/net-irc/asuka-1.2.1
+++ b/metadata/md5-cache/net-irc/asuka-1.2.1
@@ -6,5 +6,5 @@ KEYWORDS=x86 sparc
 LICENSE=GPL-1
 SLOT=0
 SRC_URI=http://dev-com.quakenet.org/releases/asuka/1.2.1/asuka-1.2.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4aa3e86e71a64fd69f5f6669f021cf6a
diff --git a/metadata/md5-cache/net-irc/atheme-services-6.0.10 b/metadata/md5-cache/net-irc/atheme-services-6.0.10
index 08a57250faae..9644d0353f30 100644
--- a/metadata/md5-cache/net-irc/atheme-services-6.0.10
+++ b/metadata/md5-cache/net-irc/atheme-services-6.0.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://atheme.net/downloads/atheme-services-6.0.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d387c06fd8e1a830b7112820ffbcefed
diff --git a/metadata/md5-cache/net-irc/atheme-services-6.0.11 b/metadata/md5-cache/net-irc/atheme-services-6.0.11
index 26627600e791..8be16f249386 100644
--- a/metadata/md5-cache/net-irc/atheme-services-6.0.11
+++ b/metadata/md5-cache/net-irc/atheme-services-6.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://atheme.net/downloads/atheme-services-6.0.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=160ed0c198568413cea1b961085237d8
diff --git a/metadata/md5-cache/net-irc/atheme-services-7.0.1 b/metadata/md5-cache/net-irc/atheme-services-7.0.1
index d7c8177fa974..09aa89e57f11 100644
--- a/metadata/md5-cache/net-irc/atheme-services-7.0.1
+++ b/metadata/md5-cache/net-irc/atheme-services-7.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://atheme.net/downloads/atheme-services-7.0.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e38a218ac29c4f88338f9e77273bf6e
diff --git a/metadata/md5-cache/net-irc/atheme-services-7.0.2 b/metadata/md5-cache/net-irc/atheme-services-7.0.2
index 7a155b4ac2cb..0f5ad746f28e 100644
--- a/metadata/md5-cache/net-irc/atheme-services-7.0.2
+++ b/metadata/md5-cache/net-irc/atheme-services-7.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://atheme.net/downloads/atheme-services-7.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f5181f8c533b9e5c96aca3fb7efd8fb
diff --git a/metadata/md5-cache/net-irc/atheme-services-9999 b/metadata/md5-cache/net-irc/atheme-services-9999
index 556e6d52d76a..6347dfd631c7 100644
--- a/metadata/md5-cache/net-irc/atheme-services-9999
+++ b/metadata/md5-cache/net-irc/atheme-services-9999
@@ -7,5 +7,5 @@ IUSE=cracklib largenet ldap nls +pcre perl profile ssl
 LICENSE=BSD
 RDEPEND==dev-libs/libmowgli-9999:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3864d56200accd96525e6745b418b927
diff --git a/metadata/md5-cache/net-irc/bitchx-1.1-r4 b/metadata/md5-cache/net-irc/bitchx-1.1-r4
index 40cdbc12d2b2..396fc9e646ab 100644
--- a/metadata/md5-cache/net-irc/bitchx-1.1-r4
+++ b/metadata/md5-cache/net-irc/bitchx-1.1-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.1 ssl? ( >=dev-libs/openssl-0.9.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bitchx/ircii-pana/ircii-pana-1.1/ircii-pana-1.1-final.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51d5f8dede010fc3556c9f325c529ce3
diff --git a/metadata/md5-cache/net-irc/epic4-2.10 b/metadata/md5-cache/net-irc/epic4-2.10
index 097913df9a9c..56929c8cd571 100644
--- a/metadata/md5-cache/net-irc/epic4-2.10
+++ b/metadata/md5-cache/net-irc/epic4-2.10
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( >=dev-lang/perl-5.6.1[-ithreads] ) ssl? ( >=dev-libs/openssl-0.9.5 )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-2.10.tar.bz2 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20050315.tar.gz mirror://gentoo/epic4-local.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=97df495da9313f6db070d73029005fe2
diff --git a/metadata/md5-cache/net-irc/epic4-2.10.1 b/metadata/md5-cache/net-irc/epic4-2.10.1
index 2ffad098162f..53a91a8139cf 100644
--- a/metadata/md5-cache/net-irc/epic4-2.10.1
+++ b/metadata/md5-cache/net-irc/epic4-2.10.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-2.10.1.tar.bz2 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20050315.tar.gz mirror://gentoo/epic4-local.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b59e9bf69a411f1b0c7bffd5cc99e88
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.3 b/metadata/md5-cache/net-irc/inspircd-2.0.3
index 2f1ec6f76ff4..92222a7bd68c 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.3
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl openssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://www.inspircd.org/downloads/InspIRCd-2.0.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d24f8c163e88c134c0941d7b553e0fe
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.4 b/metadata/md5-cache/net-irc/inspircd-2.0.4
index e2fbba90735a..274de28b1387 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.4
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl openssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://www.inspircd.org/downloads/InspIRCd-2.0.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf4cdcec7f4be9f170747980d1821b1d
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.5 b/metadata/md5-cache/net-irc/inspircd-2.0.5
index 7e422f50b2e4..13e493c5a609 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.5
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl openssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://www.inspircd.org/downloads/InspIRCd-2.0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2ca814868f5a8203cb7735758ed0fd5
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.5-r1 b/metadata/md5-cache/net-irc/inspircd-2.0.5-r1
index 04c27521f0cc..66693980ce01 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.5-r1
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://www.inspircd.org/downloads/InspIRCd-2.0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=396201a2fdabaa492133a4f24fc68a90
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.5-r2 b/metadata/md5-cache/net-irc/inspircd-2.0.5-r2
index f9ccc8f497fe..7613a5827e89 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.5-r2
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://github.com/inspircd/inspircd/downloads/InspIRCd-2.0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=878766bd8829f8bc0fa38716f817b0b3
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.6_rc1 b/metadata/md5-cache/net-irc/inspircd-2.0.6_rc1
index 54234e64653a..51899ebc2b2b 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.6_rc1
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.6_rc1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
+DEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=4
-HOMEPAGE=http://www.inspircd.org/
-IUSE=gnutls ipv6 ldap mysql postgres sqlite ssl
+HOMEPAGE=http://inspircd.github.com/
+IUSE=geoip gnutls ipv6 ldap mysql postgres sqlite ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
+RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) sqlite? ( >=dev-db/sqlite-3.0 )
 SLOT=0
 SRC_URI=http://github.com/inspircd/inspircd/downloads/InspIRCd-2.0.6rc1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c6422d17c0d63cfe30ac56ef3ed4f26d
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=5ba286c67e35f816d4bc8992c49dd9c9
diff --git a/metadata/md5-cache/net-irc/irc-server-2.10.3_p3 b/metadata/md5-cache/net-irc/irc-server-2.10.3_p3
index 1eb5721ebf40..537663138623 100644
--- a/metadata/md5-cache/net-irc/irc-server-2.10.3_p3
+++ b/metadata/md5-cache/net-irc/irc-server-2.10.3_p3
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://ftp.irc.org/irc/server/irc2.10.3p3.tgz ftp://ftp.irc.org/irc/server/Old/irc2.10/irc2.10.3p3.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5b8033ea9f6fd0085c6537bffe0792e
diff --git a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r2 b/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r2
index 060fc4c24896..eea9f51e81c8 100644
--- a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r2
+++ b/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://ftp.irc.org/irc/server/irc2.11.1p1.tgz ftp://ftp.irc.org/irc/server/Old/irc2.11/irc2.11.1p1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e33a5867707b7c49d7bbdb4782c21d8d
diff --git a/metadata/md5-cache/net-irc/ircservices-5.0.63 b/metadata/md5-cache/net-irc/ircservices-5.0.63
index a368805650d2..513f418651e1 100644
--- a/metadata/md5-cache/net-irc/ircservices-5.0.63
+++ b/metadata/md5-cache/net-irc/ircservices-5.0.63
@@ -6,5 +6,5 @@ KEYWORDS=ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ircservices.za.net/download/old/ircservices-5.0.63.tar.gz ftp://ftp.esper.net/ircservices/old/ircservices-5.0.63.tar.gz mirror://gentoo/ircservices-5.0.63.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76d706f9e63a614080425cda3c487d0e
diff --git a/metadata/md5-cache/net-irc/ircservices-5.1.17 b/metadata/md5-cache/net-irc/ircservices-5.1.17
index 9dd38c02cfa8..2337fa6b900d 100644
--- a/metadata/md5-cache/net-irc/ircservices-5.1.17
+++ b/metadata/md5-cache/net-irc/ircservices-5.1.17
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ircservices.za.net/download/ircservices-5.1.17.tar.gz ftp://ftp.esper.net/ircservices/ircservices-5.1.17.tar.gz mirror://gentoo/ircservices-5.1.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f5909b934fce01bc2be310b38eebafc9
diff --git a/metadata/md5-cache/net-irc/ircservices-5.1.24 b/metadata/md5-cache/net-irc/ircservices-5.1.24
index bc28cefdf879..293c60849c05 100644
--- a/metadata/md5-cache/net-irc/ircservices-5.1.24
+++ b/metadata/md5-cache/net-irc/ircservices-5.1.24
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 FDL-1.2
 SLOT=0
 SRC_URI=http://achurch.org/services/tarballs/ircservices-5.1.24.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b895dabcd0b6ccaac5aba8d0185cafa
diff --git a/metadata/md5-cache/net-irc/irssi-otr-0.2 b/metadata/md5-cache/net-irc/irssi-otr-0.2
index 99c616d6b821..6d4aa1dd3d7b 100644
--- a/metadata/md5-cache/net-irc/irssi-otr-0.2
+++ b/metadata/md5-cache/net-irc/irssi-otr-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libotr dev-libs/glib dev-libs/libgcrypt dev-libs/libgpg-error || ( net-irc/irssi net-irc/irssi-svn )
 SLOT=0
 SRC_URI=ftp://download.tuxfamily.org/irssiotr/irssi-otr-0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd78db821158fea4e471aa632563b990
diff --git a/metadata/md5-cache/net-irc/irssi-otr-0.3 b/metadata/md5-cache/net-irc/irssi-otr-0.3
index 8e337630e222..0b992bb06e16 100644
--- a/metadata/md5-cache/net-irc/irssi-otr-0.3
+++ b/metadata/md5-cache/net-irc/irssi-otr-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libotr dev-libs/glib:2 dev-libs/libgcrypt dev-libs/libgpg-error || ( net-irc/irssi net-irc/irssi-svn )
 SLOT=0
 SRC_URI=ftp://download.tuxfamily.org/irssiotr/irssi-otr-0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4db8755c5ae882cecd8d67b70ff534c2
diff --git a/metadata/md5-cache/net-irc/konversation-1.4 b/metadata/md5-cache/net-irc/konversation-1.4
index bf4e1e1f3197..ddc7965e91ba 100644
--- a/metadata/md5-cache/net-irc/konversation-1.4
+++ b/metadata/md5-cache/net-irc/konversation-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] crypt? ( app-crypt/qca:2 ) crypt? ( app-crypt/qca-ossl ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_si(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/konversation/1.4/src/konversation-1.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4ea9a35115b90a6da9271b12db623bfb
diff --git a/metadata/md5-cache/net-irc/kvirc-4.2_pre6066 b/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
index 30e6b63a4580..d655fe983409 100644
--- a/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
+++ b/metadata/md5-cache/net-irc/kvirc-4.2_pre6066
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib x11-libs/libX11 >=x11-libs/qt-core-4.6 >=x11-libs/qt-gui-4
 REQUIRED_USE=audiofile? ( oss ) theora? ( dcc_video )
 SLOT=4
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/kvirc-4.2_pre6066.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c49ed9c8d7076ce411d940c27be9416c
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index 12b2d72c14b8..c02458dc08ad 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -8,5 +8,5 @@ LICENSE=kvirc
 RDEPEND=sys-libs/zlib x11-libs/libX11 >=x11-libs/qt-core-4.6 >=x11-libs/qt-gui-4.6 >=x11-libs/qt-sql-4.6 dcc_video? ( media-libs/libv4l theora? ( media-libs/libogg media-libs/libtheora ) ) kde? ( >=kde-base/kdelibs-4 ) oss? ( audiofile? ( media-libs/audiofile ) ) perl? ( dev-lang/perl ) phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6 ) ) qt-dbus? ( >=x11-libs/qt-dbus-4.6 ) ssl? ( dev-libs/openssl ) webkit? ( >=x11-libs/qt-webkit-4.6 ) gsm? ( media-sound/gsm ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=audiofile? ( oss ) theora? ( dcc_video )
 SLOT=4
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa67185e64f4c7e04bcc463ec495e9be
diff --git a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2 b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2
index 40a6e24c5e9d..a95202e38a6f 100644
--- a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2
+++ b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7d ) oidentd? ( >=net-misc/oidentd-2.0 )
 SLOT=0
 SRC_URI=http://www.psybnc.at/download/beta/psyBNC-2.3.2-9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9678a0fc0d947fe94927354f34f94f26
diff --git a/metadata/md5-cache/net-irc/quassel-0.8.0 b/metadata/md5-cache/net-irc/quassel-0.8.0
index 1d2351994adb..e7f2f361dc51 100644
--- a/metadata/md5-cache/net-irc/quassel-0.8.0
+++ b/metadata/md5-cache/net-irc/quassel-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-core-4.6.0:4[ssl?] monolithic? ( >=x11-libs/qt-script-4.6.
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
 SRC_URI=http://quassel-irc.org/pub/quassel-0.8.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3814b6ca6aa6c6e5206c2450dbc5a7e
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index d6ab88980cf2..95fd59c6d664 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-core-4.6.0:4[ssl?] monolithic? ( >=x11-libs/qt-script-4.6.0:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( >=x11-libs/qt-sql-4.6.0:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] ) postgres? ( >=x11-libs/qt-sql-4.6.0:4[postgres] ) syslog? ( virtual/logger ) >=x11-libs/qt-gui-4.6.0:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=x11-libs/qt-dbus-4.6.0:4 dev-libs/libdbusmenu-qt ) kde? ( >=kde-base/kdelibs-4.4 >=kde-base/oxygen-icons-4.4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6.0 ) ) webkit? ( >=x11-libs/qt-webkit-4.6.0:4 ) ) !monolithic? ( server? ( >=x11-libs/qt-script-4.6.0:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( >=x11-libs/qt-sql-4.6.0:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] ) postgres? ( >=x11-libs/qt-sql-4.6.0:4[postgres] ) syslog? ( virtual/logger ) ) X? ( >=x11-libs/qt-gui-4.6.0:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=x11-libs/qt-dbus-4.6.0:4 dev-libs/libdbusmenu-qt ) kde? ( >=kde-base/kdelibs-4.4 >=kde-base/oxygen-icons-4.4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6.0 ) ) webkit? ( >=x11-libs/qt-webkit-4.6.0:4 ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=156a8097d047ccc62a2dedcb09273b14
diff --git a/metadata/md5-cache/net-irc/weechat-0.3.7 b/metadata/md5-cache/net-irc/weechat-0.3.7
index e014fb206ce5..773deb234e38 100644
--- a/metadata/md5-cache/net-irc/weechat-0.3.7
+++ b/metadata/md5-cache/net-irc/weechat-0.3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://weechat.org/files/src/weechat-0.3.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5bcc207722d452c8d4f659a546ed2ec0
diff --git a/metadata/md5-cache/net-irc/weechat-0.3.8 b/metadata/md5-cache/net-irc/weechat-0.3.8
index 3622363f5958..382b0cc78ef1 100644
--- a/metadata/md5-cache/net-irc/weechat-0.3.8
+++ b/metadata/md5-cache/net-irc/weechat-0.3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://weechat.org/files/src/weechat-0.3.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7af894a1a3cfc63b6803e7ce55166319
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index cc34eaaeaa75..e6bc18359599 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -7,5 +7,5 @@ IUSE=guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmod
 LICENSE=GPL-3
 RDEPEND=net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2801064a76aeb7d0a2ac8103d25f8f1
diff --git a/metadata/md5-cache/net-irc/xchat-otr-0.3 b/metadata/md5-cache/net-irc/xchat-otr-0.3
index 45bd05204276..50d8c7177c11 100644
--- a/metadata/md5-cache/net-irc/xchat-otr-0.3
+++ b/metadata/md5-cache/net-irc/xchat-otr-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libotr net-irc/xchat dev-libs/glib:2 dev-libs/libgcrypt dev-libs/libgpg-error
 SLOT=0
 SRC_URI=ftp://download.tuxfamily.org/irssiotr/xchat-otr-0.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e460cae04b87e0a483b157f016517dc
diff --git a/metadata/md5-cache/net-irc/xchatosd-5.19 b/metadata/md5-cache/net-irc/xchatosd-5.19
index 89ab86461aae..8a5165a89c88 100644
--- a/metadata/md5-cache/net-irc/xchatosd-5.19
+++ b/metadata/md5-cache/net-irc/xchatosd-5.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/xosd-2.2.5 >=net-irc/xchat-2.0.9
 SLOT=0
 SRC_URI=mirror://sourceforge/xchatosd/xchatosd-5.19.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4eb65dad030a4893ce02bd36691a1245
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330 b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
index 4c1866652df6..f0c71197eb2c 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e3906e0978cf3a34d854cda1f73ac59
diff --git a/metadata/md5-cache/net-libs/c-client-2007e-r2 b/metadata/md5-cache/net-libs/c-client-2007e-r2
index 7b5cc3eaa8bd..9fc54a4c5a48 100644
--- a/metadata/md5-cache/net-libs/c-client-2007e-r2
+++ b/metadata/md5-cache/net-libs/c-client-2007e-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) !net-mail/uw-imap
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007e.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0dff940d30be2d2ed364ce3c8be569bc
diff --git a/metadata/md5-cache/net-libs/c-client-2007f b/metadata/md5-cache/net-libs/c-client-2007f
index 0ab2fd55acdd..e854184c36ce 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f
+++ b/metadata/md5-cache/net-libs/c-client-2007f
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) !net-mail/uw-imap
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae3c9c9fce43671fbe577747b653342e
diff --git a/metadata/md5-cache/net-libs/c-client-2007f-r1 b/metadata/md5-cache/net-libs/c-client-2007f-r1
index a01299447731..c1d12a48f46b 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r1
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=ssl? ( dev-libs/openssl ) !net-mail/uw-imap
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f61d33c67f05e77a1cc20d564558a142
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.62.2 b/metadata/md5-cache/net-libs/courier-authlib-0.62.2
index 41666b0b73b9..93504713dacc 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.62.2
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.62.2
@@ -9,5 +9,5 @@ RDEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.62.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=488cd81f39457de7b1d3177529ffd4fb
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.62.4 b/metadata/md5-cache/net-libs/courier-authlib-0.62.4
index 1094a8f7bd90..a76e4e2d21ca 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.62.4
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.62.4
@@ -9,5 +9,5 @@ RDEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.62.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2f2fbcf4bdea029a007e6dc97ea3c9e
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.63.0 b/metadata/md5-cache/net-libs/courier-authlib-0.63.0
index 4ce6bb1dc3d6..c9bc1f351bc8 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.63.0
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.63.0
@@ -9,5 +9,5 @@ RDEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.63.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28513fa33ba22fe9331bf8cf547182f2
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.63.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.63.0-r1
index 2cff1525dde6..a4629afd13a1 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.63.0-r1
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.63.0-r1
@@ -9,5 +9,5 @@ RDEPEND=gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db )
 RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.63.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0cbf793e3f7b2905e646bc1353eb5bf2
diff --git a/metadata/md5-cache/net-libs/enet-1.3.4 b/metadata/md5-cache/net-libs/enet-1.3.4
index 1f17fb3cf9e3..7315ad4f9a8d 100644
--- a/metadata/md5-cache/net-libs/enet-1.3.4
+++ b/metadata/md5-cache/net-libs/enet-1.3.4
@@ -3,10 +3,10 @@ DESCRIPTION=relatively thin, simple and robust network communication layer on to
 EAPI=3
 HOMEPAGE=http://enet.bespin.org/
 IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=!net-libs/enet:0
 SLOT=1.3
 SRC_URI=http://enet.bespin.org/download/enet-1.3.4.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a892b9422445f252c1ec53d0c12801b
+_md5_=1a32282e43984d1d1837297dec68547d
diff --git a/metadata/md5-cache/net-libs/jreen-1.0.5-r1 b/metadata/md5-cache/net-libs/jreen-1.0.5-r1
index edd0d833d7fc..8688a8c59ee6 100644
--- a/metadata/md5-cache/net-libs/jreen-1.0.5-r1
+++ b/metadata/md5-cache/net-libs/jreen-1.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.0.3 >=net-dns/libidn-1.20 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
 SRC_URI=http://qutim.org/downloads/libjreen-1.0.5.tar.bz2 -> jreen-1.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff30bec103b06580f593e43be53bde81
diff --git a/metadata/md5-cache/net-libs/jreen-1.1.0 b/metadata/md5-cache/net-libs/jreen-1.1.0
index 7f14710ae2ba..02ce4911bb66 100644
--- a/metadata/md5-cache/net-libs/jreen-1.1.0
+++ b/metadata/md5-cache/net-libs/jreen-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.0.3 >=net-dns/libidn-1.20 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
 SRC_URI=http://qutim.org/downloads/libjreen-1.1.0.tar.bz2 -> jreen-1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f3aa4d1835d05032dd184eacdbfa5bf
diff --git a/metadata/md5-cache/net-libs/jreen-9999 b/metadata/md5-cache/net-libs/jreen-9999
index 2063294dd98f..021323392be9 100644
--- a/metadata/md5-cache/net-libs/jreen-9999
+++ b/metadata/md5-cache/net-libs/jreen-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.0.3 >=net-dns/libidn-1.20 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ca32668de48ed771ea4ff99245f0b48
diff --git a/metadata/md5-cache/net-libs/libasyncns-0.8-r2 b/metadata/md5-cache/net-libs/libasyncns-0.8-r2
index d9845d8e85cb..1ced595abb8e 100644
--- a/metadata/md5-cache/net-libs/libasyncns-0.8-r2
+++ b/metadata/md5-cache/net-libs/libasyncns-0.8-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linu
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libasyncns/libasyncns-0.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a733a6073e740664cde100ada034be0
diff --git a/metadata/md5-cache/net-libs/libbluedevil-1.9.2 b/metadata/md5-cache/net-libs/libbluedevil-1.9.2
index b0ea6efa20c4..ad23487003f9 100644
--- a/metadata/md5-cache/net-libs/libbluedevil-1.9.2
+++ b/metadata/md5-cache/net-libs/libbluedevil-1.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-wireless/bluez >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libbluedevil/1.9.2/src/libbluedevil-1.9.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=03b70593d96cefb437af7f552e361ed8
diff --git a/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0 b/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
index 52493db1991e..62c6b658cc29 100644
--- a/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
+++ b/metadata/md5-cache/net-libs/libcapsinetwork-0.3.0
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://unixcode.org/downloads/libcapsinetwork/libcapsinetwork-0.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=319747778298736a95b904807026ec5a
diff --git a/metadata/md5-cache/net-libs/libdexter-0.1.4 b/metadata/md5-cache/net-libs/libdexter-0.1.4
index 0133fb242d17..060d8277dd02 100644
--- a/metadata/md5-cache/net-libs/libdexter-0.1.4
+++ b/metadata/md5-cache/net-libs/libdexter-0.1.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/libdexter/libdexter-0.1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac096afc4a594f51879b97e3d28e58b8
diff --git a/metadata/md5-cache/net-libs/libgcal-0.9.6 b/metadata/md5-cache/net-libs/libgcal-0.9.6
index ab732d35f80a..bc3adf6dfed8 100644
--- a/metadata/md5-cache/net-libs/libgcal-0.9.6
+++ b/metadata/md5-cache/net-libs/libgcal-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 >=net-misc/curl-7.18.2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libgcal.googlecode.com/files/libgcal-0.9.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d6fdffe2e6cb277d18ce210200fd7fd
diff --git a/metadata/md5-cache/net-libs/libkgapi-0.4.1 b/metadata/md5-cache/net-libs/libkgapi-0.4.1
index c5f22b3355d3..f2129d76c432 100644
--- a/metadata/md5-cache/net-libs/libkgapi-0.4.1
+++ b/metadata/md5-cache/net-libs/libkgapi-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/qjson oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libkgapi/0.4.1/src/libkgapi-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=261d7878466276bb9a6f3b5f9b0766fc
diff --git a/metadata/md5-cache/net-libs/libktorrent-1.1.2 b/metadata/md5-cache/net-libs/libktorrent-1.1.2
index 464e1b3a6622..31f93057e093 100644
--- a/metadata/md5-cache/net-libs/libktorrent-1.1.2
+++ b/metadata/md5-cache/net-libs/libktorrent-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 dev-libs/gmp >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.1.2/libktorrent-1.1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=435ba86d2acb65cabcb49e3a3586ec8a
diff --git a/metadata/md5-cache/net-libs/libktorrent-1.1.3 b/metadata/md5-cache/net-libs/libktorrent-1.1.3
index d71987ce0826..2a367c888600 100644
--- a/metadata/md5-cache/net-libs/libktorrent-1.1.3
+++ b/metadata/md5-cache/net-libs/libktorrent-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 dev-libs/gmp >=kde-base/solid-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.1.3/libktorrent-1.1.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f5076f9b358d2c0a908d65aef07d837c
diff --git a/metadata/md5-cache/net-libs/libktorrent-1.2.0 b/metadata/md5-cache/net-libs/libktorrent-1.2.0
index 45ab78d9de92..f1a251fc6d28 100644
--- a/metadata/md5-cache/net-libs/libktorrent-1.2.0
+++ b/metadata/md5-cache/net-libs/libktorrent-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 dev-libs/gmp >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.2.0/libktorrent-1.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=99f31c63604e3b1c32d2925b8cffcf2e
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-2.5.0 b/metadata/md5-cache/net-libs/libkvkontakte-2.5.0
index e26348adce95..c6ab1d1ef1d0 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-2.5.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.0 >=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=265f1da4c5c54eb77f2b2a3d6372fdd1
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-2.6.0 b/metadata/md5-cache/net-libs/libkvkontakte-2.6.0
index 671c09ccae9c..95e7601295e7 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-2.6.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.0 >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/digikam/digikam-2.6.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=bfea871a8e9618a138802116efdda98a
diff --git a/metadata/md5-cache/net-libs/libmsn-4.2 b/metadata/md5-cache/net-libs/libmsn-4.2
index 06dccaac9447..39675cca0bc3 100644
--- a/metadata/md5-cache/net-libs/libmsn-4.2
+++ b/metadata/md5-cache/net-libs/libmsn-4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/libmsn/libmsn-4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d7c0d6d9495835e0d940c53bd5f54a1
diff --git a/metadata/md5-cache/net-libs/libmsn-4.2.1 b/metadata/md5-cache/net-libs/libmsn-4.2.1
index 33d0ed8d45c0..c3f0d00b5e97 100644
--- a/metadata/md5-cache/net-libs/libmsn-4.2.1
+++ b/metadata/md5-cache/net-libs/libmsn-4.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/libmsn/libmsn-4.2.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28eab7d4793ea85953b7451639cbe4aa
diff --git a/metadata/md5-cache/net-libs/libnipper-0.12.6-r1 b/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
index d9323448b228..47e64badf7e4 100644
--- a/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
+++ b/metadata/md5-cache/net-libs/libnipper-0.12.6-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/nipper/libnipper-0.12.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=255f1d2266273712d99a5ebc52562639
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.6-r3 b/metadata/md5-cache/net-libs/libproxy-0.4.6-r3
index fb463afd3180..ae11bd0d733c 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.6-r3
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.6-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4.4.5 ) mono? ( dev-lang/mono ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libproxy.googlecode.com/files/libproxy-0.4.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cab17f6091e9d70f45a527da8eae68cf
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.7 b/metadata/md5-cache/net-libs/libproxy-0.4.7
index b17679f36ff0..68e271177993 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.7
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=gnome? ( >=dev-libs/glib-2.26:2 ) kde? ( >=kde-base/kdelibs-4.4.5 ) mono? ( dev-lang/mono ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://libproxy.googlecode.com/files/libproxy-0.4.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2658772e63db3f3548e0e67570435437
diff --git a/metadata/md5-cache/net-libs/libsmi-0.4.8-r1 b/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
index 578494dd8082..2e337dfcf970 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
+++ b/metadata/md5-cache/net-libs/libsmi-0.4.8-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/libsmi-0.4.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00b18f3bf36a5d67bc5f91df10f3e7a9
diff --git a/metadata/md5-cache/net-libs/libssh-0.5.1 b/metadata/md5-cache/net-libs/libssh-0.5.1
index 282ed1900ec3..e4854c362c60 100644
--- a/metadata/md5-cache/net-libs/libssh-0.5.1
+++ b/metadata/md5-cache/net-libs/libssh-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcry
 REQUIRED_USE=test? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libssh.org/files/0.5/libssh-0.5.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd9783251a4c2453ece29475a5a3176f
diff --git a/metadata/md5-cache/net-libs/libssh-0.5.2 b/metadata/md5-cache/net-libs/libssh-0.5.2
index 032b8f678381..094bb42b2410 100644
--- a/metadata/md5-cache/net-libs/libssh-0.5.2
+++ b/metadata/md5-cache/net-libs/libssh-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcry
 REQUIRED_USE=test? ( static-libs )
 SLOT=0
 SRC_URI=https://red.libssh.org/attachments/download/27/libssh-0.5.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63ac5beac70f5503bf529a560f220a20
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index d36b800173bd..b25e45c19c98 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -7,5 +7,5 @@ IUSE=debug examples gcrypt pcap +sftp ssh1 server static-libs zlib
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.4 )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=946a03a3573887bc78916ca496f0e577
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.12.5 b/metadata/md5-cache/net-libs/libtorrent-0.12.5
index 1512c1fc79f8..d7999c0d4e2a 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.12.5
+++ b/metadata/md5-cache/net-libs/libtorrent-0.12.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libsigc++-2.2.2
 SLOT=0
 SRC_URI=http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd0915a62d4b8847fffe3b4a5eef37c4
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.14 b/metadata/md5-cache/net-libs/libupnp-1.6.14
index fd381af0dc3a..7f62edcd6ba4 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.14
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.14
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.14.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=926913f11f7ff20ae83512465b8e1e76
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.17 b/metadata/md5-cache/net-libs/libupnp-1.6.17
index ae49c159a106..590e91e0c453 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.17
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.17
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.17.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ad7085c979bc3fa044d243dd924a138
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.6 b/metadata/md5-cache/net-libs/libupnp-1.6.6
index b9b0e6333600..27180ff3e964 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.6
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.6
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a19aba97238a8dfc8641924d0b82e553
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
index 21d85baba94f..ba7ec5a87f62 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 e8481aa656c5..b34cc668be58 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8924238a97f4e953ede5d6215b7742c8
diff --git a/metadata/md5-cache/net-libs/opal-2.2.11 b/metadata/md5-cache/net-libs/opal-2.2.11
index b44418bb8561..54d634bcf9dc 100644
--- a/metadata/md5-cache/net-libs/opal-2.2.11
+++ b/metadata/md5-cache/net-libs/opal-2.2.11
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=~dev-libs/pwlib-1.10.10 >=media-video/ffmpeg-0.4.7
 SLOT=0
 SRC_URI=http://www.ekiga.org/admin/downloads/latest/sources/sources/opal-2.2.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b899f16cce697bdc8894b715f1f6187
diff --git a/metadata/md5-cache/net-libs/opal-3.6.8-r2 b/metadata/md5-cache/net-libs/opal-3.6.8-r2
index c46096784047..f39767feb4d7 100644
--- a/metadata/md5-cache/net-libs/opal-3.6.8-r2
+++ b/metadata/md5-cache/net-libs/opal-3.6.8-r2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.6.8.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.6.7-htmldoc.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d4ec14fc8f61121d53cfe3cd91c6f52
diff --git a/metadata/md5-cache/net-libs/openh323-1.18.0 b/metadata/md5-cache/net-libs/openh323-1.18.0
index 2b1dfef18daa..f81c330f41db 100644
--- a/metadata/md5-cache/net-libs/openh323-1.18.0
+++ b/metadata/md5-cache/net-libs/openh323-1.18.0
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=sys-apps/sed-4 =dev-libs/pwlib-1.10* virtual/ffmpeg ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://www.voxgratia.org/releases/openh323-v1_18_0-src-tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0437475ff4b551a649768bacfc88c74e
diff --git a/metadata/md5-cache/net-libs/qtweetlib-0.4 b/metadata/md5-cache/net-libs/qtweetlib-0.4
index 0b2d6386ac3f..392aab7c6b84 100644
--- a/metadata/md5-cache/net-libs/qtweetlib-0.4
+++ b/metadata/md5-cache/net-libs/qtweetlib-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.1 >=x11-libs/qt-core-4.6.0[ssl]
 SLOT=0
 SRC_URI=https://github.com/minimoog/QTweetLib/tarball/0.4 -> qtweetlib-0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c47e462aa3bf2227557322a2106e7f28
diff --git a/metadata/md5-cache/net-libs/qtweetlib-0.5 b/metadata/md5-cache/net-libs/qtweetlib-0.5
index ffbd2b276a1f..8b123604408a 100644
--- a/metadata/md5-cache/net-libs/qtweetlib-0.5
+++ b/metadata/md5-cache/net-libs/qtweetlib-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.1 >=x11-libs/qt-core-4.6.0[ssl]
 SLOT=0
 SRC_URI=https://github.com/minimoog/QTweetLib/tarball/0.5 -> qtweetlib-0.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1751a3c4e2c9b8eca7a986bfa636df5
diff --git a/metadata/md5-cache/net-libs/qtweetlib-9999 b/metadata/md5-cache/net-libs/qtweetlib-9999
index bb4a30ab5bc5..a0255da808c3 100644
--- a/metadata/md5-cache/net-libs/qtweetlib-9999
+++ b/metadata/md5-cache/net-libs/qtweetlib-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.1 >=x11-libs/qt-core-4.6.0[ssl]
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bfcccf1941f0ef2a35e40289d415e06
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.8.0 b/metadata/md5-cache/net-libs/telepathy-qt-0.8.0
index 9456099f7d64..f4353a165f68 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.8.0
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.8.0
@@ -4,10 +4,11 @@ DESCRIPTION=Qt4 bindings for the Telepathy D-Bus protocol
 EAPI=4
 HOMEPAGE=http://telepathy.freedesktop.org/
 IUSE=debug farsight glib test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-qt4/telepathy-qt4-0.8.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0b3beb2867bf5b936ac359d7cb414798
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c90701bf74b50bc377985c22deab1767
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.0 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.0
deleted file mode 100644
index 4d521078384a..000000000000
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.17.2 ) !net-libs/telepathy-qt4 dev-libs/libxslt virtual/pkgconfig test? ( x11-libs/qt-test:4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt4 bindings for the Telepathy D-Bus protocol
-EAPI=4
-HOMEPAGE=http://telepathy.freedesktop.org/
-IUSE=debug farsight glib test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.17.2 ) !net-libs/telepathy-qt4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dca0ddcde5b34a129fefc3f7b0048176
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.1 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.1
index 73bd23682f2e..3c86f6e3420e 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.1
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/qt-core:4 x11-libs/qt-dbus:4 farsight? ( net-libs/telepathy-far
 REQUIRED_USE=farsight? ( !farstream )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=344d34dfe1a808f5d1504080cc0d0e29
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r201 b/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r201
index 5d32ac7237bf..ed721d4c9f71 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r201
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r201
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=2
 SRC_URI=mirror://gentoo/webkit-gtk-1.6.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4a1b70d3fbed714fd21ef9f033dfba5e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r301 b/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r301
index b97aede9be74..70cf161b6de1 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r301
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.6.1-r301
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=3
 SRC_URI=mirror://gentoo/webkit-gtk-1.6.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dd525618284104beb31191d810aa86b4
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r200 b/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r200
index 6202cd97722c..0d3fb838075d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r200
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/webkit-1.6.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4a6d4aca964c3c21359afb9f7ae46a35
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r300
index 23901c2e9e35..0ab8cbb84f66 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.6.3-r300
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/webkit-1.6.3.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=67611b4df91986f31a05eb91085018d4
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r200 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r200
index 82df1d9e5e5e..c50d631c59bc 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r200
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.0.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=979026e6c5e8e734adf63b8c8910c0cc
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r300
index 850abafee818..d17334f248bd 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.0-r300
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.0.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b377f1aaf83f9b59c53c17302300586c
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r200 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r200
index e29da13be1ae..460e1db131d1 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r200
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=74b0f8fdbd80bdf503ac64b9d065f1e8
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r201 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r201
index fa92f36d947a..55420cb4d496 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r201
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r201
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=029f283510519b1af7c6b0f5e8d088c8
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r300
index 1e42abc6a1d4..05f8ae510127 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r300
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=742d35bb2b926a24ba3c02f00576037f
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r301 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r301
index 0a4727cae607..22b2442f85b9 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r301
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.1-r301
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4
 REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5a09eade042282495585a1f4845c099a
diff --git a/metadata/md5-cache/net-libs/wt-3.2.0-r1 b/metadata/md5-cache/net-libs/wt-3.2.0-r1
index 71a4e4e096cd..a97e5518afb5 100644
--- a/metadata/md5-cache/net-libs/wt-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/wt-3.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.36 graphicsmagick? ( media-gfx/graphicsmagick ) pdf? ( media-libs/libharu ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) fcgi? ( dev-libs/fcgi virtual/httpd-fastcgi ) server? ( ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/witty/wt-3.2.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=294398b281d59663da96181b4c69580e
diff --git a/metadata/md5-cache/net-libs/wt-3.2.1 b/metadata/md5-cache/net-libs/wt-3.2.1
index f34f183b6247..b510bd983c64 100644
--- a/metadata/md5-cache/net-libs/wt-3.2.1
+++ b/metadata/md5-cache/net-libs/wt-3.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.36 graphicsmagick? ( media-gfx/graphicsmagick ) pdf? ( media-libs/libharu ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) fcgi? ( dev-libs/fcgi virtual/httpd-fastcgi ) server? ( ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/witty/wt-3.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ffe9e0998b0007b9c8d77d9eb1926729
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
index b15e5d8a2116..0590bd52ec1e 100644
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57598ac52513b97c1e02d06e5fb48ef7
diff --git a/metadata/md5-cache/net-libs/xrootd-3.1.0 b/metadata/md5-cache/net-libs/xrootd-3.1.0
index 3c13a7c00d1d..784928fe7938 100644
--- a/metadata/md5-cache/net-libs/xrootd-3.1.0
+++ b/metadata/md5-cache/net-libs/xrootd-3.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) perl? ( dev-lang/perl readline? ( dev-perl/Term-ReadLine-Perl ) ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://xrootd.org//download/v3.1.0/xrootd-3.1.0.tar.gz doc? ( http://xrootd.slac.stanford.edu/doc/prod/Syntax_config.pdf http://xrootd.slac.stanford.edu/doc/prod/xrd_config.pdf http://xrootd.slac.stanford.edu/doc/prod/ofs_config.pdf http://xrootd.slac.stanford.edu/doc/prod/cms_config.pdf http://xrootd.slac.stanford.edu/doc/prod/sec_config.pdf http://xrootd.slac.stanford.edu/doc/prod/xrd_monitoring.pdf http://xrootd.slac.stanford.edu/doc/prod/frm_config.pdf http://xrootd.slac.stanford.edu/doc/prod/XRdv297.pdf )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c42db972ff657cc7724d050743f33afd
diff --git a/metadata/md5-cache/net-libs/xrootd-3.1.1 b/metadata/md5-cache/net-libs/xrootd-3.1.1
index 0df19f57133d..0d40946469ac 100644
--- a/metadata/md5-cache/net-libs/xrootd-3.1.1
+++ b/metadata/md5-cache/net-libs/xrootd-3.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) perl? ( dev-lang/perl readline? ( dev-perl/Term-ReadLine-Perl ) ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://xrootd.org//download/v3.1.1/xrootd-3.1.1.tar.gz doc? ( http://xrootd.slac.stanford.edu/doc/prod/Syntax_config.pdf http://xrootd.slac.stanford.edu/doc/prod/xrd_config.pdf http://xrootd.slac.stanford.edu/doc/prod/ofs_config.pdf http://xrootd.slac.stanford.edu/doc/prod/cms_config.pdf http://xrootd.slac.stanford.edu/doc/prod/sec_config.pdf http://xrootd.slac.stanford.edu/doc/prod/xrd_monitoring.pdf http://xrootd.slac.stanford.edu/doc/prod/frm_config.pdf http://xrootd.slac.stanford.edu/doc/prod/XRdv297.pdf )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b2f3971b3ddd6e6ff57e249adb00071
diff --git a/metadata/md5-cache/net-libs/xrootd-3.2.1 b/metadata/md5-cache/net-libs/xrootd-3.2.1
index d0ccc2f73ffe..3319124195ef 100644
--- a/metadata/md5-cache/net-libs/xrootd-3.2.1
+++ b/metadata/md5-cache/net-libs/xrootd-3.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) perl? ( dev-lang/perl readline? ( dev-perl/Term-ReadLine-Perl ) ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://xrootd.org//download/v3.2.1/xrootd-3.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b69a553f75c343ef2ae009d2e1896460
diff --git a/metadata/md5-cache/net-libs/xulrunner-1.9.2.17 b/metadata/md5-cache/net-libs/xulrunner-1.9.2.17
index 258e11c2d806..f448bd20281b 100644
--- a/metadata/md5-cache/net-libs/xulrunner-1.9.2.17
+++ b/metadata/md5-cache/net-libs/xulrunner-1.9.2.17
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=1.9
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.17/source/firefox-3.6.17.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86d328d9b65ff2f9d7ac7c8967b64167
diff --git a/metadata/md5-cache/net-libs/xulrunner-1.9.2.20 b/metadata/md5-cache/net-libs/xulrunner-1.9.2.20
index 3ab52dd2a13a..d0f6244dc7c7 100644
--- a/metadata/md5-cache/net-libs/xulrunner-1.9.2.20
+++ b/metadata/md5-cache/net-libs/xulrunner-1.9.2.20
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=1.9
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/source/firefox-3.6.20.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea2e7e07cf14b6cb60fb3860a8a89129
diff --git a/metadata/md5-cache/net-libs/xulrunner-1.9.2.21 b/metadata/md5-cache/net-libs/xulrunner-1.9.2.21
index 558356b081a6..c114ec0ba542 100644
--- a/metadata/md5-cache/net-libs/xulrunner-1.9.2.21
+++ b/metadata/md5-cache/net-libs/xulrunner-1.9.2.21
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=1.9
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.21/source/firefox-3.6.21.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99b05c4e9e9854355504c272fcc8a83c
diff --git a/metadata/md5-cache/net-libs/xulrunner-1.9.2.22 b/metadata/md5-cache/net-libs/xulrunner-1.9.2.22
index f017c0936728..6cc908f7c90b 100644
--- a/metadata/md5-cache/net-libs/xulrunner-1.9.2.22
+++ b/metadata/md5-cache/net-libs/xulrunner-1.9.2.22
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=1.9
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/source/firefox-3.6.22.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54479b4a5673c22267b01fb3aee6be3d
diff --git a/metadata/md5-cache/net-libs/xulrunner-2.0.1-r1 b/metadata/md5-cache/net-libs/xulrunner-2.0.1-r1
index ee982b0b62a1..9338e89e19da 100644
--- a/metadata/md5-cache/net-libs/xulrunner-2.0.1-r1
+++ b/metadata/md5-cache/net-libs/xulrunner-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.9 >=dev-libs/nspr-4.8.7 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib media-libs/mesa ) !www-plugins/weave x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=1.9
 SRC_URI=http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-2.0-patches-1.8.tar.bz2 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/4.0.1/source/firefox-4.0.1.source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebe70da18a72653d5e9a92d35d3e4057
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r2 b/metadata/md5-cache/net-mail/checkpassword-0.90-r2
index e125093514f3..6cca19545a93 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r2
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2902c12b359355958ff15807132945a3
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r3 b/metadata/md5-cache/net-mail/checkpassword-0.90-r3
index f09ccfe05bb3..9aae7a2bc801 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r3
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db16c5349f2d813eaff08540ed213184
diff --git a/metadata/md5-cache/net-mail/checkpw-1.02 b/metadata/md5-cache/net-mail/checkpw-1.02
index 09ef757eeba0..48099d78e493 100644
--- a/metadata/md5-cache/net-mail/checkpw-1.02
+++ b/metadata/md5-cache/net-mail/checkpw-1.02
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/checkpw/checkpw-1.02.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72f01421094fcbf47f9f1344bdd4196c
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.12 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.12
index 280c4096cc6b..f9aa20832899 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.12
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.12
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.12.tar.gz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=141f31e51a97bfa4bc56f4bb42d03669
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.13 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.13
index 30ea68f09233..b6c58813b124 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.13
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.13
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.13.tar.gz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3aa24776135b27823112413058b18d58
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.14 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.14
index 6ea0254251d3..a17b7fae09bf 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.14
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.14
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.14.tar.gz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94d84b7a86ec080545116ddf45d9d2e6
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
index 72c5014867ef..6758e690e214 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.16
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkd
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.16.tar.gz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e286416458d09f6bf6295f26ae86697
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r3 b/metadata/md5-cache/net-mail/dot-forward-0.71-r3
index 5e192daeb261..554c89b3cf0c 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r3
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r3
@@ -7,5 +7,5 @@ LICENSE=as-is
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ea07623182330f5e7d8c5d73ac94cc0b
diff --git a/metadata/md5-cache/net-mail/email-3.0.5 b/metadata/md5-cache/net-mail/email-3.0.5
index fcb37e243261..06b2d1862742 100644
--- a/metadata/md5-cache/net-mail/email-3.0.5
+++ b/metadata/md5-cache/net-mail/email-3.0.5
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cleancode.org/downloads/email/email-3.0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11ed89bc7b680b0a9543497eae9669a5
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
index e453c4a36c90..c02679cf03ec 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f718c3216e2baa20ab0d274f24b7cb4
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
index 5460eb9c1ad0..878489b73422 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2612f6c3d4c84a3695a6cdf1cfa16742
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
index 8cff935d63cc..c28b4062dbc5 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d594ded3b0c7d14c1d188ce0fa4fe8d
diff --git a/metadata/md5-cache/net-mail/mailbase-1 b/metadata/md5-cache/net-mail/mailbase-1
index 804a52e50f90..9634dd22a947 100644
--- a/metadata/md5-cache/net-mail/mailbase-1
+++ b/metadata/md5-cache/net-mail/mailbase-1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3aea625452172f989724b9a0add68e66
diff --git a/metadata/md5-cache/net-mail/mailutils-2.2 b/metadata/md5-cache/net-mail/mailutils-2.2
index c50a52ad899d..4b37061e725c 100644
--- a/metadata/md5-cache/net-mail/mailutils-2.2
+++ b/metadata/md5-cache/net-mail/mailutils-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail bidi? ( dev-libs/fribidi ) guile? ( dev-scheme/guile ) gdbm? ( sys-libs/gdbm ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) postgres? ( dev-db/postgresql-base ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/mta python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-2.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e6dcc01829cf9e9b5fd414ff4acbddd
diff --git a/metadata/md5-cache/net-mail/perdition-1.18 b/metadata/md5-cache/net-mail/perdition-1.18
index 4a240b6676b2..472b4f7cf292 100644
--- a/metadata/md5-cache/net-mail/perdition-1.18
+++ b/metadata/md5-cache/net-mail/perdition-1.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-scheme/guile >=dev-libs/vanessa-logger-0.0.8 >=dev-libs/vanessa-adt-0.0.6 >=net-libs/vanessa-socket-0.0.10 dev-libs/libpcre virtual/pam berkdb? ( sys-libs/db ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ssl? ( dev-libs/openssl ) odbc? ( dev-db/unixODBC ) gdbm? ( sys-libs/gdbm ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=http://www.vergenet.net/linux/perdition/download/1.18/perdition-1.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f8ede4da0e5153963f8fc49214557b8
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
index 7dd2ab47e000..966d52601c5a 100644
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
+++ b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam sys-apps/xinetd cracklib? ( sys-libs/cracklib )
 SLOT=0
 SRC_URI=http://echelon.pl/pubs/poppassd-1.8.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b8e7d7595afa8c2bc814887d3aa928f
diff --git a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2 b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
index 370262ed679b..c2533cf245f4 100644
--- a/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
+++ b/metadata/md5-cache/net-mail/poppassd_ceti-1.8.5-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam sys-apps/xinetd
 SLOT=0
 SRC_URI=http://echelon.pl/pubs/poppassd-1.8.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59e996eda2922c9d7058985323980de9
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.12 b/metadata/md5-cache/net-mail/qmailadmin-1.2.12
index 4a8a03afabd1..1ce401e64afd 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.12
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.12
@@ -9,5 +9,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=7c722e34d99caddb5ae51693a3e3a760
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
index 56f06d2c8500..4f523cfb21df 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15
@@ -9,5 +9,5 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/autorespond maildrop? ( >
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=1de842fe61e35b981583599920431b97
diff --git a/metadata/md5-cache/net-mail/safecat-1.13 b/metadata/md5-cache/net-mail/safecat-1.13
index 301237eaab27..5264a502ab07 100644
--- a/metadata/md5-cache/net-mail/safecat-1.13
+++ b/metadata/md5-cache/net-mail/safecat-1.13
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.jeenyus.net/linux/software/safecat/safecat-1.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6265a3a19f4e9929d76a95b6658a5d60
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5 b/metadata/md5-cache/net-mail/tpop3d-1.5.5
index 8b182c4649d2..8c84d44793dd 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/tpop3d/tpop3d-1.5.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb49358e711db690d22db7bae226cb09
diff --git a/metadata/md5-cache/net-mail/uw-imap-2007f b/metadata/md5-cache/net-mail/uw-imap-2007f
index f2c7f4ede994..752743a9dca7 100644
--- a/metadata/md5-cache/net-mail/uw-imap-2007f
+++ b/metadata/md5-cache/net-mail/uw-imap-2007f
@@ -10,5 +10,5 @@ RDEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam]
 REQUIRED_USE=!clearpasswd? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71fdf7741f571d47d99315754f862c56
diff --git a/metadata/md5-cache/net-mail/uw-mailutils-2007f b/metadata/md5-cache/net-mail/uw-mailutils-2007f
index 5c40e90fb613..caf2ceb85044 100644
--- a/metadata/md5-cache/net-mail/uw-mailutils-2007f
+++ b/metadata/md5-cache/net-mail/uw-mailutils-2007f
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) !<net-mail/uw-imap-2007f
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff22b9426dec1b719109f0fef728b493
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.3.3 b/metadata/md5-cache/net-mail/vchkuser-0.3.3
index b8f27f1058e8..29ac6f47d7e9 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.3.3
+++ b/metadata/md5-cache/net-mail/vchkuser-0.3.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bb.xnull.de/projects/vchkuser/dist/vchkuser-0.3.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc9395dcadac5273d6163119399e3e60
diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4
index 42fa86df2cc9..6ed3c53825c1 100644
--- a/metadata/md5-cache/net-mail/vchkuser-0.4
+++ b/metadata/md5-cache/net-mail/vchkuser-0.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=757ae628aae286fbcaae8096447f1421
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
index 1b95075fee0a..877411c9fd6d 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50119a4a33553a1afca2a9de2f63f778
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2 b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
index 0d4fd7471ecd..91571dbbd208 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.30-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f3750cf3755a719c3811513a88d8851e
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index ef6853e36874..92a9946ae5da 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e3b2ae76b27a0bdd06b0fc37839da8c
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7
index a1c9176a4a1c..33a87daf2686 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=bd5fcade1a333afe8ace2889daa2562a
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.3 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.3
index 17eef3567af4..6375984843af 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.3
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=app-arch/bzip2 sys-libs/zlib lzma? ( app-arch/xz-utils ) fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.7.3.orig.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d01ffcd0894d55151037583e6a216ec0
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.6 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.6
index 53e2170876ac..a3013d612f58 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.6
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.6
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=app-arch/bzip2 sys-libs/zlib lzma? ( app-arch/xz-utils ) fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.7.6.orig.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed8815a2894ac53e3fb4360c77fda8a7
diff --git a/metadata/md5-cache/net-misc/axel-2.4-r1 b/metadata/md5-cache/net-misc/axel-2.4-r1
index 9f28cb3ac777..9832116cf88d 100644
--- a/metadata/md5-cache/net-misc/axel-2.4-r1
+++ b/metadata/md5-cache/net-misc/axel-2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7cc440cdbfa04d7b335505cc8b495ba6
diff --git a/metadata/md5-cache/net-misc/capiisdnmon-0.42-r1 b/metadata/md5-cache/net-misc/capiisdnmon-0.42-r1
index a45280f7a5d2..92d6b14d6a08 100644
--- a/metadata/md5-cache/net-misc/capiisdnmon-0.42-r1
+++ b/metadata/md5-cache/net-misc/capiisdnmon-0.42-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/capi4k-utils net-nds/openldap x11-libs/xosd x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/capiisdnmon/capiisdnmon-0.42.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d39c3dbf8b2a5b1978337d4961543873
diff --git a/metadata/md5-cache/net-misc/clockspeed-0.62-r6 b/metadata/md5-cache/net-misc/clockspeed-0.62-r6
index 1fc74c8f8cf4..a9b5f8d813d4 100644
--- a/metadata/md5-cache/net-misc/clockspeed-0.62-r6
+++ b/metadata/md5-cache/net-misc/clockspeed-0.62-r6
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-clockspeed ) net-dns/djbdns
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz http://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat.20081114
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef229290b8cb4f2dd05f34664ba18b56
diff --git a/metadata/md5-cache/net-misc/corkscrew-2.0 b/metadata/md5-cache/net-misc/corkscrew-2.0
index 0e0a8854f9f5..d29f1758b3bf 100644
--- a/metadata/md5-cache/net-misc/corkscrew-2.0
+++ b/metadata/md5-cache/net-misc/corkscrew-2.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=prepare
 DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a tool for tunneling SSH through HTTP proxies
-EAPI=3
+EAPI=4
 HOMEPAGE=http://www.agroman.net/corkscrew/
 KEYWORDS=amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=615750f65e04bb4d61fb488db4a9e905
+_md5_=7a72e7553cca8d9516d6946476bd8abc
diff --git a/metadata/md5-cache/net-misc/dahdi-2.5.0.2-r4 b/metadata/md5-cache/net-misc/dahdi-2.5.0.2-r4
index bbe1b874f0da..ade19388c255 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.5.0.2-r4
+++ b/metadata/md5-cache/net-misc/dahdi-2.5.0.2-r4
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.5.0.2.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.0.2.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.13.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c58ec2d39362a0f3814cc7da92bc9a5
diff --git a/metadata/md5-cache/net-misc/dahdi-2.6.1 b/metadata/md5-cache/net-misc/dahdi-2.6.1
index 1a965d6ff45a..2dff44736ee6 100644
--- a/metadata/md5-cache/net-misc/dahdi-2.6.1
+++ b/metadata/md5-cache/net-misc/dahdi-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-2.6.1.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.1.0.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ad92d092d0f2e2d06e09c6d10b1e141
diff --git a/metadata/md5-cache/net-misc/dhcp-3.1.2_p1 b/metadata/md5-cache/net-misc/dhcp-3.1.2_p1
index b6eec0fcac5d..6c3d2352d38b 100644
--- a/metadata/md5-cache/net-misc/dhcp-3.1.2_p1
+++ b/metadata/md5-cache/net-misc/dhcp-3.1.2_p1
@@ -8,5 +8,5 @@ LICENSE=as-is BSD
 RDEPEND=selinux? ( sec-policy/selinux-dhcp ) kernel_linux? ( sys-apps/net-tools )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-3.1.2p1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4dfbe279831f4be62a2dd928a331c106
diff --git a/metadata/md5-cache/net-misc/dhcp-3.1.3_p1 b/metadata/md5-cache/net-misc/dhcp-3.1.3_p1
index 6620c647e69e..2a622a316d42 100644
--- a/metadata/md5-cache/net-misc/dhcp-3.1.3_p1
+++ b/metadata/md5-cache/net-misc/dhcp-3.1.3_p1
@@ -8,5 +8,5 @@ LICENSE=as-is BSD
 RDEPEND=selinux? ( sec-policy/selinux-dhcp ) kernel_linux? ( sys-apps/net-tools )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-ESV.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8cb15f8886945f2665c2487920b9ab7
diff --git a/metadata/md5-cache/net-misc/dibbler-0.8.0 b/metadata/md5-cache/net-misc/dibbler-0.8.0
index 941325af6f9d..165204842d2b 100644
--- a/metadata/md5-cache/net-misc/dibbler-0.8.0
+++ b/metadata/md5-cache/net-misc/dibbler-0.8.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~hppa ~mips ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://klub.com.pl/dhcpv6/dibbler/dibbler-0.8.0-src.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ab9f8f9f01484a242e23d5ea66181182
diff --git a/metadata/md5-cache/net-misc/dropbear-0.52 b/metadata/md5-cache/net-misc/dropbear-0.52
index 2f8852f429f8..0e43d5838f71 100644
--- a/metadata/md5-cache/net-misc/dropbear-0.52
+++ b/metadata/md5-cache/net-misc/dropbear-0.52
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=zlib? ( sys-libs/zlib ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-0.52.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fab7ecae9abd020bd907540d27d2604e
diff --git a/metadata/md5-cache/net-misc/dropbear-0.52-r1 b/metadata/md5-cache/net-misc/dropbear-0.52-r1
index 967effcead6c..8e7bf5d0aeee 100644
--- a/metadata/md5-cache/net-misc/dropbear-0.52-r1
+++ b/metadata/md5-cache/net-misc/dropbear-0.52-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=zlib? ( sys-libs/zlib ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-0.52.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0db7f34aeddcc4453642f10dcc993c78
diff --git a/metadata/md5-cache/net-misc/dropbear-0.53.1 b/metadata/md5-cache/net-misc/dropbear-0.53.1
index 3949587000e4..104636c89492 100644
--- a/metadata/md5-cache/net-misc/dropbear-0.53.1
+++ b/metadata/md5-cache/net-misc/dropbear-0.53.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=zlib? ( sys-libs/zlib ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-0.53.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93a1e7d889322e7485c12731812ad475
diff --git a/metadata/md5-cache/net-misc/dropbear-2011.54 b/metadata/md5-cache/net-misc/dropbear-2011.54
index 8e4623dba030..13553e849d80 100644
--- a/metadata/md5-cache/net-misc/dropbear-2011.54
+++ b/metadata/md5-cache/net-misc/dropbear-2011.54
@@ -10,5 +10,5 @@ RDEPEND=static? ( zlib? ( sys-libs/zlib[static-libs] ) ) pam? ( virtual/pam ) !s
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2011.54.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2011.54.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32ba6105c56a77ce5362382ced644797
diff --git a/metadata/md5-cache/net-misc/dropbear-2012.55 b/metadata/md5-cache/net-misc/dropbear-2012.55
index 26b6999e3751..0cca760ddb8d 100644
--- a/metadata/md5-cache/net-misc/dropbear-2012.55
+++ b/metadata/md5-cache/net-misc/dropbear-2012.55
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) ) pam? ( virtual/pam ) pam? ( >=sys-a
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2012.55.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2012.55.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=238926eaf3b9d01ad8c8a4beb890c937
diff --git a/metadata/md5-cache/net-misc/fmirror-0.8.4-r2 b/metadata/md5-cache/net-misc/fmirror-0.8.4-r2
index a904b20494f2..39a641bf0c25 100644
--- a/metadata/md5-cache/net-misc/fmirror-0.8.4-r2
+++ b/metadata/md5-cache/net-misc/fmirror-0.8.4-r2
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/solaris/freeware/SOURCES/fmirror-0.8.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0707a69d11175ea2162199a583ec141
diff --git a/metadata/md5-cache/net-misc/freerdp-1.0.0 b/metadata/md5-cache/net-misc/freerdp-1.0.0
index 7a6e1a955523..1a110e88657a 100644
--- a/metadata/md5-cache/net-misc/freerdp-1.0.0
+++ b/metadata/md5-cache/net-misc/freerdp-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/FreeRDP/FreeRDP/freerdp-1.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c08c50782c1e9d1abce2aa5478f001f6
diff --git a/metadata/md5-cache/net-misc/freerdp-1.0.1 b/metadata/md5-cache/net-misc/freerdp-1.0.1
index ac753049f97b..7e532f6f2aec 100644
--- a/metadata/md5-cache/net-misc/freerdp-1.0.1
+++ b/metadata/md5-cache/net-misc/freerdp-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/FreeRDP/FreeRDP/freerdp-1.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0639f170d1e5644b52d50614f483489
diff --git a/metadata/md5-cache/net-misc/freerdp-1.0.1_p20120318 b/metadata/md5-cache/net-misc/freerdp-1.0.1_p20120318
index 85f45a1f71dc..dc04e2535cd5 100644
--- a/metadata/md5-cache/net-misc/freerdp-1.0.1_p20120318
+++ b/metadata/md5-cache/net-misc/freerdp-1.0.1_p20120318
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://github/FreeRDP/FreeRDP/freerdp-1.0.1_p20120318.tar.gz mirror://gentoo/freerdp-1.0.1_p20120318.tar.gz http://dev.gentoo.org/~floppym/distfiles/freerdp-1.0.1_p20120318.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de2f55c1b9933aa65f647e0d50a2a890
diff --git a/metadata/md5-cache/net-misc/freerdp-9999.1 b/metadata/md5-cache/net-misc/freerdp-9999.1
index e5bfaa81a65b..062e325ddca2 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999.1
+++ b/metadata/md5-cache/net-misc/freerdp-9999.1
@@ -7,5 +7,5 @@ IUSE=alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) directfb? ( dev-libs/DirectFB ) ffmpeg? ( virtual/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libxkbfile xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26e747a210200b50edf22ead9cb3fd62
diff --git a/metadata/md5-cache/net-misc/guidedog-1.1 b/metadata/md5-cache/net-misc/guidedog-1.1
index 0adc5261d4af..13a9ef85b85f 100644
--- a/metadata/md5-cache/net-misc/guidedog-1.1
+++ b/metadata/md5-cache/net-misc/guidedog-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/PyQt4 kde-base/pykde4 net-firewall/iptables >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.simonzone.com/software/guidedog/guidedog-1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f2c111c586b227809d7fdb907a4c8af3
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8 b/metadata/md5-cache/net-misc/hotot-0.9.8
index 4499bc1438df..730fc6e31e40 100644
--- a/metadata/md5-cache/net-misc/hotot-0.9.8
+++ b/metadata/md5-cache/net-misc/hotot-0.9.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=gtk? ( dev-python/pywebkitgtk ) qt4? ( x11-libs/qt-webkit:4 kde? ( kde-base/kdelibs ) ) gtk? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=https://github.com/shellex/Hotot/tarball/c14a972356 -> hotot-0.9.8.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
 _md5_=7b11d79c6d7faaddb43ddb8dbfc9fb11
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8.4 b/metadata/md5-cache/net-misc/hotot-0.9.8.4
index af579940e100..7375ed1c3484 100644
--- a/metadata/md5-cache/net-misc/hotot-0.9.8.4
+++ b/metadata/md5-cache/net-misc/hotot-0.9.8.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=gtk? ( dev-python/pywebkitgtk ) qt4? ( x11-libs/qt-webkit:4 kde? ( kde-base/kdelibs ) ) gtk? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=https://github.com/shellex/Hotot/tarball/560e6b286c -> hotot-0.9.8.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
 _md5_=06af86e48965f219bee911424c25b8b2
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8.7 b/metadata/md5-cache/net-misc/hotot-0.9.8.7
index 8ced8b5b6ec1..64789d27cca1 100644
--- a/metadata/md5-cache/net-misc/hotot-0.9.8.7
+++ b/metadata/md5-cache/net-misc/hotot-0.9.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=gtk? ( dev-python/pywebkitgtk ) qt4? ( x11-libs/qt-webkit:4 kde? ( kde-base/kdelibs ) ) gtk? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=https://github.com/shellex/Hotot/tarball/0.9.8.7 -> hotot-0.9.8.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
 _md5_=ad10c711b9bb4f4f79dafecbaf9bae74
diff --git a/metadata/md5-cache/net-misc/hotot-9999 b/metadata/md5-cache/net-misc/hotot-9999
index 4551d18ce07c..ab1eef1edd66 100644
--- a/metadata/md5-cache/net-misc/hotot-9999
+++ b/metadata/md5-cache/net-misc/hotot-9999
@@ -7,5 +7,5 @@ IUSE=chrome gtk kde qt4
 LICENSE=LGPL-3
 RDEPEND=gtk? ( dev-python/pywebkitgtk ) qt4? ( x11-libs/qt-webkit:4 kde? ( kde-base/kdelibs ) ) gtk? ( =dev-lang/python-2* )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5a88312cadee80c5c23bb00f016f4c3
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-5.5.1 b/metadata/md5-cache/net-misc/hylafaxplus-5.5.1
index 732041ae9df6..ca19ea02e328 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-5.5.1
+++ b/metadata/md5-cache/net-misc/hylafaxplus-5.5.1
@@ -8,5 +8,5 @@ LICENSE=hylafaxplus
 RDEPEND=>=sys-libs/zlib-1.1.4 !net-misc/hylafax app-text/ghostscript-gpl virtual/mta media-libs/tiff[jbig?] virtual/jpeg jbig? ( media-libs/jbigkit ) sys-apps/gawk ldap? ( net-nds/openldap ) pam? ( virtual/pam ) mgetty? ( net-dialup/mgetty[-fax] ) net-mail/metamail !net-dialup/sendpage
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-5.5.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1dc707ee597a9fc3f70b075613dc205
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-5.5.1-r1 b/metadata/md5-cache/net-misc/hylafaxplus-5.5.1-r1
index 30995194cca8..13e826f4edaf 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-5.5.1-r1
+++ b/metadata/md5-cache/net-misc/hylafaxplus-5.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=hylafaxplus
 RDEPEND=>=sys-libs/zlib-1.1.4 !net-misc/hylafax app-text/ghostscript-gpl virtual/mta media-libs/tiff[jbig?] virtual/jpeg jbig? ( media-libs/jbigkit ) sys-apps/gawk ldap? ( net-nds/openldap ) pam? ( virtual/pam ) mgetty? ( net-dialup/mgetty[-fax] ) net-mail/metamail !net-dialup/sendpage
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-5.5.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a11f788bcca515c241207287fcdc372a
diff --git a/metadata/md5-cache/net-misc/ipsvd-1.0.0-r1 b/metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
index 0d70d8314dd7..edd87f4b8e67 100644
--- a/metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
+++ b/metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/ipsvd/ipsvd-1.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=821d04a30159fc96b55dba06c779a6d8
diff --git a/metadata/md5-cache/net-misc/iputils-20101006-r2 b/metadata/md5-cache/net-misc/iputils-20101006-r2
index 3f40b908b423..7cf0b27af304 100644
--- a/metadata/md5-cache/net-misc/iputils-20101006-r2
+++ b/metadata/md5-cache/net-misc/iputils-20101006-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2 mirror://gentoo/iputils-s20101006-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e769db570bbf0cf8b1d4a64f094c150b
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 8fa7e9a4cf98..efde4f29977e 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -7,5 +7,5 @@ IUSE=doc idn ipv6 SECURITY_HAZARD ssl static
 LICENSE=BSD
 RDEPEND=!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3eb8b0aa0e237fc5aaa7d938f24eb93e
diff --git a/metadata/md5-cache/net-misc/italc-2.0.0 b/metadata/md5-cache/net-misc/italc-2.0.0
index 0f396783b4f4..ba63f86f2920 100644
--- a/metadata/md5-cache/net-misc/italc-2.0.0
+++ b/metadata/md5-cache/net-misc/italc-2.0.0
@@ -9,5 +9,5 @@ PROPERTIES=interactive
 RDEPEND=dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/italc/italc-2.0.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccf5f363d2a00670a880be638e9a0f90
diff --git a/metadata/md5-cache/net-misc/knemo-0.7.3 b/metadata/md5-cache/net-misc/knemo-0.7.3
index 386fae12dcd1..40729a9a9978 100644
--- a/metadata/md5-cache/net-misc/knemo-0.7.3
+++ b/metadata/md5-cache/net-misc/knemo-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/systemsettings-4.4:4[aqua=] sys-apps/net-tools dev-libs/libnl:1.1 x11-libs/qt-sql[sqlite] wifi? ( net-wireless/wireless-tools ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_rw(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/12956-knemo-0.7.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f3b5329ab05e2ed0733f4331091ed84d
diff --git a/metadata/md5-cache/net-misc/knutclient-1.0.4 b/metadata/md5-cache/net-misc/knutclient-1.0.4
index ad57c2498b47..1e5c6470389e 100644
--- a/metadata/md5-cache/net-misc/knutclient-1.0.4
+++ b/metadata/md5-cache/net-misc/knutclient-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/knutclient-1.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9b09346db196c700c4a3621c5f32a43f
diff --git a/metadata/md5-cache/net-misc/ksshaskpass-0.5.3 b/metadata/md5-cache/net-misc/ksshaskpass-0.5.3
index 5d61087b969b..70533bd677a1 100644
--- a/metadata/md5-cache/net-misc/ksshaskpass-0.5.3
+++ b/metadata/md5-cache/net-misc/ksshaskpass-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/openssh >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=38b06e69c75d91869618a519876101a8
diff --git a/metadata/md5-cache/net-misc/kvpnc-0.9.6a b/metadata/md5-cache/net-misc/kvpnc-0.9.6a
index 4d53d775a7b7..0d89982878e9 100644
--- a/metadata/md5-cache/net-misc/kvpnc-0.9.6a
+++ b/metadata/md5-cache/net-misc/kvpnc-0.9.6a
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( dev-libs/libgcrypt ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://download.gna.org/kvpnc/kvpnc-0.9.6a-kde4.tar.bz2 http://download.gna.org/kvpnc/kvpnc-0.9.6-kde4-locale.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7b4759355f18b67492ecaa120bb28def
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.4.99
index 569a81b221d8..953fe690a926 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6d15d8649c7d471c8b6128a1f13469c
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.0
index 207eac121b58..919e851e3702 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 x11-libs/qt-declarative
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=96965eea6f5b69b63f8e304fe8ed3e99
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.60
index d9c5ae97089f..a307cfa8f147 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 x11-libs/qt-declarative
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f727bd28266a119f37333306307dd765
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.65
index 6f0cdd004cbd..4aacc4a74697 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 x11-libs/qt-declarative
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9d262e40293a09545168c96f1d2a7c1
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.70
index 68683140784d..897595f3c16a 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qt-declarative
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a63203985367929635ca7dd2b0e2a12b
diff --git a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-9999 b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-9999
index 4a21ef4514be..4a102478d0e5 100644
--- a/metadata/md5-cache/net-misc/leechcraft-advancednotifications-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-advancednotifications-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-declarative
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ede22e55b7711bc1ead4d24bf44fd95
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-anhero-0.4.99
index af4ea9bfe462..6bccc3a805ad 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 >=kde-base/kdelibs-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a0290f8c47dc1c0650b308655e76e0c
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.0
index c209d3289554..8b7eb7419fe4 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 >=kde-base/kdelibs-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94ad95c232be89430fbade1ea305af4f
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.60
index 8f15589fded2..68a413ee1f63 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 >=kde-base/kdelibs-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59efe25acc0b82a92b3b70ecf23383b6
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.65
index f5e78a71f2ef..30f5ed16c4f2 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 >=kde-base/kdelibs-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f157763367b3527ac47d3796cab388c
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.70
index 5c679b79b29b..660db68592f0 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 >=kde-base/kdelibs-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f50a7009d7977bbef7dfa5f67a5fbce8
diff --git a/metadata/md5-cache/net-misc/leechcraft-anhero-9999 b/metadata/md5-cache/net-misc/leechcraft-anhero-9999
index dc90a902ce86..d5800ac644bf 100644
--- a/metadata/md5-cache/net-misc/leechcraft-anhero-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-anhero-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 >=kde-base/kdelibs-4.2.0
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e521d9c20532906f4a161c2fc84df8c6
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.4.99
index 39b6aff7deab..49cf9ab69602 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9832ffb8ab463900f15e3f1c021f2298
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.0
index 28a6387dd5a8..61b4eb166702 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ecb533b496d496489dc9ebec1a79522
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.60
index 54aa27c5bc6c..5660a39c0040 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9047dc51e0443bc24461f5291a27d66a
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.65
index 14feca975a67..af697d8bff37 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0cb89fe68d076ce58810957e6f698dc9
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.70
index 98c5fb29d00b..85c0cc5396f0 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10b95af7dd1c87fd466d6e40b5422d42
diff --git a/metadata/md5-cache/net-misc/leechcraft-auscrie-9999 b/metadata/md5-cache/net-misc/leechcraft-auscrie-9999
index 27115cbad972..0d36b2ea465c 100644
--- a/metadata/md5-cache/net-misc/leechcraft-auscrie-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-auscrie-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d29c91d25db5c543e09c6bbb9eca6278
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-core-0.4.99
index bf1a1b04eaa3..31b47fde555e 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-core-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.39 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=031b0ff5e04c9728165081dd44819805
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-core-0.5.0
index 5837006c1ad1..cc589600a22a 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-core-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.39 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbdaecd36e8c9495bfed71d05ceebbec
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-core-0.5.60
index bca73761bb3a..92380dadbd62 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-core-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.46 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d8fcff25f389bcb8ddf79dec6f0e09f
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-core-0.5.65
index 6818ae298472..feb58759055c 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-core-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.46 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3a3570edfd965016ad53b832a38636c
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-core-0.5.70
index ae9305a77bcb..15cea6663297 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-core-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.46 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dfe2baf7672c4d91f6b4188faba81b9a
diff --git a/metadata/md5-cache/net-misc/leechcraft-core-9999 b/metadata/md5-cache/net-misc/leechcraft-core-9999
index 53cdc6819938..cb13c052a972 100644
--- a/metadata/md5-cache/net-misc/leechcraft-core-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-core-9999
@@ -7,5 +7,5 @@ IUSE=debug +sqlite postgres
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.46 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-script x11-libs/qt-sql[postgres?,sqlite?] x11-libs/qt-svg
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d74e6e3b8a332ffa9b581c0bb10659dd
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-cstp-0.4.99
index 229e93656e22..d56d39b9d3cf 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a65d36401f2bfd1c966f25cb02ad389e
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.0
index 42fb189494f3..6be58e1b36bb 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d94fc96eedb44faec81e170a692fcc06
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.60
index 16bf0194af9b..6f145136de87 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9f6dabff879f7f1995b8a128a33e5fe6
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.65
index a02adae4a69d..d99b5374c8e4 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b96b5ee1f4e85eee01d87aac7e9aaf4
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.70
index 4e5d95c99920..cd1c834d2b23 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87b663413d7ae60fde7d90515c7e87b1
diff --git a/metadata/md5-cache/net-misc/leechcraft-cstp-9999 b/metadata/md5-cache/net-misc/leechcraft-cstp-9999
index c6f64937c437..15adf30e40ba 100644
--- a/metadata/md5-cache/net-misc/leechcraft-cstp-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-cstp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8d56f28600c495bc961d0bf7dff3f68
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.4.99
index 1d6bdbdabb4c..2a13164f20ca 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 x11-libs/qt-dbus
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e82fcead6ad207c33efc31f77bc4f9eb
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.0
index 3c31aae1f449..93fe4d80590d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 x11-libs/qt-dbus
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8cd30e274758f7073cd463054f39fda2
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.60
index 8ffa71fd137e..eb1379b7d87d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 x11-libs/qt-dbus
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9d3a94ccb5d86106e1aa06a7b0a05fb
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.65
index b76ba53e1f03..c0fba5f66884 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 x11-libs/qt-dbus
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2e58b2bab4e6ee75f5b802a38f79029
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.70
index 0911a0143590..f121b2024737 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/qt-dbus
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b07ff3723092bcf261852df476dfc8e
diff --git a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-9999 b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-9999
index 8bffc879864f..9402836d86aa 100644
--- a/metadata/md5-cache/net-misc/leechcraft-dbusmanager-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-dbusmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/qt-dbus
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1cd20801f8cfe8454c20073502cf5c10
diff --git a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.60
index b4338910e955..25b0dfc70645 100644
--- a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 x11-libs/libqxt
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99c62fa0be8c1ee846f4bc60c628cd73
diff --git a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.65
index dd91b7dbf42a..3eff0c9351f7 100644
--- a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 x11-libs/libqxt
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6614abcf84e7c12352e9f636055601fd
diff --git a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.70
index 4c87ce23ac55..0dee3354b583 100644
--- a/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-gacts-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 x11-libs/libqxt
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb71e6bb774c0fa6e54960fefca6c108
diff --git a/metadata/md5-cache/net-misc/leechcraft-gacts-9999 b/metadata/md5-cache/net-misc/leechcraft-gacts-9999
index b46b9feccfbb..89fc0c3e130f 100644
--- a/metadata/md5-cache/net-misc/leechcraft-gacts-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-gacts-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 x11-libs/libqxt
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01499c116d9559b28945ad352682dbbe
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-glance-0.4.99
index 07fe91b29e54..effc5c36710d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35ed5c4eae5d423ce5830d2568a7717b
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.0
index 4bfbffd3c99a..7d34ced0cd90 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c67d62b350f677ae2e0265707b4c3271
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.60
index 35a0370825f2..0676097907aa 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd85488dbc21a7d6356fc72cc4d3d15c
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.65
index 1802cd6779d3..b9396ac30153 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee2af1f7edd21ec9a25401d63848e39d
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.70
index 6e00d6bc6d70..17fdc7bf23a4 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a42f9d6660d8417379bcadee339ef64
diff --git a/metadata/md5-cache/net-misc/leechcraft-glance-9999 b/metadata/md5-cache/net-misc/leechcraft-glance-9999
index 5bfd7f9bf891..2f776f01106c 100644
--- a/metadata/md5-cache/net-misc/leechcraft-glance-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-glance-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53b2635a00f10d0007593c712507ca16
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.4.99
index fb305d733cd0..2dbcbb683cf0 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12c8292d0b4745cf96f8a98d7158358a
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.0
index 669135e08c55..d63a20e57c8c 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d57c1202447611111afc58c35c634afa
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.60
index 814cd4ed45b5..6a57a2aaeb0b 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c161b32f2d067a8cd0d914d8daa94f7d
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.65
index 2d46451b3f68..a615ebd3b0c2 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7448c8416cab60d8f42042c33c6e1fa
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.70
index 62fd6ce9c3c4..4849f3a1c547 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 virtual/leechcraft-search-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef1bdc01d82d260c3faaef274255a996
diff --git a/metadata/md5-cache/net-misc/leechcraft-historyholder-9999 b/metadata/md5-cache/net-misc/leechcraft-historyholder-9999
index 42e756d83b00..84c1a66ef49d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-historyholder-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-historyholder-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 virtual/leechcraft-search-show
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f829dce03dc788e6e71a91ac4dddb74
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.4.99
index 53835fb6c860..4dfc2e3e6153 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 >=x11-libs/qt-webkit-4.6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2d333540a2dfcfb8c91f5e546571918
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.0
index 9a0c66f9436b..25546764c9db 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 >=x11-libs/qt-webkit-4.6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2af417321b7ff3065330a82a229c0231
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.60
index 67f9052edb62..9a84526d1aed 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 >=x11-libs/qt-webkit-4.6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf7cb22ab5e74828d0c381e47dcfd8e5
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.65
index eedfe4885de8..e0e7f86ccf33 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 >=x11-libs/qt-webkit-4.6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f94e81da03268812d92ad1ff67f54536
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.70
index 5ea861538992..c3330d2fb6cb 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 >=x11-libs/qt-webkit-4.6
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7b6e3fde110dc9a5db1fd15e22bc2d81
diff --git a/metadata/md5-cache/net-misc/leechcraft-kinotify-9999 b/metadata/md5-cache/net-misc/leechcraft-kinotify-9999
index 0e2a76a354fb..e1e547dfb543 100644
--- a/metadata/md5-cache/net-misc/leechcraft-kinotify-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-kinotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 >=x11-libs/qt-webkit-4.6
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f112ed79d119a277faaf58ae4380e5c4
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.4.99
index 3864a04d9442..3b8fc5a7de3f 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=092110b169250f0e51c10e823c2d061e
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.0
index dc6b9ae8477a..0f427199d49d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f5680a69924b3ab1e23348dcbf47839
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.60
index f4c27e2a1463..ebda82f0b4d3 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27ef5f62e3282df98dcedb5295ca0565
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.65
index 07766a7ed13b..3d0279915fb2 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbfcf9960bbf736d739911ff9478d651
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.70
index 487ad2c1467e..2474ef41ec23 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5334e4715ef8d6ae93a971a87d88de6
diff --git a/metadata/md5-cache/net-misc/leechcraft-knowhow-9999 b/metadata/md5-cache/net-misc/leechcraft-knowhow-9999
index e029f74d7ed5..6faf3639d8b3 100644
--- a/metadata/md5-cache/net-misc/leechcraft-knowhow-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-knowhow-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee50b44ad848664b63e04ca365e1fb19
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-lackman-0.4.99
index 20f6ba71365d..70bc2d5456de 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=193e2bc21653af54d892626f5fdbe176
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.0
index 871193dc0302..a1db68054445 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4e43701ffc146d129d57e8c07ded9cd
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.60
index b740c31b2752..912e7839d8c9 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=effa8cef36e248ea791787c17c20145b
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.65
index 7a9c00660c22..a449a1ca93f7 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d560f7f2b9acdb99bc76b2f93a78830
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.70
index 780cf1605959..e14643ed996d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52616d9ecea1b37bb913befdb8572b37
diff --git a/metadata/md5-cache/net-misc/leechcraft-lackman-9999 b/metadata/md5-cache/net-misc/leechcraft-lackman-9999
index ffeac8fb5b4f..e8e185cb9cd5 100644
--- a/metadata/md5-cache/net-misc/leechcraft-lackman-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-lackman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 >=x11-libs/qt-webkit-4.6 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c21a4d1f963db48bef58f616bbdfb4df
diff --git a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.60
index 2835a8353b7e..29ba879d5594 100644
--- a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.60 sys-power/upower x11-libs/qwt:6 x11-libs/qt-dbus virtual/leechcraft-trayarea
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01427be1b306e95be5f6281fc9b4acd9
diff --git a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.65
index 404031b0ae2a..c925d9111c33 100644
--- a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.65 sys-power/upower x11-libs/qwt:6 x11-libs/qt-dbus virtual/leechcraft-trayarea
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2b834c626404b7e25c3c435940a476a
diff --git a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.70
index 22ed348d0538..681afd53435d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-liznoo-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.70 sys-power/upower x11-libs/qwt:6 x11-libs/qt-dbus virtual/leechcraft-trayarea
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d449f36e1edc6d46bcf8f89921d24a4
diff --git a/metadata/md5-cache/net-misc/leechcraft-liznoo-9999 b/metadata/md5-cache/net-misc/leechcraft-liznoo-9999
index 96fe143b9610..477bf69bb2a3 100644
--- a/metadata/md5-cache/net-misc/leechcraft-liznoo-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-liznoo-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-9999 sys-power/upower x11-libs/qwt:6 x11-libs/qt-dbus virtual/leechcraft-trayarea
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc159a7b47cd60e4a425725d28f85cd8
diff --git a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.60
index 66e883ae9ce0..25a67f613161 100644
--- a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb2648a7161626ebee7a92e4bc36a5bf
diff --git a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.65
index 5fac08fe977b..aafac9406f1e 100644
--- a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf8801d1f0bf5e2e799dcee4a3f6bac2
diff --git a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.70
index 986d604d3189..81c155b716f7 100644
--- a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4202797c21c41df4e665166ab96ea28d
diff --git a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-9999 b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-9999
index f891481455fb..cb2266cb5fff 100644
--- a/metadata/md5-cache/net-misc/leechcraft-netstoremanager-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-netstoremanager-9999
@@ -7,5 +7,5 @@ IUSE=+yandexdisk
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd49e8a8a6bb6cc332c7c6c91de93135
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-newlife-0.4.99
index c204154fc889..f834f9c63161 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26f9d86c0e1e8da8a45432c3b49afa4f
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.0
index 6962cb9f5bee..5d544cb59e05 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ea9f008f34511d9928d87d4f34a96e8
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.60
index 08683a1c9d73..972545257ec9 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b996453521055c194490be2132070f7a
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.65
index 0d66b5ac05aa..e0b0dc6972c7 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff28048e424ee91fdd771054a0b005eb
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.70
index 57ba362c685b..c044c57bc55b 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4aea0124d73cc4bab99cd05d58460a02
diff --git a/metadata/md5-cache/net-misc/leechcraft-newlife-9999 b/metadata/md5-cache/net-misc/leechcraft-newlife-9999
index 30984a5e5efc..266933795839 100644
--- a/metadata/md5-cache/net-misc/leechcraft-newlife-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-newlife-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98130a9bc3b6f715170f5771113b4502
diff --git a/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.65
index e6ac67f5e9b4..bcaab67d59b2 100644
--- a/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 >=x11-libs/qt-gui-4.8
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=65fc38324e125a7d2711ece0fb461676
diff --git a/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.70
index f1fbd74931fb..2665036a922f 100644
--- a/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-otlozhu-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 >=x11-libs/qt-gui-4.8
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e061a85a68e088d976aff58c4ee2f3e3
diff --git a/metadata/md5-cache/net-misc/leechcraft-otlozhu-9999 b/metadata/md5-cache/net-misc/leechcraft-otlozhu-9999
index f4d55fd18697..acdcc01d6f46 100644
--- a/metadata/md5-cache/net-misc/leechcraft-otlozhu-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-otlozhu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 >=x11-libs/qt-gui-4.8
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4d66c60d0bc54a4d13bdaa111493916
diff --git a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.60
index 94628d343e52..59fded05a3d9 100644
--- a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c278d7ace727fcc07a36f7586a2b81a7
diff --git a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.65
index 47f855702ae4..24fdb77873c8 100644
--- a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=15cfdc0af111f8cad5c2f7ab2799e16f
diff --git a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.70
index 005092545d6a..8e5304a1a99d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-pintab-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2c4b1b29cf019af50b4549fd3f78136
diff --git a/metadata/md5-cache/net-misc/leechcraft-pintab-9999 b/metadata/md5-cache/net-misc/leechcraft-pintab-9999
index fbdde5c9e742..05b52eb634d6 100644
--- a/metadata/md5-cache/net-misc/leechcraft-pintab-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-pintab-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a2b17102abc1c26a41017650f7876fa
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.4.99
index 0ada04439aef..67ae71acef9d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=61a93c4a6813019d21addc457b5827f9
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.0
index 57997a6e7645..87b017db5c83 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d7e40681d1d8a422709bc1cec516098
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.60
index 4262280a2782..52e75d2176e9 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0615271f44214de97d5cef2b86be0e88
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.65
index e34f90c1c04d..d458580f3d30 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11d12988d86080a9e3d5cfe32b06564e
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.70
index 0ee9896d2f74..2882089350d7 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 dev-libs/qrosscore
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2e2e237410bc34546b445c10783f5967
diff --git a/metadata/md5-cache/net-misc/leechcraft-qrosp-9999 b/metadata/md5-cache/net-misc/leechcraft-qrosp-9999
index 1d05d8d6f286..864ff09716c8 100644
--- a/metadata/md5-cache/net-misc/leechcraft-qrosp-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-qrosp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 dev-libs/qrosscore
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c66746eddb13ff703faa1d61a1a7cec5
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-secman-0.4.99
index 868c9e13e360..8fab45ee8bc1 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ade1f35feababa11282e328fa3a171cb
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.0
index 0cd09c99b7db..683a1d410955 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35166aa61b1dc832436a5044f11ff688
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.60
index c7f0b24647cc..30565de35542 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71d1d2ce0bc2e6e414c9c9b8b47634a1
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.65
index ef9af4492ccc..5b4e4b38768a 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c268477b0c7b5aa029ed199f095550ea
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.70
index 86441dda1290..ce409e61f9dc 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3a1c3e69ad34cc9662bf22d4608f965
diff --git a/metadata/md5-cache/net-misc/leechcraft-secman-9999 b/metadata/md5-cache/net-misc/leechcraft-secman-9999
index ee7429566e77..52ebf18cae6e 100644
--- a/metadata/md5-cache/net-misc/leechcraft-secman-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-secman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1434233123e9279d622b41b0e5bfe4d
diff --git a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.60
index aafbeb6da3a7..695ec790adeb 100644
--- a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=016549e0419b053f48c702b82e92dac2
diff --git a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.65
index 1bf4d769a1d6..79ae3d0df800 100644
--- a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=06e97b761d33e75df74c45cbf007962c
diff --git a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.70
index 13b836f5f535..52c1f9e72a14 100644
--- a/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-sidebar-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c5daf38f2902ba74a8fe7acb0d7e06a
diff --git a/metadata/md5-cache/net-misc/leechcraft-sidebar-9999 b/metadata/md5-cache/net-misc/leechcraft-sidebar-9999
index 3ba4aa04fda3..80c159b5a8fe 100644
--- a/metadata/md5-cache/net-misc/leechcraft-sidebar-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-sidebar-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f41e4286c8c6ad93c179a284592360e1
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-summary-0.4.99
index d2239faaa66c..acaf7261b928 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a14ce38ae0a28e161e84cc542de54c2
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.0
index 0a492974b9d3..e9f5d00f1f53 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ec4a6bc4a3e77e0b17f08e886443562
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.60
index 61931307550a..4f8468f34533 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f91a4fbcccc54e972c05a474234b446b
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.65
index 1eefefdc7ca3..502f17e7af1c 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2b1c0f9c83a021bbd2856990d79919d3
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.70
index 43e2f187f99f..d44abb4c93b0 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a5eed1e2607be1153e3628ee0d7c427
diff --git a/metadata/md5-cache/net-misc/leechcraft-summary-9999 b/metadata/md5-cache/net-misc/leechcraft-summary-9999
index d0e241217eb4..2cd3f2fa7a4d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-summary-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-summary-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9f99bc04152d2b520f0d570a14936b10
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.4.99
index 3cece05814c6..571ce6dfba34 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99e4f9a0fb130cec17c39a4515390091
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.0
index 2504e813c69d..e75e68f4b443 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=472581202691be92044e73c473246be1
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.60
index 0cefd5032382..bf4c53247c06 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4711c8826cf24f7cb08728764c10317a
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.65
index f0044af14792..4f5b9e13d448 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ac77290cdcabeae6d42d0d6e980f20b
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.70
index 9a82ba8f4d68..f9d169b1e6c4 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c3b67fb44806fae68e91efb5c8ad71d
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabpp-9999 b/metadata/md5-cache/net-misc/leechcraft-tabpp-9999
index 17a871d170b0..7764a852821f 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabpp-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-tabpp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d55ef2c5e5dfd51b54df6c021855db9
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.60
index 95c454a43677..c8fd0e247ac2 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60fdffab8495b14838dc5c4899147387
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.65
index aa440f4ba051..41c674e03ae4 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0dc6d8aa37b5827bb012ef3668e16097
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.70
index b9e6449e3ee6..8d78a58096cd 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a708eafe93f7b6fae898ace5c6c661d3
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-9999 b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-9999
index 7557c40c56f6..8e915891b288 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-tabsessmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND==net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25fdc0dd8f8035e104c8f11cc9ac2fd0
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.4.99 b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.4.99
index 89f1b459970e..e3b7b6a3465b 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.4.99
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54d34fed2624d572c46af47a1750038b
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.0 b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.0
index 198bc9c3d7df..1ff0ad58ed55 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.0
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e8a1981056c04290dba631cd0245d67c
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.60 b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.60
index 864091455d27..df644ae92a2d 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.60
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7975b6019fe37162fe498ce4a35e3e2c
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.65 b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.65
index 0ef523153a47..883c8671ba54 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.65
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45f75ed96db91d04020f6fa3148953fe
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.70 b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.70
index 56d565f3680f..87953281c9de 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.70
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fffe82c3166bb3e64183baf42ae10a1c
diff --git a/metadata/md5-cache/net-misc/leechcraft-tabslist-9999 b/metadata/md5-cache/net-misc/leechcraft-tabslist-9999
index ea17c90e4a06..7a4d478143d1 100644
--- a/metadata/md5-cache/net-misc/leechcraft-tabslist-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-tabslist-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b39c01448f9fbc3cc68e695e2a5659f9
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1
index 0e5c2807db61..48c0944e165c 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1cc754132e3ce714e0fcb9364a3d8ddf
diff --git a/metadata/md5-cache/net-misc/mDNSResponder-212.1 b/metadata/md5-cache/net-misc/mDNSResponder-212.1
index f4fd7188a1bf..7d2ac820685a 100644
--- a/metadata/md5-cache/net-misc/mDNSResponder-212.1
+++ b/metadata/md5-cache/net-misc/mDNSResponder-212.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=!net-dns/avahi !sys-auth/nss-mdns java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-212.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04f07e8f88068ff75764fe22a31dd928
diff --git a/metadata/md5-cache/net-misc/mDNSResponder-320.10.80 b/metadata/md5-cache/net-misc/mDNSResponder-320.10.80
index 4a93584368b2..0a390e1bc768 100644
--- a/metadata/md5-cache/net-misc/mDNSResponder-320.10.80
+++ b/metadata/md5-cache/net-misc/mDNSResponder-320.10.80
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=!net-dns/avahi[mdnsresponder-compat] !sys-auth/nss-mdns java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-320.10.80.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=266c8995a1fe708c9c155ec61020fad4
diff --git a/metadata/md5-cache/net-misc/memcached-1.3.3-r4 b/metadata/md5-cache/net-misc/memcached-1.3.3-r4
index fe98b3fe4b10..5986b42a26e1 100644
--- a/metadata/md5-cache/net-misc/memcached-1.3.3-r4
+++ b/metadata/md5-cache/net-misc/memcached-1.3.3-r4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.3.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9eba3123b02c7e296a3e21650aea6136
diff --git a/metadata/md5-cache/net-misc/memcached-1.3.3-r5 b/metadata/md5-cache/net-misc/memcached-1.3.3-r5
index 9346faa8b87b..36c2c33048f3 100644
--- a/metadata/md5-cache/net-misc/memcached-1.3.3-r5
+++ b/metadata/md5-cache/net-misc/memcached-1.3.3-r5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.3.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa55454c7245287c693b49e921ef5b4c
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.0-r2 b/metadata/md5-cache/net-misc/memcached-1.4.0-r2
index 115a3c4b2107..4b9e33988b7b 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.0-r2
+++ b/metadata/md5-cache/net-misc/memcached-1.4.0-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef3b82f6ed1716676b61d01702eba9de
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.0-r3 b/metadata/md5-cache/net-misc/memcached-1.4.0-r3
index ade406de0490..bf1d6563ed7f 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.0-r3
+++ b/metadata/md5-cache/net-misc/memcached-1.4.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f43a3ea71ac25e4d2fc955b636dcbd5c
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.1-r1 b/metadata/md5-cache/net-misc/memcached-1.4.1-r1
index 06ca4424981c..6e79b8b5fde4 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.1-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2ea59165f410d9dd8493223df18702a
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.10-r1 b/metadata/md5-cache/net-misc/memcached-1.4.10-r1
index c84f1b9b6f24..a43199f01354 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.10-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.10-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.10.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e40b061260ac203fda66146baa554bf8
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.11 b/metadata/md5-cache/net-misc/memcached-1.4.11
index 9b78031150ff..44180b4cf1c3 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.11
+++ b/metadata/md5-cache/net-misc/memcached-1.4.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.11.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f76bbde5d2d7ca812d9cfa9561abdee8
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.13 b/metadata/md5-cache/net-misc/memcached-1.4.13
index abe225cddaf0..b492db6f4e48 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.13
+++ b/metadata/md5-cache/net-misc/memcached-1.4.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6bf40aba5d6539dbc0bcd019ce8c9061
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.2-r1 b/metadata/md5-cache/net-misc/memcached-1.4.2-r1
index ff89f69b0f14..e89bdceb12df 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.2-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb0f71eb3250fd784333783959810cd5
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.4-r1 b/metadata/md5-cache/net-misc/memcached-1.4.4-r1
index 320a67844cd8..24b2610b0586 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.4-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=073dd7284aa58f124621d92299f4f2cd
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.5-r1 b/metadata/md5-cache/net-misc/memcached-1.4.5-r1
index f6d2692b5958..414b4f5fea1d 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.5-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fe1f63261d8c8ae3e1ecb719db1e40c
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.7-r1 b/metadata/md5-cache/net-misc/memcached-1.4.7-r1
index 8ed8fb98ab65..00eba01a748b 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.7-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bbd39d93fc4d0c96863a32e6747ce9d
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.8-r1 b/metadata/md5-cache/net-misc/memcached-1.4.8-r1
index 7e140b6912f4..fd1d83fc3906 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.8-r1
+++ b/metadata/md5-cache/net-misc/memcached-1.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c1d880f5583e67a9d6aaa561a5efa2b
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r4 b/metadata/md5-cache/net-misc/mico-2.3.13-r4
index 6a1e5a79024f..c6bd8ddaf9c9 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r4
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r4
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz mirror://gentoo/mico-2.3.13-gentoo-patches-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=622f93b6d32c1ba0c2984568bc8ede7e
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r5 b/metadata/md5-cache/net-misc/mico-2.3.13-r5
index 10a802152238..0e8a53a60a13 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r5
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r5
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz http://dev.gentoo.org/~haubi/distfiles/mico-2.3.13-gentoo-patches-0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34c46e0bbd643ae4b0f3b4a48ed5ddd2
diff --git a/metadata/md5-cache/net-misc/mico-9999 b/metadata/md5-cache/net-misc/mico-9999
index 03a546583132..e4b161c29177 100644
--- a/metadata/md5-cache/net-misc/mico-9999
+++ b/metadata/md5-cache/net-misc/mico-9999
@@ -9,5 +9,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~haubi/distfiles/mico-9999-gentoo-patches-20110526.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	darcs	04f63caa2ef9dbb662f5b5fcd80c2c30	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	darcs	04f63caa2ef9dbb662f5b5fcd80c2c30	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e83254fdbb058ec4c18ad0c57d62911c
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r9 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r9
index fa6758f3f91b..8a12f37ba0e0 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r9
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r9
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a98d38a3fb2fb7828ae31f07d67ea77
diff --git a/metadata/md5-cache/net-misc/netkit-timed-0.17-r7 b/metadata/md5-cache/net-misc/netkit-timed-0.17-r7
index 15aeb38185fd..7646f67e5b39 100644
--- a/metadata/md5-cache/net-misc/netkit-timed-0.17-r7
+++ b/metadata/md5-cache/net-misc/netkit-timed-0.17-r7
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-timed-0.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00490376461200302f9b3107e343e7f4
diff --git a/metadata/md5-cache/net-misc/netkit-timed-0.17-r8 b/metadata/md5-cache/net-misc/netkit-timed-0.17-r8
index 6759c259ac3e..0417de6583c5 100644
--- a/metadata/md5-cache/net-misc/netkit-timed-0.17-r8
+++ b/metadata/md5-cache/net-misc/netkit-timed-0.17-r8
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~mips ~ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-timed-0.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9754e38c8a12ad0d55e87326de46cd01
diff --git a/metadata/md5-cache/net-misc/netkit-timed-0.17-r9 b/metadata/md5-cache/net-misc/netkit-timed-0.17-r9
index 109818391d40..6ce1faef1577 100644
--- a/metadata/md5-cache/net-misc/netkit-timed-0.17-r9
+++ b/metadata/md5-cache/net-misc/netkit-timed-0.17-r9
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-timed-0.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25b950b723cdf17767a72066b88107db
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.4_p7-r1 b/metadata/md5-cache/net-misc/ntp-4.2.4_p7-r1
index d62bfaad42da..828ac728232a 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.4_p7-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.4_p7-r1
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.4p7.tar.gz mirror://gentoo/ntp-4.2.4p7-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=00b7ab157d765199554984ef17ce528e
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p2-r1 b/metadata/md5-cache/net-misc/ntp-4.2.6_p2-r1
index 680393454edf..9e9b6b0fea62 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p2-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p2-r1
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p2.tar.gz mirror://gentoo/ntp-4.2.6p2-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=148fd0223bc33c809c267c0e3389483c
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p3 b/metadata/md5-cache/net-misc/ntp-4.2.6_p3
index a7203a5c81b5..4cced7df0d3f 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p3
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p3
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p3.tar.gz mirror://gentoo/ntp-4.2.6p3-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2eedcecba09578877d6ea0e76eab086a
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p3-r1 b/metadata/md5-cache/net-misc/ntp-4.2.6_p3-r1
index 986895083789..52b87c7d5bef 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p3-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p3-r1
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) parse-clocks? ( net-misc/pps-tools ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p3.tar.gz mirror://gentoo/ntp-4.2.6p3-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9caf21359cbad37a5ef4275bc7fe5f50
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p4 b/metadata/md5-cache/net-misc/ntp-4.2.6_p4
index 67e97c84a0ef..bffa572a1d2d 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p4
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p4
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) parse-clocks? ( net-misc/pps-tools ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p4.tar.gz mirror://gentoo/ntp-4.2.6p4-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99aef77831fce3a0857826e224b45b04
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p5 b/metadata/md5-cache/net-misc/ntp-4.2.6_p5
index e9fe4672bf8b..e46637f0573c 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p5
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p5
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) parse-clocks? ( net-misc/pps-tools ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p5.tar.gz mirror://gentoo/ntp-4.2.6p5-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30de16d16b2af2151f3b86c2970aa7e0
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r1 b/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r1
index cfac70f02aeb..2a6e4a96eb19 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r1
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) parse-clocks? ( net-misc/pps-tools ) vim-syntax? ( app-vim/ntp-syntax )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p5.tar.gz mirror://gentoo/ntp-4.2.6p5-manpages.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81e760e1eff8c7cc617e25856de9e68c
diff --git a/metadata/md5-cache/net-misc/ntpclient-2010.365 b/metadata/md5-cache/net-misc/ntpclient-2010.365
index 391ffa0b2895..7659b394b179 100644
--- a/metadata/md5-cache/net-misc/ntpclient-2010.365
+++ b/metadata/md5-cache/net-misc/ntpclient-2010.365
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://doolittle.icarus.com/ntpclient/ntpclient_2010_365.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca7831b011413744ae48743f7938482c
diff --git a/metadata/md5-cache/net-misc/openssh-5.5_p1-r2 b/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
index ea0efeaff1a8..91190bf3f69d 100644
--- a/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.5p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.5p1-hpn13v9.diff.gz mirror://gentoo/openssh-5.5p1-hpn13v9.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.4p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.5p1+x509-6.2.3.diff.gz ) hpn? ( X509? ( mirror://gentoo/openssh-5.4p1-hpn13v7-x509variant.diff.gz ) )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=422808c9f04a4cc7c7bc0dbacf695e8b
diff --git a/metadata/md5-cache/net-misc/openssh-5.6_p1-r2 b/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
index 915877fce079..321e192395b2 100644
--- a/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.6p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.6p1-hpn13v10.diff.gz mirror://gentoo/openssh-5.6p1-hpn13v10.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.6p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.6p1+x509-6.2.3.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df6d8b503db932603d81c6092fbff77a
diff --git a/metadata/md5-cache/net-misc/openssh-5.7_p1-r1 b/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
index a0fdde525f08..70bf7facb0bc 100644
--- a/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.7p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.7p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.7p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.7p1+x509-6.2.4.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c653b5a53ff94ac04f5d418abf9f746
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p1-r1 b/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
index ce91b454dc5f..46d1f5b358c7 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.8p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff1541a1d8cde93c2437caeeb21ce708
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p2 b/metadata/md5-cache/net-misc/openssh-5.8_p2
index 306cb063edc1..b6b0c964f7a2 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p2
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6021d983cd6cf6d1c5c64ae9cfda49f
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p2-r1 b/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
index 8d5d8046e439..70518a74a86a 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd214c83c71d8bc40267c5ecde175cf9
diff --git a/metadata/md5-cache/net-misc/openssh-5.9_p1-r3 b/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
index 99fffcba0964..754a04949c6f 100644
--- a/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c964dc7d938c9195a96aad2b1d6776a
diff --git a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4 b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
index 2617b5abe7d2..6e2bc2ef0679 100644
--- a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=384a1a5fd287e65aeec56655e6ad0a11
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1 b/metadata/md5-cache/net-misc/openssh-6.0_p1
index 3977d8f94d3a..0db43beb3fef 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v12.diff.gz mirror://gentoo/openssh-6.0p1-hpn13v12.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6eb89344b623c751bf2522d1cf1dd027
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1 b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
index ab51c814a566..e9ffa4e964ca 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.0p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e490cec85ca7f350bd40751687bdf471
diff --git a/metadata/md5-cache/net-misc/openswan-2.6.31 b/metadata/md5-cache/net-misc/openswan-2.6.31
index 56b10f9703d3..96d147bd5579 100644
--- a/metadata/md5-cache/net-misc/openswan-2.6.31
+++ b/metadata/md5-cache/net-misc/openswan-2.6.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/strongswan dev-libs/gmp dev-lang/perl caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) nss? ( dev-libs/nss ) ssl? ( dev-libs/openssl ) virtual/logger sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.openswan.org/download/openswan-2.6.31.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5694ece37e9afeb3594a6fd6257ede4f
diff --git a/metadata/md5-cache/net-misc/openswan-2.6.37 b/metadata/md5-cache/net-misc/openswan-2.6.37
index 4ba4ff04b91c..abe61062578f 100644
--- a/metadata/md5-cache/net-misc/openswan-2.6.37
+++ b/metadata/md5-cache/net-misc/openswan-2.6.37
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/strongswan dev-libs/gmp dev-lang/perl caps? ( sys-libs/libcap-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.openswan.org/download/openswan-2.6.37.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83253fe1fd3267fdd9ccad119a9ddce1
diff --git a/metadata/md5-cache/net-misc/openswan-2.6.37-r1 b/metadata/md5-cache/net-misc/openswan-2.6.37-r1
index 862284e436e3..f59f2fc07855 100644
--- a/metadata/md5-cache/net-misc/openswan-2.6.37-r1
+++ b/metadata/md5-cache/net-misc/openswan-2.6.37-r1
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/strongswan dev-libs/gmp dev-lang/perl caps? ( sys-libs/libcap-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.openswan.org/download/openswan-2.6.37.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a69a28fc6b9ec5f1a11870af9b0e4b6
diff --git a/metadata/md5-cache/net-misc/openswan-2.6.38 b/metadata/md5-cache/net-misc/openswan-2.6.38
index a8c1ae0dd9ad..00dc7af0a959 100644
--- a/metadata/md5-cache/net-misc/openswan-2.6.38
+++ b/metadata/md5-cache/net-misc/openswan-2.6.38
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/strongswan dev-libs/gmp dev-lang/perl caps? ( sys-libs/libcap-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openswan.org/openswan/openswan-2.6.38.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3ebb200fbc896384e697eb2e7a3a11f
diff --git a/metadata/md5-cache/net-misc/openvpn-2.1.4 b/metadata/md5-cache/net-misc/openvpn-2.1.4
index 4dd5edd0ab7b..d6d4b955db7c 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.1.4
+++ b/metadata/md5-cache/net-misc/openvpn-2.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.1.4.tar.gz ipv6? ( mirror://github/jjo/openvpn-ipv6/openvpn-2.1.1-ipv6-0.4.11.patch.gz ) eurephia? ( mirror://sourceforge/eurephia/openvpn-2.1.0_eurephia.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db7fd22a5572fafe9099a62709cdecd2
diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.2 b/metadata/md5-cache/net-misc/openvpn-2.2.2
index 2e0393ec6405..06f8875374ea 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.2.2
+++ b/metadata/md5-cache/net-misc/openvpn-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b11a911f9d77384817e3594e1c58a821
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-misc/openvpn-9999
index 4c50b849c8ea..75e1915d5677 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-misc/openvpn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.7 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 REQUIRED_USE=static? ( minimal )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0817e005d9f0d8ceb96e2149d1e8f271
diff --git a/metadata/md5-cache/net-misc/proxytunnel-1.9.0 b/metadata/md5-cache/net-misc/proxytunnel-1.9.0
index f63c61df57da..10499b7e30f0 100644
--- a/metadata/md5-cache/net-misc/proxytunnel-1.9.0
+++ b/metadata/md5-cache/net-misc/proxytunnel-1.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f15bae2a8133e158887b0fc5390f529e
diff --git a/metadata/md5-cache/net-misc/qtm-1.3.10 b/metadata/md5-cache/net-misc/qtm-1.3.10
index 25fb205b6eb5..3a11dd6a9f3d 100644
--- a/metadata/md5-cache/net-misc/qtm-1.3.10
+++ b/metadata/md5-cache/net-misc/qtm-1.3.10
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/qt-gui:4 dbus? ( x11-libs/qt-dbus:4 ) x11-proto/xproto dev-lang
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/catkin/qtm-1.3.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5136a35ca23f1efb2041c5b3cf17e275
diff --git a/metadata/md5-cache/net-misc/qtm-1.3.6 b/metadata/md5-cache/net-misc/qtm-1.3.6
index 7c5d5d2a2c01..f0d9c9701d29 100644
--- a/metadata/md5-cache/net-misc/qtm-1.3.6
+++ b/metadata/md5-cache/net-misc/qtm-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/qt-gui:4 dbus? ( x11-libs/qt-dbus:4 ) x11-proto/xproto dev-lang
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/catkin/qtm-1.3.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d816e3f8b66ca3ceb0672f2d6d31783a
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.20 b/metadata/md5-cache/net-misc/quagga-0.99.20
index b9b89437d1ef..e6ed7468c276 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.20
+++ b/metadata/md5-cache/net-misc/quagga-0.99.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/openrc sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.quagga.net/download/quagga-0.99.20.tar.gz http://dev.gentoo.org/~flameeyes/quagga/quagga-0.99.20-backports-1.tar.bz2 bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c7812546059cb75ba755952d60800cf
diff --git a/metadata/md5-cache/net-misc/quagga-0.99.20-r1 b/metadata/md5-cache/net-misc/quagga-0.99.20-r1
index a3e57ec5120d..65c973144bb6 100644
--- a/metadata/md5-cache/net-misc/quagga-0.99.20-r1
+++ b/metadata/md5-cache/net-misc/quagga-0.99.20-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/openrc sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.quagga.net/download/quagga-0.99.20.tar.gz http://dev.gentoo.org/~flameeyes/quagga/quagga-0.99.20-backports-2.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c82cd1a849f8888388e1054fabc27d5
diff --git a/metadata/md5-cache/net-misc/rdate-1.4-r3 b/metadata/md5-cache/net-misc/rdate-1.4-r3
index 01bcbc7fddb9..23eeb944d38e 100644
--- a/metadata/md5-cache/net-misc/rdate-1.4-r3
+++ b/metadata/md5-cache/net-misc/rdate-1.4-r3
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://people.redhat.com/sopwith/rdate-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86a6b54500b5c4cdcba85fd49213f151
diff --git a/metadata/md5-cache/net-misc/remmina-1.0.0-r1 b/metadata/md5-cache/net-misc/remmina-1.0.0-r1
index 67b042c2943d..fa27717829ff 100644
--- a/metadata/md5-cache/net-misc/remmina-1.0.0-r1
+++ b/metadata/md5-cache/net-misc/remmina-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 x11-libs/libxkbfile avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt ) freerdp? ( >=net-misc/freerdp-1.0 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
 SLOT=0
 SRC_URI=mirror://github/FreeRDP/Remmina/Remmina-1.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=442c138efad64c8908bc706f5c8eb743
diff --git a/metadata/md5-cache/net-misc/remmina-1.0.0_p20120309 b/metadata/md5-cache/net-misc/remmina-1.0.0_p20120309
index c4cdbc4ef97c..75f42ed97c4c 100644
--- a/metadata/md5-cache/net-misc/remmina-1.0.0_p20120309
+++ b/metadata/md5-cache/net-misc/remmina-1.0.0_p20120309
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt ) freerdp? ( >=net-misc/freerdp-1.0.1_p20120318 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
 SLOT=0
 SRC_URI=mirror://github/FreeRDP/Remmina/remmina-1.0.0_p20120309.tar.gz mirror://gentoo/remmina-1.0.0_p20120309.tar.gz http://dev.gentoo.org/~floppym/distfiles/remmina-1.0.0_p20120309.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edd53b0a0545963d25243977c0d65105
diff --git a/metadata/md5-cache/net-misc/remmina-9999 b/metadata/md5-cache/net-misc/remmina-9999
index f82e9d85a1cf..183716edde7f 100644
--- a/metadata/md5-cache/net-misc/remmina-9999
+++ b/metadata/md5-cache/net-misc/remmina-9999
@@ -7,5 +7,5 @@ IUSE=ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt ) freerdp? ( >=net-misc/freerdp-1.0.1_p20120318 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1da5b7ad815e58204b3010d23dd504d5
diff --git a/metadata/md5-cache/net-misc/rsync-3.0.7 b/metadata/md5-cache/net-misc/rsync-3.0.7
index f1ae90847878..db84557596fe 100644
--- a/metadata/md5-cache/net-misc/rsync-3.0.7
+++ b/metadata/md5-cache/net-misc/rsync-3.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5127172fef0bb954d3f611c8abda5f3b
diff --git a/metadata/md5-cache/net-misc/rsync-3.0.7-r2 b/metadata/md5-cache/net-misc/rsync-3.0.7-r2
index df10600b765f..59ea449f7a5a 100644
--- a/metadata/md5-cache/net-misc/rsync-3.0.7-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.0.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5688ccff3dd00d5234166094eccfd468
diff --git a/metadata/md5-cache/net-misc/rsync-3.0.8 b/metadata/md5-cache/net-misc/rsync-3.0.8
index 856079446e6f..08e3d20c8ef2 100644
--- a/metadata/md5-cache/net-misc/rsync-3.0.8
+++ b/metadata/md5-cache/net-misc/rsync-3.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.0.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92930e40d2200edf8ee8340ff123d9c1
diff --git a/metadata/md5-cache/net-misc/rsync-3.0.9 b/metadata/md5-cache/net-misc/rsync-3.0.9
index 29be00c9d436..07d63ffa51aa 100644
--- a/metadata/md5-cache/net-misc/rsync-3.0.9
+++ b/metadata/md5-cache/net-misc/rsync-3.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a24b8d3b4fafdd8f61daf08215a0205c
diff --git a/metadata/md5-cache/net-misc/rsync-3.0.9-r2 b/metadata/md5-cache/net-misc/rsync-3.0.9-r2
index cc6f1180b227..855493e7f4a2 100644
--- a/metadata/md5-cache/net-misc/rsync-3.0.9-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.0.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c29ec3e75c0160589d51383e50a6eb9
diff --git a/metadata/md5-cache/net-misc/ser-0.9.4 b/metadata/md5-cache/net-misc/ser-0.9.4
index 42c35b88a5a9..7235b310b930 100644
--- a/metadata/md5-cache/net-misc/ser-0.9.4
+++ b/metadata/md5-cache/net-misc/ser-0.9.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) radius? ( >=net-dialup/radiusclient-ng-0.5.0 ) postgres? ( dev-db/postgresql-server ) jabber? ( dev-libs/expat ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/ser/0.9.4/src/ser-0.9.4_src.tar.gz mirror://gentoo/silomail-1.0-ser-0.9.0.tar.gz mirror://gentoo/ethz-1.0-ser-0.9.0.tar.gz ldap? ( mirror://gentoo/ldap-1.0-ser-0.9.0.tar.gz mirror://gentoo/ldaps-1.0-ser-0.9.0.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e10fe2a84662bf6b49f39756b0193eae
diff --git a/metadata/md5-cache/net-misc/ser-0.9.7 b/metadata/md5-cache/net-misc/ser-0.9.7
index 590eb1fbffcc..05c7e609edd8 100644
--- a/metadata/md5-cache/net-misc/ser-0.9.7
+++ b/metadata/md5-cache/net-misc/ser-0.9.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) radius? ( >=net-dialup/radiusclient-ng-0.5.0 ) postgres? ( dev-db/postgresql-server ) jabber? ( dev-libs/expat ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=http://ftp.iptel.org/pub/ser/0.9.7/src/ser-0.9.7_src.tar.gz mirror://gentoo/silomail-1.0-ser-0.9.0.tar.gz mirror://gentoo/ethz-1.0-ser-0.9.0.tar.gz ldap? ( mirror://gentoo/ldap-1.0-ser-0.9.0.tar.gz mirror://gentoo/ldaps-1.0-ser-0.9.0.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fae99b4c56b605e34ece9b6cac3995a7
diff --git a/metadata/md5-cache/net-misc/smb4k-1.0.2 b/metadata/md5-cache/net-misc/smb4k-1.0.2
index a6639f6c4dab..b4c0ec42af17 100644
--- a/metadata/md5-cache/net-misc/smb4k-1.0.2
+++ b/metadata/md5-cache/net-misc/smb4k-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-fs/samba-3.4.2[cups] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7:4 >=x11-libs/qt-gui-4.7:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7:4[accessibility] >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4[qt3support] >=x11-libs/qt-svg-4.7:4 >=x11-libs/qt-test-4.7:4 >=x11-libs/qt-webkit-4.7:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/smb4k/smb4k-1.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8749a97931e3e85e9beb702a25ac34c6
diff --git a/metadata/md5-cache/net-misc/socat-1.7.2.1 b/metadata/md5-cache/net-misc/socat-1.7.2.1
index 51d24c5a44a6..85224e24786b 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.2.1
+++ b/metadata/md5-cache/net-misc/socat-1.7.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edb5622d1d0c4daf86b67c6be1e6e809
diff --git a/metadata/md5-cache/net-misc/socat-2.0.0_beta5 b/metadata/md5-cache/net-misc/socat-2.0.0_beta5
index 8b0a69a2af33..4f29c7ad6fe2 100644
--- a/metadata/md5-cache/net-misc/socat-2.0.0_beta5
+++ b/metadata/md5-cache/net-misc/socat-2.0.0_beta5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-2.0.0-b5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8a5e38dc2ce7f920125e81fc37a2cd9
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
index bbbc15ffafeb..0002d4821e68 100644
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
+++ b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b60cae62e76db690a89bc9548344a573
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.35 b/metadata/md5-cache/net-misc/tor-0.2.2.35
index 14f1f75cf961..1cc0a59f99ec 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.35
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.35
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0
 SLOT=0
 SRC_URI=http://www.torproject.org/dist/tor-0.2.2.35.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36b56406773cbf600388d67e7b3aef00
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.35-r1 b/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
index 5dc4111b5c48..552846f1743e 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.35.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f547c7894ee5bec780bcffaa19cfabb5
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.36 b/metadata/md5-cache/net-misc/tor-0.2.2.36
index b31dbc44fc25..daf447dea592 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.36
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.36
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.36.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45ca818f7e5261ec568bef4c3f0532ac
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.37 b/metadata/md5-cache/net-misc/tor-0.2.2.37
index 9f82190dced8..f89a18f2d60a 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.37
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.37
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.37.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f057ba34a2071d9e02dd7ca1e31d657b
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha b/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha
index 13d1b6ccb406..5e8f135fb963 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.3.15-alpha.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ffee56429c1c7c16e23f405dc03d785
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.16_alpha b/metadata/md5-cache/net-misc/tor-0.2.3.16_alpha
index ae8c93e21063..2898b01b856e 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.3.16_alpha
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.16_alpha
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.3.16-alpha.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7f948b5dcee793e56b19c33aefe2d8a
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.17_beta b/metadata/md5-cache/net-misc/tor-0.2.3.17_beta
index e798cf30dcca..8a90fafe2cb4 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.3.17_beta
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.17_beta
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.3.17-beta.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c173dd311444c4d2185c8c1a959eedf2
diff --git a/metadata/md5-cache/net-misc/vconfig-1.9 b/metadata/md5-cache/net-misc/vconfig-1.9
index bfd75a49f946..129f87d6f297 100644
--- a/metadata/md5-cache/net-misc/vconfig-1.9
+++ b/metadata/md5-cache/net-misc/vconfig-1.9
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f726acff60ad4c75136708ba89bee894
diff --git a/metadata/md5-cache/net-misc/vidalia-0.2.12 b/metadata/md5-cache/net-misc/vidalia-0.2.12
index 0dc27c5b2cdc..0afc06516c35 100644
--- a/metadata/md5-cache/net-misc/vidalia-0.2.12
+++ b/metadata/md5-cache/net-misc/vidalia-0.2.12
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 GPL-2 ) openssl
 RDEPEND=x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/vidalia/vidalia-0.2.12.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b1eb4ee693ba41394ce56c0cdd2e43e
diff --git a/metadata/md5-cache/net-misc/vidalia-0.2.18 b/metadata/md5-cache/net-misc/vidalia-0.2.18
index 640a532b9438..8c2835870c1c 100644
--- a/metadata/md5-cache/net-misc/vidalia-0.2.18
+++ b/metadata/md5-cache/net-misc/vidalia-0.2.18
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 GPL-2 ) openssl
 RDEPEND=x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/vidalia/vidalia-0.2.18.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be65d2c355cec90da6eccc4a6cce58d2
diff --git a/metadata/md5-cache/net-misc/vidalia-0.2.19 b/metadata/md5-cache/net-misc/vidalia-0.2.19
index 7c13aad53a85..750dca9319df 100644
--- a/metadata/md5-cache/net-misc/vidalia-0.2.19
+++ b/metadata/md5-cache/net-misc/vidalia-0.2.19
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 GPL-2 ) openssl
 RDEPEND=x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/vidalia/vidalia-0.2.19.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1260e71296d067126b0f6ca5802c22c6
diff --git a/metadata/md5-cache/net-misc/vidalia-0.3.1 b/metadata/md5-cache/net-misc/vidalia-0.3.1
index 4668cd473905..ba57d9191fbe 100644
--- a/metadata/md5-cache/net-misc/vidalia-0.3.1
+++ b/metadata/md5-cache/net-misc/vidalia-0.3.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 GPL-2 ) openssl
 RDEPEND=x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/vidalia/vidalia-0.3.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4da40f674bbeaffaa0c637c3b9272041
diff --git a/metadata/md5-cache/net-misc/vmnet-0.4 b/metadata/md5-cache/net-misc/vmnet-0.4
index 35648f042037..cf01bb041b88 100644
--- a/metadata/md5-cache/net-misc/vmnet-0.4
+++ b/metadata/md5-cache/net-misc/vmnet-0.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/net-tools
 SLOT=0
 SRC_URI=ftp://ftp.xos.nl/pub/linux/vmnet/vmnet-0.4.tar.gz mirror://debian/pool/main/v/vmnet/vmnet_0.4-1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc8332ebd62ee177ce95cf8a8f7e62ab
diff --git a/metadata/md5-cache/net-misc/vmpsd-1.3-r4 b/metadata/md5-cache/net-misc/vmpsd-1.3-r4
index 66c3511fecb9..08f08fb6df11 100644
--- a/metadata/md5-cache/net-misc/vmpsd-1.3-r4
+++ b/metadata/md5-cache/net-misc/vmpsd-1.3-r4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/net-snmp dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/vmps/vmpsd-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c2f26bdac96913d44eb319a7a7cd560
diff --git a/metadata/md5-cache/net-misc/vmpsd-1.4 b/metadata/md5-cache/net-misc/vmpsd-1.4
index e1f02bd153f2..03f4f5a63c03 100644
--- a/metadata/md5-cache/net-misc/vmpsd-1.4
+++ b/metadata/md5-cache/net-misc/vmpsd-1.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/vmps/vmpsd-1.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f529f957ede41993be88c4c36677af9
diff --git a/metadata/md5-cache/net-misc/wget-1.12-r3 b/metadata/md5-cache/net-misc/wget-1.12-r3
index 3c55ec0e546f..8a2b1ac07054 100644
--- a/metadata/md5-cache/net-misc/wget-1.12-r3
+++ b/metadata/md5-cache/net-misc/wget-1.12-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn ) ssl? ( >=dev-libs/openssl-0.9.6b )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ce3b6028caaf0ec69e92e42bfe07003
diff --git a/metadata/md5-cache/net-misc/wget-1.13.3-r2 b/metadata/md5-cache/net-misc/wget-1.13.3-r2
index 8c026dd55afe..054a23245de9 100644
--- a/metadata/md5-cache/net-misc/wget-1.13.3-r2
+++ b/metadata/md5-cache/net-misc/wget-1.13.3-r2
@@ -10,5 +10,5 @@ RDEPEND=idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.13.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e719f4b6d5072ef9104c66d72647c352
diff --git a/metadata/md5-cache/net-misc/wget-1.13.4 b/metadata/md5-cache/net-misc/wget-1.13.4
index f812dc58bae6..f74dedbb0a7c 100644
--- a/metadata/md5-cache/net-misc/wget-1.13.4
+++ b/metadata/md5-cache/net-misc/wget-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.13.4.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2bdbad87db8f79d36c37808dc7dd7c09
diff --git a/metadata/md5-cache/net-misc/wget-1.13.4-r1 b/metadata/md5-cache/net-misc/wget-1.13.4-r1
index 37786bfd4bf5..41bddd4f8bf5 100644
--- a/metadata/md5-cache/net-misc/wget-1.13.4-r1
+++ b/metadata/md5-cache/net-misc/wget-1.13.4-r1
@@ -10,5 +10,5 @@ RDEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !g
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.13.4.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e73f5c553834a7d741f168db4a72f6de
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.2.8.3 b/metadata/md5-cache/net-nds/389-ds-base-1.2.8.3
index c332b1d34511..0b0f66425f94 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.2.8.3
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.2.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=!>=sys-libs/db-5.0 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/mozldap >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 >=sys-libs/db-4.5 >=net-analyzer/net-snmp-5.1.2 dev-libs/openssl sys-apps/tcp-wrappers sys-libs/pam sys-libs/zlib dev-perl/perl-mozldap dev-libs/libpcre:3 kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-base-1.2.8.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=badc6593f5973d7a2b3a19e9da004f2c
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.2.9.6 b/metadata/md5-cache/net-nds/389-ds-base-1.2.9.6
index 2686f20826cb..7cb7ea8f6e43 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.2.9.6
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.2.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=!>=sys-libs/db-5.0 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/mozldap >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 >=sys-libs/db-4.5 >=net-analyzer/net-snmp-5.1.2 dev-libs/openssl sys-apps/tcp-wrappers sys-libs/pam sys-libs/zlib dev-perl/perl-mozldap dev-libs/libpcre:3 kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 SLOT=0
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-base-1.2.9.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99d66f99954dc59401826f3fd0377154
diff --git a/metadata/md5-cache/net-nds/openldap-2.3.43-r1 b/metadata/md5-cache/net-nds/openldap-2.3.43-r1
index 4c174fa85d08..8c9e4eb75445 100644
--- a/metadata/md5-cache/net-nds/openldap-2.3.43-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.3.43-r1
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.3.43.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0766989785f393b2331f54ce446f5f8
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.19-r1 b/metadata/md5-cache/net-nds/openldap-2.4.19-r1
index dc045684db3a..b9bf561de62e 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.19-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.19-r1
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.19.tgz
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=00c03d8e980cfde500125998acc9ed44
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.21 b/metadata/md5-cache/net-nds/openldap-2.4.21
index e5289d10b0e1..624301f53df7 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.21
+++ b/metadata/md5-cache/net-nds/openldap-2.4.21
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.21.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66b758f8919684b0faf7c4bafcef9038
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.23 b/metadata/md5-cache/net-nds/openldap-2.4.23
index 388017c8ca45..09cf3af21b36 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.23
+++ b/metadata/md5-cache/net-nds/openldap-2.4.23
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.23.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c9448ba838c849be3e54a46afaedf07
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.24 b/metadata/md5-cache/net-nds/openldap-2.4.24
index 0a8788409ef1..59786fe61158 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.24
+++ b/metadata/md5-cache/net-nds/openldap-2.4.24
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.24.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92d3c1bdfea4d98d4e02967ebc793a45
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.25 b/metadata/md5-cache/net-nds/openldap-2.4.25
index b3883b20ba1e..7f5fa993f061 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.25
+++ b/metadata/md5-cache/net-nds/openldap-2.4.25
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.25.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7abcbeecbb2ad81257d6199ce9fc766f
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.25-r1 b/metadata/md5-cache/net-nds/openldap-2.4.25-r1
index b4ea7888bfbb..1872ea3dbd52 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.25-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.25-r1
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.25.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9e95e1bb28ab3952371996fad4f20c4
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.28 b/metadata/md5-cache/net-nds/openldap-2.4.28
index 6415c9ab21cb..f4b9650e880c 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.28
+++ b/metadata/md5-cache/net-nds/openldap-2.4.28
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.28.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47da4d5cc0b15ff85c398292adef79ae
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.28-r1 b/metadata/md5-cache/net-nds/openldap-2.4.28-r1
index 05857bacebcb..446de882e607 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.28-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.28-r1
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.28.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49c4b9701eb17763049b77551ea84749
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.30 b/metadata/md5-cache/net-nds/openldap-2.4.30
index 2abe63633ec3..259fb5424536 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.30
+++ b/metadata/md5-cache/net-nds/openldap-2.4.30
@@ -9,5 +9,5 @@ LICENSE=OPENLDAP
 RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.30.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07ca4adab4d7421467174ce15903dad0
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.31 b/metadata/md5-cache/net-nds/openldap-2.4.31
index 5a1a5c4a50da..7fd3cb81f134 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.31
+++ b/metadata/md5-cache/net-nds/openldap-2.4.31
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c6eb3ed21161577238d4215ca31ec9c
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.31-r1 b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
index bdb72fba9a3a..b6da9e7d7ca4 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.31-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-app
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2151a5235863a1dad384a0aeeefaf31f
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-0.4.99 b/metadata/md5-cache/net-news/leechcraft-aggregator-0.4.99
index fcdad5e2d2a1..2da2ed54babd 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-0.4.99
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-0.4.99
@@ -10,5 +10,5 @@ RDEPEND=~net-misc/leechcraft-core-0.4.99[postgres?,sqlite?] virtual/leechcraft-d
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a64db127cded7a33d3999b6a8fd8979
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.0 b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.0
index edad893aba77..42f385f50349 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.0
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=~net-misc/leechcraft-core-0.5.0[postgres?,sqlite?] x11-libs/qt-webkit vi
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bff90faeb4d64c046c681466eb460b7
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.60 b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.60
index 67cb5c314ef9..67f847f95b85 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.60
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.60
@@ -10,5 +10,5 @@ RDEPEND=~net-misc/leechcraft-core-0.5.60[postgres?,sqlite?] x11-libs/qt-webkit v
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6903e4f5f95f21fb819e459b9e865e33
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.65 b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.65
index 1d1739b413d3..ebde650c9df6 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.65
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.65
@@ -10,5 +10,5 @@ RDEPEND=~net-misc/leechcraft-core-0.5.65[postgres?,sqlite?] x11-libs/qt-webkit v
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6848f5a02a06ac443f58c8cd0b452e56
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.70 b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.70
index 6631f47af940..64a8bcc81c9d 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.70
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-0.5.70
@@ -10,5 +10,5 @@ RDEPEND=~net-misc/leechcraft-core-0.5.70[postgres?,sqlite?] x11-libs/qt-webkit v
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7b4d460ddd410248da40fbbfd7e8ce12
diff --git a/metadata/md5-cache/net-news/leechcraft-aggregator-9999 b/metadata/md5-cache/net-news/leechcraft-aggregator-9999
index fe3988d3d36c..c0f5077fb1e0 100644
--- a/metadata/md5-cache/net-news/leechcraft-aggregator-9999
+++ b/metadata/md5-cache/net-news/leechcraft-aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999[postgres?,sqlite?] x11-libs/qt-webkit virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db60a8bd84d35ad94f172ab90489d770
diff --git a/metadata/md5-cache/net-nntp/kwooty-0.8.3 b/metadata/md5-cache/net-nntp/kwooty-0.8.3
index 069fb9ee89f1..d13db7c55efe 100644
--- a/metadata/md5-cache/net-nntp/kwooty-0.8.3
+++ b/metadata/md5-cache/net-nntp/kwooty-0.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.4:4[aqua=] >=kde-base/solid-4.4:4[aqua=] app-arch/unrar app-arch/par2cmdline >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kwooty/kwooty-0.8.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=adfb789724895cd7bd9a68ef19743e0b
diff --git a/metadata/md5-cache/net-nntp/nget-0.27.1 b/metadata/md5-cache/net-nntp/nget-0.27.1
index 21d72054db75..95b4e83386d9 100644
--- a/metadata/md5-cache/net-nntp/nget-0.27.1
+++ b/metadata/md5-cache/net-nntp/nget-0.27.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt pcre? ( dev-libs/libpcre ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nget/nget-0.27.1.tar.gz mirror://debian/pool/main/n/nget/nget_0.27.1-10.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b91d026d9b05bf9ac8cc9dd55dc16bdb
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.1 b/metadata/md5-cache/net-p2p/amule-2.3.1
index bf695f71fa02..1be9cf6a202c 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.1
+++ b/metadata/md5-cache/net-p2p/amule-2.3.1
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=4c9edf26027c3fa58260f8f7e781ffae
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.3 b/metadata/md5-cache/net-p2p/deluge-1.3.3
index 7e4a15105518..f7ab9565e519 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.3
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-util/intltool dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.3.tar.lzma
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92b4464b7ce2407b403c17da4aee776e
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.5 b/metadata/md5-cache/net-p2p/deluge-1.3.5
index 3dec89be8d06..73abf890f4c4 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.5
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-util/intltool dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.5.tar.lzma
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef0d3c322af309a003e35d442582182b
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index 8429d7050334..b2213373dec9 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -7,5 +7,5 @@ IUSE=geoip gtk libnotify setproctitle webinterface
 LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a57296ce96aeb755fedcdd06620ea1a6
diff --git a/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r1 b/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r1
index 8c7ed456536b..eea9c84ba2bb 100644
--- a/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r1
+++ b/metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=fltk? ( x11-libs/fltk:1 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/ed2k-tools/ed2k_hash-0.4.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2176fbbf07e100de5a8633b42aaa495
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.1 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.1
index 14fefbe1a8f9..fb32036691ad 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.1
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext cli? ( sys-libs/readline ) lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) gtk? ( x11-libs/pango >=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.10:2 >=gnome-base/libglade-2.4:2.0 libnotify? ( >=x11-libs/libnotify-0.4.1 ) gnome? ( gnome-base/libgnome ) ) qt4? ( >=x11-libs/qt-gui-4.4.0:4[dbus?] javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) ) pcre? ( >=dev-libs/libpcre-4.2 )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.1.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=766e4078b5e0727ec9fbee5890e96c3e
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.2 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.2
index 26955baab75e..70b72f1229dd 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.2
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-devel/gettext sys-libs/zlib
 REQUIRED_USE=emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) javascript? ( qt4 ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.2.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f731ca0d45242a47df7830c74608c47a
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.3 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.3
index 1967654aa0c1..0665a6418668 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.3
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-devel/gettext sys-libs/zlib
 REQUIRED_USE=emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) javascript? ( qt4 ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8e334f75612eb68a3519986b8a1f57a
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.4 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.4
index ad7ef7a78005..be48fc2f06c2 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.4
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-devel/gettext sys-libs/zlib
 REQUIRED_USE=emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) javascript? ( qt4 ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 ) xmlrpc? ( daemon )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.4.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a63e235bc2fb871048a8a797c5a13469
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.6 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.6
index d1eafe2ba161..68b0e8ae02ed 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.6
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-apps/attr sys-devel/gettext
 REQUIRED_USE=cli? ( ^^ ( json xmlrpc ) ) emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) gtk3? ( gtk ) javascript? ( qt4 ) json? ( !xmlrpc ) libcanberra? ( !gnome gtk ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.6.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=104d9921c07496833c6fe9b4042e6346
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.7 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.7
index 7a80626c940e..d0b082aec0d4 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.7
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.7
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-apps/attr sys-devel/gettext
 REQUIRED_USE=cli? ( ^^ ( json xmlrpc ) ) emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) gtk3? ( gtk ) javascript? ( qt4 ) json? ( !xmlrpc ) libcanberra? ( !gnome gtk ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
 SRC_URI=http://eiskaltdc.googlecode.com/files/eiskaltdcpp-2.2.7.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=659ab378a1005f818616247bacde71bc
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index 5b21a883b4b9..04b64fb8f7dd 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=app-arch/bzip2 >=dev-libs/openssl-0.9.8 sys-apps/attr sys-devel/gettext sys-libs/zlib virtual/libiconv idn? ( net-dns/libidn ) lua? ( >=dev-lang/lua-5.1 ) pcre? ( >=dev-libs/libpcre-4.2 ) upnp? ( >=net-libs/miniupnpc-1.6 ) cli? ( >=dev-lang/perl-5.10 perl-core/Getopt-Long dev-perl/Data-Dump dev-perl/Term-ShellUI json? ( dev-perl/JSON-RPC dev-perl/Data-Dump ) xmlrpc? ( dev-perl/RPC-XML ) ) daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) gtk? ( x11-libs/pango gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) >=dev-libs/glib-2.24:2 x11-themes/hicolor-icon-theme gnome? ( gnome-base/libgnome ) libcanberra? ( media-libs/libcanberra ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) ) qt4? ( >=x11-libs/qt-gui-4.6.0:4[dbus?] javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) )
 REQUIRED_USE=cli? ( ^^ ( json xmlrpc ) ) emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) gnome? ( gtk ) gtk3? ( gtk ) javascript? ( qt4 ) json? ( !xmlrpc ) libcanberra? ( !gnome gtk ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32cf10c26f22ad777eafe4a4001fe523
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.66 b/metadata/md5-cache/net-p2p/fms-0.3.66
index 3d37355c6881..9251d8a08641 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.66
+++ b/metadata/md5-cache/net-p2p/fms-0.3.66
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv frost? ( net-libs/polarssl ) >=dev-libs/poco-1.2.9 >=dev-db/sqlite-3.6.15 <dev-libs/libpcre-8.13
 SLOT=0
 SRC_URI=mirror://gentoo/fms-src-0.3.66.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75c0a999854fdb4744d91ad9b86975b6
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.67 b/metadata/md5-cache/net-p2p/fms-0.3.67
index 0de019f9c21e..f44d896db624 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.67
+++ b/metadata/md5-cache/net-p2p/fms-0.3.67
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv frost? ( net-libs/polarssl ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15
 SLOT=0
 SRC_URI=mirror://gentoo/fms-src-0.3.67.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=328e9572db827a67d4b065eb3fea19db
diff --git a/metadata/md5-cache/net-p2p/kmldonkey-2.0.2-r2 b/metadata/md5-cache/net-p2p/kmldonkey-2.0.2-r2
index f6c9a78c96ba..8c06b6e0ab0a 100644
--- a/metadata/md5-cache/net-p2p/kmldonkey-2.0.2-r2
+++ b/metadata/md5-cache/net-p2p/kmldonkey-2.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=plasma? ( >=kde-base/plasma-workspace-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/Attic/4.4.0/src/extragear/kmldonkey-2.0.2-kde4.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=45d80497aaccd370c584774a3c0b7fdc
diff --git a/metadata/md5-cache/net-p2p/ktorrent-4.1.2 b/metadata/md5-cache/net-p2p/ktorrent-4.1.2
index 76616fd10d85..9ec7b49e13a3 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-4.1.2
+++ b/metadata/md5-cache/net-p2p/ktorrent-4.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=<net-libs/libktorrent-1.2 >=net-libs/libktorrent-1.1.2 infowidget? ( dev-libs/geoip ) mediaplayer? ( >=media-libs/taglib-1.5 ) plasma? ( >=kde-base/libtaskmanager-4.5:4[aqua=] ) rss? ( >=kde-base/kdepimlibs-4.5:4[aqua=] ) shutdown? ( >=kde-base/libkworkspace-4.5:4[aqua=] >=kde-base/solid-4.5:4[aqua=] ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-base/kdebase-kioslaves-4.5:4[aqua=] ) kross? ( >=kde-base/krosspython-4.5:4[aqua=] ) >=kde-base/oxygen-icons-4.5:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.5:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.5:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.1.2/ktorrent-4.1.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e9cd813ccdf886d5ebe8f99f2fe1ec76
diff --git a/metadata/md5-cache/net-p2p/ktorrent-4.1.3 b/metadata/md5-cache/net-p2p/ktorrent-4.1.3
index afe4f4ba7b8d..cfbf7a13f06a 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-4.1.3
+++ b/metadata/md5-cache/net-p2p/ktorrent-4.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=<net-libs/libktorrent-1.2 >=net-libs/libktorrent-1.1.3 infowidget? ( dev-libs/geoip ) mediaplayer? ( >=media-libs/taglib-1.5 ) plasma? ( >=kde-base/libtaskmanager-4.5:4[aqua=] ) rss? ( >=kde-base/kdepimlibs-4.5:4[aqua=] ) shutdown? ( >=kde-base/libkworkspace-4.5:4[aqua=] >=kde-base/solid-4.5:4[aqua=] ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-base/kdebase-kioslaves-4.5:4[aqua=] ) kross? ( >=kde-base/krosspython-4.5:4[aqua=] ) >=kde-base/oxygen-icons-4.5:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.5:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.5:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.1.3/ktorrent-4.1.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a448d2010860785d460b069afa70ff2e
diff --git a/metadata/md5-cache/net-p2p/ktorrent-4.2.0 b/metadata/md5-cache/net-p2p/ktorrent-4.2.0
index caa2d040154d..a2d5c5241cd6 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-4.2.0
+++ b/metadata/md5-cache/net-p2p/ktorrent-4.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=<net-libs/libktorrent-1.3 >=net-libs/libktorrent-1.2.0 infowidget? ( dev-libs/geoip ) mediaplayer? ( >=media-libs/taglib-1.5 ) plasma? ( >=kde-base/libtaskmanager-4.5:4[aqua=] ) rss? ( >=kde-base/kdepimlibs-4.5:4[aqua=] ) shutdown? ( >=kde-base/libkworkspace-4.5:4[aqua=] >=kde-base/solid-4.5:4[aqua=] ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-base/kdebase-kioslaves-4.5:4[aqua=] ) kross? ( >=kde-base/krosspython-4.5:4[aqua=] ) >=kde-base/oxygen-icons-4.5:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ar(+)] ) linguas_ast? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_bg(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_oc(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_se(+)] ) linguas_si? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_si(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.5:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.5:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.5:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.2.0/ktorrent-4.2.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d04a767657000ebc250c6191cea6b0ef
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.4.99 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.4.99
index fe16564fafeb..c3340e188f7a 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.4.99
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=caf3ee4196c8eebead856b6bf9d49393
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.0 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.0
index 4158a65e9391..545762ecef8c 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.0
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38e5369d267a317ae9c85b60e5e42136
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.60 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.60
index b2ceb53e6b20..23443bd18278 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.60
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=629e98358583cc925ce6234e48814d2f
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.65 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.65
index 7887ca58758e..e112cf37b2a4 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.65
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=813c7f5631e79314ee5abbf20da282e6
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.70 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.70
index 494004d02937..51dfab970821 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.70
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=426a90b6dcea9698bc7603335cf9c101
diff --git a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-9999 b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-9999
index a9b6f232c1d2..48dbc0a11d65 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-bittorrent-9999
+++ b/metadata/md5-cache/net-p2p/leechcraft-bittorrent-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 net-libs/rb_libtorrent virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7130f0adcbfca400b1801574f2580462
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.4.99 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.4.99
index 255d33770f6c..1eed8b6f3776 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.4.99
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a879922f30b1b32bd3352d7755aa5a4
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.0 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.0
index b846bc016d86..9429cf67a017 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.0
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eab8eb026d8a760c8e0c3a03899c1ac4
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.60 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.60
index 5453d6afaf04..ccf1c9093cd6 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.60
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e87d7ac722db6ba92613dd3dde41a2fa
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.65 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.65
index 28ea7f1ce82f..675d7442e1ad 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.65
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b29301c91b1f3bb8bda46d8d6af24f40
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.70 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.70
index 6083b18950e3..899cd74cd9cc 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.70
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05ef1486c5e69dc3ebc6fc239c05693c
diff --git a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-9999
index fdb7615fce20..eccf6f2833de 100644
--- a/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/leechcraft-eiskaltdcpp-9999
@@ -7,5 +7,5 @@ IUSE=debug +emoticons examples javascript lua pcre spell sqlite upnp
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 app-arch/bzip2 sys-libs/zlib >=dev-libs/openssl-0.9.8 virtual/libiconv sys-devel/gettext lua? ( >=dev-lang/lua-5.1 ) upnp? ( net-libs/miniupnpc ) javascript? ( x11-libs/qt-script x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( x11-libs/qt-sql:4[sqlite] ) pcre? ( >=dev-libs/libpcre-4.2 ) virtual/leechcraft-task-show !!net-p2p/eiskaltdcpp
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee0a6181c16d8f995160a3401e5c0f24
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.0.5 b/metadata/md5-cache/net-p2p/mldonkey-3.0.5
index c1e467eedf5c..c9add662fb5a 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.0.5
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3533df05ef88edaf02bc1e3fed6b05bf
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.0.7 b/metadata/md5-cache/net-p2p/mldonkey-3.0.7
index 7dac1b4da0fe..fde7b4c75323 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.0.7
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7f39fb52597622367f3e223255d8567
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.0 b/metadata/md5-cache/net-p2p/mldonkey-3.1.0
index 68d7629156e4..68f86e5ca209 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.0
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccde0da131747410cf00e08de9f9e3f7
diff --git a/metadata/md5-cache/net-print/cups-1.4.8-r1 b/metadata/md5-cache/net-print/cups-1.4.8-r1
index ee3ba2ce097e..a3ae1985a9ef 100644
--- a/metadata/md5-cache/net-print/cups-1.4.8-r1
+++ b/metadata/md5-cache/net-print/cups-1.4.8-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff10f9a87c390dc0ea6a191150da36d4
diff --git a/metadata/md5-cache/net-print/cups-1.4.8-r23 b/metadata/md5-cache/net-print/cups-1.4.8-r23
index b127b36b68ed..eb1a180f421b 100644
--- a/metadata/md5-cache/net-print/cups-1.4.8-r23
+++ b/metadata/md5-cache/net-print/cups-1.4.8-r23
@@ -11,5 +11,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3f400b0e1268b48bf0a09ca4760560c
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r4 b/metadata/md5-cache/net-print/cups-1.5.2-r4
index f29b86b17e01..f8f50efa638e 100644
--- a/metadata/md5-cache/net-print/cups-1.5.2-r4
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bebaf84c9a01dd8a9c976f97c23af8a2
diff --git a/metadata/md5-cache/net-print/cups-1.5.3 b/metadata/md5-cache/net-print/cups-1.5.3
index 1fd64d2cbb19..3d794315b835 100644
--- a/metadata/md5-cache/net-print/cups-1.5.3
+++ b/metadata/md5-cache/net-print/cups-1.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.3/cups-1.5.3-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.3-avahi.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87671af6b0fe11e4e002afe0de5bb910
diff --git a/metadata/md5-cache/net-print/cups-1.6_beta1-r1 b/metadata/md5-cache/net-print/cups-1.6_beta1-r1
index 9f2b86aee352..0093fa394de6 100644
--- a/metadata/md5-cache/net-print/cups-1.6_beta1-r1
+++ b/metadata/md5-cache/net-print/cups-1.6_beta1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.6b1/cups-1.6b1-source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ac8909b2b83d8111c2c0ff8fe126623
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 82b1e4febf20..32c51f27b42c 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3a8ce95acb1ef7b11f0e68eb3509d33
diff --git a/metadata/md5-cache/net-print/lprng-3.8.28 b/metadata/md5-cache/net-print/lprng-3.8.28
index fabb1f084696..79bd3d2d2539 100644
--- a/metadata/md5-cache/net-print/lprng-3.8.28
+++ b/metadata/md5-cache/net-print/lprng-3.8.28
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-process/procps ssl? ( dev-libs/openssl ) foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db ) !net-print/cups
 SLOT=0
 SRC_URI=ftp://ftp.lprng.com/pub/LPRng/LPRng/LPRng-3.8.28.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f63f056ac27bdbbca6c0ef3006f035a5
diff --git a/metadata/md5-cache/net-print/lprng-3.8.35 b/metadata/md5-cache/net-print/lprng-3.8.35
index 147752cddebf..9bdca2258dcf 100644
--- a/metadata/md5-cache/net-print/lprng-3.8.35
+++ b/metadata/md5-cache/net-print/lprng-3.8.35
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-process/procps ssl? ( dev-libs/openssl ) foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db ) !net-print/cups
 SLOT=0
 SRC_URI=ftp://ftp.lprng.com/pub/LPRng/LPRng/LPRng-3.8.35.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4fd518f20d03d6661c4f4e97114a357
diff --git a/metadata/md5-cache/net-print/pnm2ppa-1.12 b/metadata/md5-cache/net-print/pnm2ppa-1.12
index 7e9ddee58258..6b38c919a711 100644
--- a/metadata/md5-cache/net-print/pnm2ppa-1.12
+++ b/metadata/md5-cache/net-print/pnm2ppa-1.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/enscript dev-util/dialog
 SLOT=0
 SRC_URI=mirror://sourceforge/pnm2ppa/pnm2ppa-1.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9d39d277586dd5139e5aa05cd0b8aad
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.1.6 b/metadata/md5-cache/net-proxy/c-icap-0.1.6
index d48ff33d9a8e..829806bde931 100644
--- a/metadata/md5-cache/net-proxy/c-icap-0.1.6
+++ b/metadata/md5-cache/net-proxy/c-icap-0.1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/c-icap/c_icap-0.1.6.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37c24ec598c3e9137b43d2d8b5e0b07f
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.1.7 b/metadata/md5-cache/net-proxy/c-icap-0.1.7
index 127816734e0b..4460968e933d 100644
--- a/metadata/md5-cache/net-proxy/c-icap-0.1.7
+++ b/metadata/md5-cache/net-proxy/c-icap-0.1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/c-icap/c_icap-0.1.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dcd5dba708d4f6fc58326b9614c1f5c
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1 b/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1
index 12a6b2c7b51d..57012cda6a5c 100644
--- a/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1
+++ b/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/c-icap/c_icap-0.1.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9cab0d0e8a12ef40c5f5983bfb0699e
diff --git a/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1 b/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
index ccee787dd9d7..d235f25fa098 100644
--- a/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
+++ b/metadata/md5-cache/net-proxy/dnsproxy-1.16-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevent
 SLOT=0
 SRC_URI=http://www.wolfermann.org/dnsproxy-1.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f5235152cf615cea5429b52e712ad40
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.4.18-r1 b/metadata/md5-cache/net-proxy/haproxy-1.4.18-r1
index 88eba2d49ee9..223352c1dd2e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.4.18-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-1.4.18-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f4115effb0ae55a930f96ffc549987b
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.4.21 b/metadata/md5-cache/net-proxy/haproxy-1.4.21
index 70215e4ffcfb..7ba44b28dcc6 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.4.21
+++ b/metadata/md5-cache/net-proxy/haproxy-1.4.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0bc73849e523ab72dad5abe913b2ce70
diff --git a/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.65 b/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.65
index 754485177cc9..a724448a0d80 100644
--- a/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.65
+++ b/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2bcb6edcf9996fad7ec54f2cbf1dd2d
diff --git a/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.70 b/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.70
index 796d7ea01da5..520e2ac9c611 100644
--- a/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.70
+++ b/metadata/md5-cache/net-proxy/leechcraft-xproxy-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7393afa76f2d4e3fb355800b0041c784
diff --git a/metadata/md5-cache/net-proxy/leechcraft-xproxy-9999 b/metadata/md5-cache/net-proxy/leechcraft-xproxy-9999
index d68a66642a7c..24ebbddf011e 100644
--- a/metadata/md5-cache/net-proxy/leechcraft-xproxy-9999
+++ b/metadata/md5-cache/net-proxy/leechcraft-xproxy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43d69d5375636feb6f357abebb5d47d3
diff --git a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2 b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
index fba0fc9a691e..d96bd8fa070b 100644
--- a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
+++ b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=sys-libs/db-3
 SLOT=0
 SRC_URI=http://zipper.paco.net/~igor/oops/oops-1.5.23.tar.gz mirror://gentoo/oops-1.5.24_pre20050503.patch.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f3821db206b85bf2a39e836565d6ce4
diff --git a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4 b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
index 94e6d7bcb2f0..26224626c15a 100644
--- a/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
+++ b/metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=sys-libs/db-3
 SLOT=0
 SRC_URI=http://zipper.paco.net/~igor/oops/oops-1.5.23.tar.gz mirror://gentoo/oops-1.5.24_pre20050503.patch.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb49b5f61d7175b422e09499fd7445b4
diff --git a/metadata/md5-cache/net-proxy/piper-1.14 b/metadata/md5-cache/net-proxy/piper-1.14
index 6e41eadfaea6..163b809a5dc5 100644
--- a/metadata/md5-cache/net-proxy/piper-1.14
+++ b/metadata/md5-cache/net-proxy/piper-1.14
@@ -5,5 +5,5 @@ KEYWORDS=~x86 ~amd64 ~ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.qwirx.com/piper/piper-1.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14b2f878eb65925dd6fb6de95dce9e0d
diff --git a/metadata/md5-cache/net-proxy/ratproxy-1.58 b/metadata/md5-cache/net-proxy/ratproxy-1.58
index 8b32c66173b4..d0efcc5fd98f 100644
--- a/metadata/md5-cache/net-proxy/ratproxy-1.58
+++ b/metadata/md5-cache/net-proxy/ratproxy-1.58
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=http://ratproxy.googlecode.com/files/ratproxy-1.58.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a73a99517d0aefc8b1be07d4f003484d
diff --git a/metadata/md5-cache/net-proxy/squid-2.7.9 b/metadata/md5-cache/net-proxy/squid-2.7.9
index 15b297d83290..fbc0a9181af0 100644
--- a/metadata/md5-cache/net-proxy/squid-2.7.9
+++ b/metadata/md5-cache/net-proxy/squid-2.7.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7eddcedd4f0c6ec13d2c0bb1e9f00940
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.15 b/metadata/md5-cache/net-proxy/squid-3.1.15
index 922e6f6ddb41..8764a35b4621 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.15
+++ b/metadata/md5-cache/net-proxy/squid-3.1.15
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b7268a3a5629399817bf7c544249aeb
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.16 b/metadata/md5-cache/net-proxy/squid-3.1.16
index 9ab608c19d64..ede514a80269 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.16
+++ b/metadata/md5-cache/net-proxy/squid-3.1.16
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.16.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d2bb143e1a1769ec9e71548bac0cab8
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.18 b/metadata/md5-cache/net-proxy/squid-3.1.18
index 01c5a6fa9685..050db96aa140 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.18
+++ b/metadata/md5-cache/net-proxy/squid-3.1.18
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.18.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22e4ff4593404260efe0a0aa9a1de188
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.19 b/metadata/md5-cache/net-proxy/squid-3.1.19
index d91912604db8..e437a72e7218 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.19
+++ b/metadata/md5-cache/net-proxy/squid-3.1.19
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.19.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2c0e407c445d429a91bdd4de7a00b22
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.20 b/metadata/md5-cache/net-proxy/squid-3.1.20
index 03bc3edeb82d..83f51c560187 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.20
+++ b/metadata/md5-cache/net-proxy/squid-3.1.20
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/op
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.20.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5d543b791249a13287945dcb87ce1607
diff --git a/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1 b/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1
index aa6cf7378612..a9b331e5621a 100644
--- a/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1
+++ b/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/ufdbguard/ufdbGuard-1.27.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_27.pdf -> ufdbguard-1.27-manual.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0adb20cdaea24d5153c2d21372d794b1
diff --git a/metadata/md5-cache/net-proxy/ufdbguard-1.28 b/metadata/md5-cache/net-proxy/ufdbguard-1.28
index 4166a13fe501..9fe75ddecaca 100644
--- a/metadata/md5-cache/net-proxy/ufdbguard-1.28
+++ b/metadata/md5-cache/net-proxy/ufdbguard-1.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/ufdbguard/ufdbGuard-1.28.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_28.pdf -> ufdbguard-1.28-manual.pdf )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3260c318ef93eafb37238038dee1f34a
diff --git a/metadata/md5-cache/net-voip/ekiga-2.0.12 b/metadata/md5-cache/net-voip/ekiga-2.0.12
index 389f30f5c68e..65a38ff92ca2 100644
--- a/metadata/md5-cache/net-voip/ekiga-2.0.12
+++ b/metadata/md5-cache/net-voip/ekiga-2.0.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~dev-libs/pwlib-1.10.10[ldap] ~net-libs/opal-2.2.11 >=x11-libs/gtk+-2.4.0:2 >=dev-libs/glib-2.0.0:2 sdl? ( >=media-libs/libsdl-1.2.4 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) avahi? ( net-dns/avahi[dbus] ) gnome? ( >=gnome-base/libbonobo-2.2.0 >=gnome-base/libgnomeui-2.2.0 >=gnome-base/libgnome-2.2.0 >=gnome-base/gconf-2.2.0 >=gnome-base/orbit-2.5.0 gnome-extra/evolution-data-server media-sound/pulseaudio )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ekiga/2.0/ekiga-2.0.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7165d14f0c3b29f32dea6dd9525794b8
diff --git a/metadata/md5-cache/net-voip/ekiga-3.2.7 b/metadata/md5-cache/net-voip/ekiga-3.2.7
index 655c800e1c64..452c1a64ef02 100644
--- a/metadata/md5-cache/net-voip/ekiga-3.2.7
+++ b/metadata/md5-cache/net-voip/ekiga-3.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14.0:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 >=net-libs/opal-3.6.8[audio,sip,video,debug=,h323?] >=net-libs/ptlib-2.6.7[ldap?,stun,v4l?,video,wav,debug=] >=x11-libs/gtk+-2.12.0:2 avahi? ( >=net-dns/avahi-0.6[dbus] ) dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) gconf? ( >=gnome-base/gconf-2.6.0:2 ) gnome? ( || ( >=x11-libs/gtk+-2.14:2 ( >=gnome-base/libgnome-2.14.0 >=gnome-base/libgnomeui-2.14.0 ) ) ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 ) kde? ( kontact? ( >=kde-base/kdepimlibs-4.4:4[aqua=] ) ) ldap? ( dev-libs/cyrus-sasl:2 net-nds/openldap ) libnotify? ( x11-libs/libnotify ) shm? ( x11-libs/libXext ) xcap? ( net-libs/libsoup:2.4 ) xv? ( x11-libs/libXv ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ekiga/3.2/ekiga-3.2.7.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9eda8470212e8d0bb007e705bae3d5dc
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.0 b/metadata/md5-cache/net-wireless/aircrack-ng-1.0
index 801849b344f6..0dc4d8006af0 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.0
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sqlite? ( >=dev-db/sqlite-3.4 ) kernel_linux? ( net-wireless/iw net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://download.aircrack-ng.org/aircrack-ng-1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13c36aa6f228d40762fc73a85bd837a5
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.1
index 1c8450dd5378..33176854b8eb 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.1
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sqlite? ( >=dev-db/sqlite-3.4 ) kernel_linux? ( net-wireless/iw net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://download.aircrack-ng.org/aircrack-ng-1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2e7537e57a5cd0f88fc5cccee52caea
diff --git a/metadata/md5-cache/net-wireless/bluedevil-1.2.3 b/metadata/md5-cache/net-wireless/bluedevil-1.2.3
index cd630e1ddc03..c2827169049a 100644
--- a/metadata/md5-cache/net-wireless/bluedevil-1.2.3
+++ b/metadata/md5-cache/net-wireless/bluedevil-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-libs/libbluedevil-1.9 x11-misc/shared-mime-info !net-wireless/kbluetooth app-mobilephone/obexd[-server] app-mobilephone/obex-data-server >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/bluedevil/1.2.3/src/bluedevil-1.2.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a162cc5607c9923d59da37cf039937ff
diff --git a/metadata/md5-cache/net-wireless/chillispot-0.99 b/metadata/md5-cache/net-wireless/chillispot-0.99
index c3e454cc3afb..89fabbf68342 100644
--- a/metadata/md5-cache/net-wireless/chillispot-0.99
+++ b/metadata/md5-cache/net-wireless/chillispot-0.99
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.chillispot.info/download/chillispot-0.99.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f07451a7c9d66f8a5fe82303f5cae27
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.6.0-r1
index b8f059e1b41c..959bc3e94379 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.0-r1
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0
 REQUIRED_USE=fcd? ( audio )
 SLOT=0
 SRC_URI=http://gnuradio.org/redmine/attachments/download/326/gnuradio-3.6.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4adf9b50a56c4ebe4c18ae6d4fa016b3
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.1 b/metadata/md5-cache/net-wireless/gnuradio-3.6.1
index f9210e60623d..06b9205f6a23 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.1
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0
 REQUIRED_USE=fcd? ( audio )
 SLOT=0
 SRC_URI=http://gnuradio.org/redmine/attachments/download/389/gnuradio-3.6.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9cd79155c229d43ef49174e5847f573
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1
index 334258c8b3ab..7273e6d1c446 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost dev-python/cheetah dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 x11-libs/qt-gui ) sdl? ( media-libs/libsdl ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://gnuradio.org/redmine/attachments/download/389/gnuradio-3.6.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85f1c5f86c524b8a12b8605e43431642
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 31e9b02d8fa5..90f7008555f9 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sdr.osmocom.org/
 LICENSE=GPL-3
 RDEPEND=dev-libs/boost net-wireless/gnuradio net-wireless/rtl-sdr =dev-lang/python-2*
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c955d5a410810c44222b39fa9495950
diff --git a/metadata/md5-cache/net-wireless/ipw2200-firmware-2.4 b/metadata/md5-cache/net-wireless/ipw2200-firmware-2.4
index 14a31d8fcb8e..ddffae379ee8 100644
--- a/metadata/md5-cache/net-wireless/ipw2200-firmware-2.4
+++ b/metadata/md5-cache/net-wireless/ipw2200-firmware-2.4
@@ -8,5 +8,5 @@ LICENSE=ipw2200-fw
 RDEPEND=kernel_linux? ( || ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 ) )
 SLOT=0
 SRC_URI=http://www.bughost.org/firmware/ipw2200-fw-2.4.tgz
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e4bb2f633145224b699062fd0891025
diff --git a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r3 b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r3
index af9f5b40fee0..0311a228657d 100644
--- a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r3
+++ b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/glib-2* >=sys-apps/pciutils-2.2.7-r1 sys-process/procps sys-apps/setserial sys-apps/grep sys-fs/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/irda/irda-utils-0.9.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c3082abaf12b9ca3ac597480ef130124
diff --git a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r4 b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r4
index 12f4a4d7bb40..1cd7ecd30d08 100644
--- a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r4
+++ b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/glib-2* >=sys-apps/pciutils-2.2.7-r1 sys-process/procps sys-apps/setserial sys-apps/grep sys-fs/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/irda/irda-utils-0.9.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fba0bf8be6ba35c6f7ba1d30a806a188
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.4.0b-r2 b/metadata/md5-cache/net-wireless/wavemon-0.4.0b-r2
index e5496af60dfa..eead7ed09ca8 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.4.0b-r2
+++ b/metadata/md5-cache/net-wireless/wavemon-0.4.0b-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://gentoo/wavemon-0.4.0b.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c52f4791c3d7a509350be35cc2448b4
diff --git a/metadata/md5-cache/perl-core/Text-ParseWords-3.270.0 b/metadata/md5-cache/perl-core/Text-ParseWords-3.270.0
new file mode 100644
index 000000000000..be378a3f9c1e
--- /dev/null
+++ b/metadata/md5-cache/perl-core/Text-ParseWords-3.270.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=app-arch/unzip dev-lang/perl[-build]
+DESCRIPTION=Parse strings containing shell-style quoting
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Text-ParseWords/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.27.zip
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dc97e87a0f8fd37a6c9ec68b3deaeca6
diff --git a/metadata/md5-cache/sci-astronomy/casacore-1.4.0 b/metadata/md5-cache/sci-astronomy/casacore-1.4.0
index d738be305169..35e8fc00db94 100644
--- a/metadata/md5-cache/sci-astronomy/casacore-1.4.0
+++ b/metadata/md5-cache/sci-astronomy/casacore-1.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/cfitsio sci-astronomy/wcslib sys-libs/readline virtual/blas virtual/fortran virtual/lapack hdf5? ( sci-libs/hdf5 ) fftw? ( >=sci-libs/fftw-3 )
 SLOT=0
 SRC_URI=http://casacore.googlecode.com/files/casacore-1.4.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5fa06b1d8f2e32e9eaa46d597b2e2d01
diff --git a/metadata/md5-cache/sci-astronomy/casacore-1.5.0 b/metadata/md5-cache/sci-astronomy/casacore-1.5.0
index 7ffd27ee8674..f5cda8c4b35e 100644
--- a/metadata/md5-cache/sci-astronomy/casacore-1.5.0
+++ b/metadata/md5-cache/sci-astronomy/casacore-1.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/cfitsio sci-astronomy/wcslib sys-libs/readline virtual/blas virtual/fortran virtual/lapack data? ( sci-astronomy/casa-data ) fftw? ( >=sci-libs/fftw-3 ) hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=http://casacore.googlecode.com/files/casacore-1.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0dc86ff6df13454200be8c3427ed621
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.6.1 b/metadata/md5-cache/sci-astronomy/celestia-1.6.1
index efeb265e09f7..e4a2036fc803 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.6.1
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/jpeg media-libs/libpng >=dev-lang/lua-5.0 gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 >=gnome-base/libgnomeui-2.0 ) !gtk? ( !gnome? ( media-libs/freeglut ) ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora )
 SLOT=0
 SRC_URI=mirror://sourceforge/celestia/celestia-1.6.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62af6cea9caeee8656f328f7fbfffe73
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.11.2-r1 b/metadata/md5-cache/sci-astronomy/stellarium-0.11.2-r1
index 6cb845c693e6..a7a339697980 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.11.2-r1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.11.2-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl virtual/glu media-libs/freetype:2 >=x11-libs/qt-core-4.6.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stellarium/stellarium-0.11.2.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_0.cat mirror://sourceforge/stellarium/stars_5_2v0_0.cat mirror://sourceforge/stellarium/stars_6_2v0_0.cat mirror://sourceforge/stellarium/stars_7_2v0_0.cat mirror://sourceforge/stellarium/stars_8_2v0_0.cat )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=beef9bc6af5b9aa2936ba9bac52e8537
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.11.3 b/metadata/md5-cache/sci-astronomy/stellarium-0.11.3
index f918062a4262..5b2500f16c1d 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.11.3
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl virtual/glu media-libs/freetype:2 >=x11-libs/qt-core-4.6.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stellarium/stellarium-0.11.3.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_0.cat mirror://sourceforge/stellarium/stars_5_2v0_0.cat mirror://sourceforge/stellarium/stars_6_2v0_0.cat mirror://sourceforge/stellarium/stars_7_2v0_0.cat mirror://sourceforge/stellarium/stars_8_2v0_0.cat )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0c00da42a26397eb048ed1421d43969
diff --git a/metadata/md5-cache/sci-biology/allpathslg-37578 b/metadata/md5-cache/sci-biology/allpathslg-37578
index 232fcf2a5630..2ed91e34e396 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-37578
+++ b/metadata/md5-cache/sci-biology/allpathslg-37578
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=as-is
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-37578.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d20e27305c45fff456bdb43822fd39d
diff --git a/metadata/md5-cache/sci-biology/allpathslg-41839 b/metadata/md5-cache/sci-biology/allpathslg-41839
index f26eae30f5f0..7439714d57e3 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-41839
+++ b/metadata/md5-cache/sci-biology/allpathslg-41839
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=as-is
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-41839.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5514a6b29b3472043a7e79d36e8acf1a
diff --git a/metadata/md5-cache/sci-biology/bamtools-1.0.2 b/metadata/md5-cache/sci-biology/bamtools-1.0.2
index 909b97b42e38..6e6f144fdd3c 100644
--- a/metadata/md5-cache/sci-biology/bamtools-1.0.2
+++ b/metadata/md5-cache/sci-biology/bamtools-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://github/pezmaster31/bamtools/bamtools-1.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce906838d02edfddd68cf1c6f3433108
diff --git a/metadata/md5-cache/sci-biology/bedtools-2.16.2 b/metadata/md5-cache/sci-biology/bedtools-2.16.2
index 10e3df695aef..a37158643344 100644
--- a/metadata/md5-cache/sci-biology/bedtools-2.16.2
+++ b/metadata/md5-cache/sci-biology/bedtools-2.16.2
@@ -6,5 +6,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://bedtools.googlecode.com/files/BEDTools.v2.16.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0d48c9daa869501585f50ce275b1150
diff --git a/metadata/md5-cache/sci-biology/bwa-0.5.0-r1 b/metadata/md5-cache/sci-biology/bwa-0.5.0-r1
index 88c7f0b174ad..ae22d7a90af2 100644
--- a/metadata/md5-cache/sci-biology/bwa-0.5.0-r1
+++ b/metadata/md5-cache/sci-biology/bwa-0.5.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/maq/bwa-0.5.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ec3c8c34fc2fef186c3794fa1d757b4
diff --git a/metadata/md5-cache/sci-biology/bwa-0.5.9 b/metadata/md5-cache/sci-biology/bwa-0.5.9
index cf4a1dc92e2a..ab25edeeb991 100644
--- a/metadata/md5-cache/sci-biology/bwa-0.5.9
+++ b/metadata/md5-cache/sci-biology/bwa-0.5.9
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/bio-bwa/bwa-0.5.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0044d2dbc370cbc752406fce1310f583
diff --git a/metadata/md5-cache/sci-biology/bwa-0.6.1 b/metadata/md5-cache/sci-biology/bwa-0.6.1
index 8bea32426314..16f86414fdcb 100644
--- a/metadata/md5-cache/sci-biology/bwa-0.6.1
+++ b/metadata/md5-cache/sci-biology/bwa-0.6.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/bio-bwa/bwa-0.6.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acf6660270875d13eafe5d7b59d03985
diff --git a/metadata/md5-cache/sci-biology/cd-hit-4.5.1 b/metadata/md5-cache/sci-biology/cd-hit-4.5.1
index 7a622a1b22ca..2f7e5175bd99 100644
--- a/metadata/md5-cache/sci-biology/cd-hit-4.5.1
+++ b/metadata/md5-cache/sci-biology/cd-hit-4.5.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cdhit.googlecode.com/files/cd-hit-v4.5.1-2011-01-31.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0e94cbba0b2aa84c11307eaa8549925
diff --git a/metadata/md5-cache/sci-biology/cd-hit-4.5.4 b/metadata/md5-cache/sci-biology/cd-hit-4.5.4
index 1fd64ebc3b33..310e43a28ec3 100644
--- a/metadata/md5-cache/sci-biology/cd-hit-4.5.4
+++ b/metadata/md5-cache/sci-biology/cd-hit-4.5.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cdhit.googlecode.com/files/cd-hit-v4.5.4-2011-03-07.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a38732b2e6e8515e6b35dbcbe1e73e30
diff --git a/metadata/md5-cache/sci-biology/cd-hit-4.6 b/metadata/md5-cache/sci-biology/cd-hit-4.6
index 08b776777004..20dab2a09840 100644
--- a/metadata/md5-cache/sci-biology/cd-hit-4.6
+++ b/metadata/md5-cache/sci-biology/cd-hit-4.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cdhit.googlecode.com/files/cd-hit-v4.6-2012-04-25.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=618508d30580f75e71ed112d4539e765
diff --git a/metadata/md5-cache/sci-biology/cufflinks-1.3.0 b/metadata/md5-cache/sci-biology/cufflinks-1.3.0
index 357998793291..85ac33fb4eaf 100644
--- a/metadata/md5-cache/sci-biology/cufflinks-1.3.0
+++ b/metadata/md5-cache/sci-biology/cufflinks-1.3.0
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=sci-biology/samtools dev-libs/boost:1.46
 SLOT=0
 SRC_URI=http://cufflinks.cbcb.umd.edu/downloads/cufflinks-1.3.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=659144418b1d27cdce28c901ae083a2b
diff --git a/metadata/md5-cache/sci-biology/express-0.9.5 b/metadata/md5-cache/sci-biology/express-0.9.5
index 52a2badce01d..93e458635020 100644
--- a/metadata/md5-cache/sci-biology/express-0.9.5
+++ b/metadata/md5-cache/sci-biology/express-0.9.5
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=sys-libs/zlib dev-libs/boost:1.46 sci-biology/bamtools
 SLOT=0
 SRC_URI=http://bio.math.berkeley.edu/eXpress/downloads/express-0.9.5/express-0.9.5-src.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b405d67504fa2ab112b18d8fa492af5
diff --git a/metadata/md5-cache/sci-biology/fasta-35.4.10 b/metadata/md5-cache/sci-biology/fasta-35.4.10
index ab307cdc4c21..4748debbb1e9 100644
--- a/metadata/md5-cache/sci-biology/fasta-35.4.10
+++ b/metadata/md5-cache/sci-biology/fasta-35.4.10
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=fasta
 SLOT=0
 SRC_URI=http://faculty.virginia.edu/wrpearson/fasta/fasta3/fasta-35.4.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7877f52090c644e149eee33f985dc233
diff --git a/metadata/md5-cache/sci-biology/mafft-6.811 b/metadata/md5-cache/sci-biology/mafft-6.811
index 21e15edd5fe3..584d11cd5479 100644
--- a/metadata/md5-cache/sci-biology/mafft-6.811
+++ b/metadata/md5-cache/sci-biology/mafft-6.811
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-macos
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://mafft.cbrc.jp/alignment/software/mafft-6.811-without-extensions-src.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6405b04e2b7b60b54a8df0db43b7199
diff --git a/metadata/md5-cache/sci-biology/mammoth-1.0 b/metadata/md5-cache/sci-biology/mammoth-1.0
index 0db7a227b094..37cef7d43b1e 100644
--- a/metadata/md5-cache/sci-biology/mammoth-1.0
+++ b/metadata/md5-cache/sci-biology/mammoth-1.0
@@ -8,5 +8,5 @@ RDEPEND=virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=mammoth-1.0-src.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1cd4c39eeb25b37ad52606b8788eed76
diff --git a/metadata/md5-cache/sci-biology/mira-3.2.1 b/metadata/md5-cache/sci-biology/mira-3.2.1
index a5755f843319..caf6d8d92102 100644
--- a/metadata/md5-cache/sci-biology/mira-3.2.1
+++ b/metadata/md5-cache/sci-biology/mira-3.2.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/boost-1.41.0-r3 dev-util/google-perftools dev-libs/expat || (
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina
 EAPI=3
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.41.0-r3 dev-util/google-perftools
 SLOT=0
 SRC_URI=mirror://sourceforge/mira-assembler/mira-3.2.1.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d2401ec70242a815a2e0aeaba7b2454b
+_md5_=9d4fb7d1e93ede18d5dcb7da0443f90f
diff --git a/metadata/md5-cache/sci-biology/mummer-3.22-r1 b/metadata/md5-cache/sci-biology/mummer-3.22-r1
index cede797a44e4..0e7e1f44cfc9 100644
--- a/metadata/md5-cache/sci-biology/mummer-3.22-r1
+++ b/metadata/md5-cache/sci-biology/mummer-3.22-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=app-shells/tcsh
 SLOT=0
 SRC_URI=mirror://sourceforge/mummer/MUMmer3.22.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c37e1f885dfaef4f87b3419642d1384
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15 b/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15
index 2f1c684de01c..1b2918aa6815 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15
+++ b/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=sqlite? ( dev-db/sqlite:3 ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2010/Jun_15_2010/ncbi_cxx--Jun_15_2010.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=671374ad5fac973136703d7cc14d9f32
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15-r1 b/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15-r1
index 959a87cdfcaa..38727cf2ea2e 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15-r1
+++ b/metadata/md5-cache/sci-biology/ncbi-tools++-2010.06.15-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=sqlite? ( dev-db/sqlite:3 ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2010/Jun_15_2010/ncbi_cxx--Jun_15_2010.tar.gz http://dev.gentoo.org/~jlec/distfiles/ncbi-tools++-2010.06.15-asneeded.patch.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81f4d91da62fd513d51e1ce32ed1bc78
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-0.20080302 b/metadata/md5-cache/sci-biology/ncbi-tools-0.20080302
index 4353346cace3..9f7c5d14da15 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-0.20080302
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-0.20080302
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng X? ( >=x11-libs/openmotif-2.3:0 )
 SLOT=0
 SRC_URI=mirror://gentoo/ncbi-tools-20080302.tar.gz doc? ( mirror://gentoo/ncbi-tools-sdk-doc.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52c114c8cfed117e1b1df3c1761a5b25
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-0.20090809 b/metadata/md5-cache/sci-biology/ncbi-tools-0.20090809
index 007de5b4c6ba..305b4729ce3c 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-0.20090809
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-0.20090809
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng X? ( >=x11-libs/openmotif-2.3:0 )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/20090809/ncbi.tar.gz -> ncbi-tools-0.20090809.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5adb03e044282c282cbcfd700ab72792
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26 b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26
index c5cdb0f8fa90..22a65297ea16 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng X? ( x11-libs/openmotif:0 )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/blast/executables/release/2.2.26/ncbi.tar.gz -> ncbi-tools-2.2.26.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e42c8fb5a7d28b5e2970a7b978c86431
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-20080302 b/metadata/md5-cache/sci-biology/ncbi-tools-20080302
index fb7fb02df7dd..8d5610ca342f 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-20080302
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-20080302
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng X? ( >=x11-libs/openmotif-2.3:0 )
 SLOT=0
 SRC_URI=mirror://gentoo/ncbi-tools-20080302.tar.gz doc? ( mirror://gentoo/ncbi-tools-sdk-doc.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc05a7c7a28e5c29f9d3b10cc894e909
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-20090809 b/metadata/md5-cache/sci-biology/ncbi-tools-20090809
index 20111341e9f6..a872206fca22 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-20090809
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-20090809
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng X? ( >=x11-libs/openmotif-2.3:0 )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/20090809/ncbi.tar.gz -> ncbi-tools-20090809.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a366fbb7e20927f0f814e3db235406b6
diff --git a/metadata/md5-cache/sci-biology/raxml-7.2.5-r1 b/metadata/md5-cache/sci-biology/raxml-7.2.5-r1
index 2d0b27a7c1f2..16e9b9bf9564 100644
--- a/metadata/md5-cache/sci-biology/raxml-7.2.5-r1
+++ b/metadata/md5-cache/sci-biology/raxml-7.2.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://wwwkramer.in.tum.de/exelixis/software/RAxML-7.2.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49c4b67d80d36399b68e209eb78101d4
diff --git a/metadata/md5-cache/sci-biology/raxml-7.2.6 b/metadata/md5-cache/sci-biology/raxml-7.2.6
index 4f069fa86690..7fcb1f7549d3 100644
--- a/metadata/md5-cache/sci-biology/raxml-7.2.6
+++ b/metadata/md5-cache/sci-biology/raxml-7.2.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://wwwkramer.in.tum.de/exelixis/software/RAxML-7.2.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f7fed3362f2055734076d3552c3eaea9
diff --git a/metadata/md5-cache/sci-biology/rmblast-1.2 b/metadata/md5-cache/sci-biology/rmblast-1.2
index ce016b7601f3..18945915efe2 100644
--- a/metadata/md5-cache/sci-biology/rmblast-1.2
+++ b/metadata/md5-cache/sci-biology/rmblast-1.2
@@ -8,5 +8,5 @@ LICENSE=OSL-2.1
 RDEPEND=~dev-libs/boost-1.35.0
 SLOT=0
 SRC_URI=http://www.repeatmasker.org/rmblast-1.2-ncbi-blast-2.2.23+-src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e7ad7a25e145618098fe63170f13a08
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.0.1 b/metadata/md5-cache/sci-biology/shrimp-2.0.1
index 36b8c8c46ae0..9e0663b5af06 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.0.1
+++ b/metadata/md5-cache/sci-biology/shrimp-2.0.1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=sys-devel/gcc-4.3[openmp]
 SLOT=0
 SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_0_1.src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ff3abd5977d7d2f56a1812e8028e109
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.1.0 b/metadata/md5-cache/sci-biology/shrimp-2.1.0
index 2d4fbeef4026..dcc42f551e66 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.1.0
+++ b/metadata/md5-cache/sci-biology/shrimp-2.1.0
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=sys-devel/gcc-4.3[openmp]
 SLOT=0
 SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_1_0.src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=900c994d4d99a2b982383d08210b482e
diff --git a/metadata/md5-cache/sci-biology/t-coffee-8.69 b/metadata/md5-cache/sci-biology/t-coffee-8.69
index 3121d3f73bb9..669d8bb32ebd 100644
--- a/metadata/md5-cache/sci-biology/t-coffee-8.69
+++ b/metadata/md5-cache/sci-biology/t-coffee-8.69
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-biology/clustalw
 SLOT=0
 SRC_URI=http://www.tcoffee.org/Packages/T-COFFEE_distribution_Version_8.69.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4967fa106be61906a622b1ee303c332
diff --git a/metadata/md5-cache/sci-biology/t-coffee-8.93 b/metadata/md5-cache/sci-biology/t-coffee-8.93
index 64a3b203bd74..805708854ae8 100644
--- a/metadata/md5-cache/sci-biology/t-coffee-8.93
+++ b/metadata/md5-cache/sci-biology/t-coffee-8.93
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-biology/clustalw
 SLOT=0
 SRC_URI=http://www.tcoffee.org/Packages/T-COFFEE_distribution_Version_8.93.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dbe7a58fece5b051ff055eaa47388ba
diff --git a/metadata/md5-cache/sci-biology/tophat-1.4.1 b/metadata/md5-cache/sci-biology/tophat-1.4.1
index 6e9b7e5aeacf..72446524a084 100644
--- a/metadata/md5-cache/sci-biology/tophat-1.4.1
+++ b/metadata/md5-cache/sci-biology/tophat-1.4.1
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=bam? ( sci-biology/samtools ) sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-1.4.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1469fef2e6e2b7a07f2ef195333be58
diff --git a/metadata/md5-cache/sci-biology/tophat-2.0.0 b/metadata/md5-cache/sci-biology/tophat-2.0.0
index c89aa20589e0..9b3899afb51e 100644
--- a/metadata/md5-cache/sci-biology/tophat-2.0.0
+++ b/metadata/md5-cache/sci-biology/tophat-2.0.0
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=bam? ( sci-biology/samtools ) sci-biology/bowtie
 SLOT=0
 SRC_URI=http://tophat.cbcb.umd.edu/downloads/tophat-2.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d3bcbb73cca7f3c16c0ce9fdb35acf8
diff --git a/metadata/md5-cache/sci-biology/ucsc-genome-browser-223 b/metadata/md5-cache/sci-biology/ucsc-genome-browser-223
index 0725638eabce..976084092845 100644
--- a/metadata/md5-cache/sci-biology/ucsc-genome-browser-223
+++ b/metadata/md5-cache/sci-biology/ucsc-genome-browser-223
@@ -9,5 +9,5 @@ LICENSE=blat
 RDEPEND=app-arch/unzip !<sci-biology/ucsc-genome-browser-223 mysql? ( virtual/mysql ) server? ( virtual/httpd-cgi ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://hgdownload.cse.ucsc.edu/admin/jksrc.v223.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=488287b40f3fdb2551226f8b5a9cdc59
diff --git a/metadata/md5-cache/sci-biology/ucsc-genome-browser-260 b/metadata/md5-cache/sci-biology/ucsc-genome-browser-260
index 9e7551c79d33..412648cc8e54 100644
--- a/metadata/md5-cache/sci-biology/ucsc-genome-browser-260
+++ b/metadata/md5-cache/sci-biology/ucsc-genome-browser-260
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip !<sci-biology/ucsc-genome-browser-223 mysql? ( virtual/my
 REQUIRED_USE=server? ( mysql )
 SLOT=0
 SRC_URI=http://hgdownload.cse.ucsc.edu/admin/jksrc.v260.zip
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=36c4d987993d81445a49457fa09a375d
diff --git a/metadata/md5-cache/sci-biology/unafold-3.8 b/metadata/md5-cache/sci-biology/unafold-3.8
index d91637e7a6bc..01c3b572e8bd 100644
--- a/metadata/md5-cache/sci-biology/unafold-3.8
+++ b/metadata/md5-cache/sci-biology/unafold-3.8
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=unafold
 SLOT=0
 SRC_URI=http://dinamelt.bioinfo.rpi.edu/download/unafold-3.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=001c9350ee2ce53ab83ba13f9c98bb4d
diff --git a/metadata/md5-cache/sci-biology/velvet-1.0.18-r1 b/metadata/md5-cache/sci-biology/velvet-1.0.18-r1
index ad63d8989fb9..737b761b7959 100644
--- a/metadata/md5-cache/sci-biology/velvet-1.0.18-r1
+++ b/metadata/md5-cache/sci-biology/velvet-1.0.18-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.ebi.ac.uk/~zerbino/velvet/velvet_1.0.18.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58875e08629f7912d53d013deaa39f75
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.1.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.1.0
index bd0cef0d94d2..7982d1dd8703 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.1.0
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.1.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e157299318c032139b5f599ed42c139e
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.0
index 0168911e8635..8748a3b12165 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.0
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.0.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5e5cf7519cb78ce2271c702af60ede99
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.10.1 b/metadata/md5-cache/sci-calculators/speedcrunch-0.10.1
index dc35df4360e9..46b5abd14653 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.10.1
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=http://speedcrunch.googlecode.com/files/speedcrunch-0.10.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=551aee91045f95d3bc14d4370d16d2a9
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4 b/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
index 7e9f86b5d06a..a0698db644b3 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.2.1b-r4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/apbs/apbs-1.2.1b-source.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ddf5a1d86c621246f8a2683397a4e7d4
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.3 b/metadata/md5-cache/sci-chemistry/apbs-1.3
index 2e67741d2255..66077e76a27b 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.3
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/apbs/apbs-1.3-source.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d57452942f04f69de5d2a3339c7770b7
diff --git a/metadata/md5-cache/sci-chemistry/apbs-1.3-r1 b/metadata/md5-cache/sci-chemistry/apbs-1.3-r1
index 52c544b46de9..1abb5f71b5c3 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.3-r1
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts !sci-chemistry/ccpn ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/apbs/apbs-1.3-source.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff29aeb4903cdedc4c8ca94be5edfd5b
diff --git a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.1-r1 b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.1-r1
index 5d5d2ed1d25b..4ca27fe4d507 100644
--- a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.1-r1
+++ b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost
 SLOT=0
 SRC_URI=http://vina.scripps.edu/download/autodock_vina_1_1_1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63e4230496e65a32c9946c459ee04fc9
diff --git a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2 b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
index e4ea1903dea0..504e2790b2ba 100644
--- a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
+++ b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost
 SLOT=0
 SRC_URI=http://vina.scripps.edu/download/autodock_vina_1_1_2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b469a672b26b4571a05b55d32318a655
diff --git a/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r1 b/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r1
index 0a4e1f8fc945..92fb62cd45d9 100644
--- a/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r1
+++ b/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-chemistry/openbabel-2.2.3 >=x11-libs/qt-gui-4.5.3:4 >=x11-libs/qt-opengl-4.5.3:4 x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0 ) python? ( >=dev-libs/boost-1.35 >=dev-libs/boost-1.35.0-r5[python] dev-python/numpy dev-python/sip ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/avogadro/avogadro-1.0.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4732912c37fac4ffb884f6e87ffe0b5
diff --git a/metadata/md5-cache/sci-chemistry/ball-1.4.1 b/metadata/md5-cache/sci-chemistry/ball-1.4.1
index 24061fee523f..e14a76292f20 100644
--- a/metadata/md5-cache/sci-chemistry/ball-1.4.1
+++ b/metadata/md5-cache/sci-chemistry/ball-1.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-3
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost media-libs/glew sci-libs/fftw:3.0[threads?] sci-libs/gsl sci-libs/libsvm sci-mathematics/lpsolve virtual/opengl x11-libs/libX11 x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl x11-libs/qt-test x11-libs/qt-webkit cuda? ( dev-util/nvidia-cuda-toolkit ) mpi? ( virtual/mpi ) sql? ( x11-libs/qt-sql ) webkit? ( x11-libs/qt-webkit ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/ball-1.4.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a52c9442e6b8ca63a6d4e9eb78c5a684
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r10 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r10
index 436cca0422a2..3d7a741bc33e 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r10
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r10
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4fda5b13fcb1b22b2fc90a27e0b25385
diff --git a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r6 b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r6
index f015f01f1d7a..4169bf46a2a9 100644
--- a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r6
+++ b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r6
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran app-shells/tcsh
 RESTRICT=fetch
 SLOT=0
 SRC_URI=cns_solve_1.21_all-mp.tar.gz aria? ( aria2.3.1.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9f828ba70b5f998942c18ddb6df9e50d
diff --git a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7 b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
index 9aa6c8082713..33d7d38f79bf 100644
--- a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
+++ b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran app-shells/tcsh
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=cns_solve_1.21_all-mp.tar.gz aria? ( aria2.3.2.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22ee47a5d1b7e1a886c3b2941acc9c6b
diff --git a/metadata/md5-cache/sci-chemistry/cns-1.3_p5 b/metadata/md5-cache/sci-chemistry/cns-1.3_p5
index 155711f48f1b..9585b6bb81a8 100644
--- a/metadata/md5-cache/sci-chemistry/cns-1.3_p5
+++ b/metadata/md5-cache/sci-chemistry/cns-1.3_p5
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran app-shells/tcsh
 RESTRICT=fetch
 SLOT=0
 SRC_URI=cns_solve_1.3_all.tar.gz aria? ( aria2.3.1.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2e68a9743b0665b5977829213140954
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.6.2 b/metadata/md5-cache/sci-chemistry/coot-0.6.2
index 56bd01abc6ce..6cc0bff49168 100644
--- a/metadata/md5-cache/sci-chemistry/coot-0.6.2
+++ b/metadata/md5-cache/sci-chemistry/coot-0.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.biop.ox.ac.uk/coot/software/source/releases/coot-0.6.2.tar.gz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.6.2.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aed2d51047e96f0287a371d160b48573
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1 b/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
index 8450e6f35523..d2e163f3f74e 100644
--- a/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
+++ b/metadata/md5-cache/sci-chemistry/coot-0.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.biop.ox.ac.uk/coot/software/source/releases/coot-0.6.2.tar.gz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.6.2.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a680346a7f4308767f7b0c3d820703ab
diff --git a/metadata/md5-cache/sci-chemistry/dssp-0.70831 b/metadata/md5-cache/sci-chemistry/dssp-0.70831
index 17783e68e0f8..79ac67599a00 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-0.70831
+++ b/metadata/md5-cache/sci-chemistry/dssp-0.70831
@@ -7,5 +7,5 @@ LICENSE=free-noncomm
 RESTRICT=fetch
 SLOT=0
 SRC_URI=dssp-070831cmbi.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f142c967293c02c00f8c5711c8eee08a
diff --git a/metadata/md5-cache/sci-chemistry/dssp-070831 b/metadata/md5-cache/sci-chemistry/dssp-070831
index 73510b121d18..c820adaafee5 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-070831
+++ b/metadata/md5-cache/sci-chemistry/dssp-070831
@@ -7,5 +7,5 @@ LICENSE=free-noncomm
 RESTRICT=fetch
 SLOT=0
 SRC_URI=dssp-070831cmbi.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5983dbd067939a327851455277d600d8
diff --git a/metadata/md5-cache/sci-chemistry/gamess-20110811.1 b/metadata/md5-cache/sci-chemistry/gamess-20110811.1
index 5c47dfbcd953..f5e2590e0aac 100644
--- a/metadata/md5-cache/sci-chemistry/gamess-20110811.1
+++ b/metadata/md5-cache/sci-chemistry/gamess-20110811.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran app-shells/tcsh mpi? ( virtual/mpi ) virtual/blas net-mi
 RESTRICT=fetch
 SLOT=0
 SRC_URI=gamess-20110811.1.tar.gz qmmm-tinker? ( tinker.tar.Z )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=571e92d92f6f5cbac284ee727156df9c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.5.5-r1 b/metadata/md5-cache/sci-chemistry/gromacs-4.5.5-r1
index cf2df4ccc098..0ea6ab7257fb 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.5.5-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-4.5.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=fkernels? ( !threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz sse2? ( http://dev.gentoo.org/~alexxy/gromacs/0001-Make-stack-non-executable-for-GAS-assembly.patch.gz ) sse2? ( http://dev.gentoo.org/~alexxy/gromacs/0002-Make-stack-non-executable-for-ATT-assembly.patch.gz ) doc? ( ftp://ftp.gromacs.org/pub/manual/manual-4.5.4.pdf -> gromacs-manual-4.5.4.pdf ) test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-4.0.4.tgz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47b288ceae825356c141f54f1eafdda6
diff --git a/metadata/md5-cache/sci-chemistry/massxpert-1.7.6 b/metadata/md5-cache/sci-chemistry/massxpert-1.7.6
index b500c36bea1b..63cc6e1f3980 100644
--- a/metadata/md5-cache/sci-chemistry/massxpert-1.7.6
+++ b/metadata/md5-cache/sci-chemistry/massxpert-1.7.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui[accessibility] x11-libs/qt-svg x11-libs/qt-xmlpatterns x11-libs/libSM x11-libs/libICE x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXext x11-libs/libXt x11-libs/libXfixes x11-libs/libXau x11-libs/libXdmcp x11-libs/libX11 sys-libs/zlib media-libs/freetype media-libs/fontconfig media-libs/nas media-libs/libpng dev-libs/libxml2:2
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/massxpert/source/massxpert-1.7.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c76adc07e612850ef952876ad3d577cd
diff --git a/metadata/md5-cache/sci-chemistry/massxpert-2.0.5 b/metadata/md5-cache/sci-chemistry/massxpert-2.0.5
index 5dd70a256293..c218fcdb288b 100644
--- a/metadata/md5-cache/sci-chemistry/massxpert-2.0.5
+++ b/metadata/md5-cache/sci-chemistry/massxpert-2.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-svg:4[debug?]
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/massxpert/source/massxpert-2.0.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32338222081bee4dc7435802b59b4ed5
diff --git a/metadata/md5-cache/sci-chemistry/mm-align-20120321 b/metadata/md5-cache/sci-chemistry/mm-align-20120321
index a962883161a4..6d40c07b988f 100644
--- a/metadata/md5-cache/sci-chemistry/mm-align-20120321
+++ b/metadata/md5-cache/sci-chemistry/mm-align-20120321
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/MM-align-20120321.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58501c1a75ad18f4f130dd682bbf828d
diff --git a/metadata/md5-cache/sci-chemistry/molden-4.7 b/metadata/md5-cache/sci-chemistry/molden-4.7
index ccde83eaa628..d25212d6b2b0 100644
--- a/metadata/md5-cache/sci-chemistry/molden-4.7
+++ b/metadata/md5-cache/sci-chemistry/molden-4.7
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=virtual/fortran opengl? ( media-libs/freeglut virtual/opengl ) x11-libs/libXmu
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/molden4.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0267f93f6cd947746c911130342d8c5
diff --git a/metadata/md5-cache/sci-chemistry/molden-4.8-r2 b/metadata/md5-cache/sci-chemistry/molden-4.8-r2
index 41912580d17c..eaffbb747376 100644
--- a/metadata/md5-cache/sci-chemistry/molden-4.8-r2
+++ b/metadata/md5-cache/sci-chemistry/molden-4.8-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=virtual/fortran x11-libs/libXmu opengl? ( media-libs/freeglut virtual/opengl )
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/molden4.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=820683a1a553beb0a532d1c56f4888fd
diff --git a/metadata/md5-cache/sci-chemistry/molden-5.0 b/metadata/md5-cache/sci-chemistry/molden-5.0
index b7ea0533ec43..0e2f5b40f3d1 100644
--- a/metadata/md5-cache/sci-chemistry/molden-5.0
+++ b/metadata/md5-cache/sci-chemistry/molden-5.0
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=virtual/fortran x11-libs/libXmu opengl? ( media-libs/freeglut virtual/opengl )
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/molden5.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e29337f8a850466676967cbc185b36a
diff --git a/metadata/md5-cache/sci-chemistry/molrep-11.0.03 b/metadata/md5-cache/sci-chemistry/molrep-11.0.03
index 0630e55e0196..bdb5556b481b 100644
--- a/metadata/md5-cache/sci-chemistry/molrep-11.0.03
+++ b/metadata/md5-cache/sci-chemistry/molrep-11.0.03
@@ -8,5 +8,5 @@ LICENSE=ccp4
 RDEPEND=virtual/fortran >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb virtual/lapack
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/molrep-11.0.03.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e341535bc609d9a541c3efefb99e7d1
diff --git a/metadata/md5-cache/sci-chemistry/molrep-11.0.03-r1 b/metadata/md5-cache/sci-chemistry/molrep-11.0.03-r1
index 895d4944bea2..76bdbc84eb6f 100644
--- a/metadata/md5-cache/sci-chemistry/molrep-11.0.03-r1
+++ b/metadata/md5-cache/sci-chemistry/molrep-11.0.03-r1
@@ -8,5 +8,5 @@ LICENSE=ccp4
 RDEPEND=virtual/fortran >=sci-libs/ccp4-libs-6.1.3 sci-libs/mmdb virtual/lapack
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/molrep-11.0.03.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=94de0a4fd2d2d9cf91e5bf0b2e08755b
diff --git a/metadata/md5-cache/sci-chemistry/molsketch-0.2.0-r1 b/metadata/md5-cache/sci-chemistry/molsketch-0.2.0-r1
index ca6bb3be312e..f8df78b5913f 100644
--- a/metadata/md5-cache/sci-chemistry/molsketch-0.2.0-r1
+++ b/metadata/md5-cache/sci-chemistry/molsketch-0.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==sci-chemistry/openbabel-2.2* x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-test:4 || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/molsketch/Molsketch-0.2.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cde498ddbc8109c420d4bca7234605f8
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=24b99162ce80559ffba8da42a28454b2
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.6 b/metadata/md5-cache/sci-chemistry/namd-2.6
index 40b66f605929..15d408fc0e90 100644
--- a/metadata/md5-cache/sci-chemistry/namd-2.6
+++ b/metadata/md5-cache/sci-chemistry/namd-2.6
@@ -8,5 +8,5 @@ RDEPEND=app-shells/tcsh =sys-cluster/charm-5.9 =sci-libs/fftw-2* =dev-lang/tcl-8
 RESTRICT=fetch
 SLOT=0
 SRC_URI=NAMD_2.6_Source.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc177885b404e320869d63b37d6afa6f
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.7_beta2 b/metadata/md5-cache/sci-chemistry/namd-2.7_beta2
index 0d5acd999f30..3003c7b82535 100644
--- a/metadata/md5-cache/sci-chemistry/namd-2.7_beta2
+++ b/metadata/md5-cache/sci-chemistry/namd-2.7_beta2
@@ -8,5 +8,5 @@ RDEPEND=app-shells/tcsh sys-cluster/charm =sci-libs/fftw-2* dev-lang/tcl
 RESTRICT=fetch
 SLOT=0
 SRC_URI=NAMD_2.7b2_Source.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac62bdb8e48a743c7adea6ef36abeae2
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.7_beta2-r1 b/metadata/md5-cache/sci-chemistry/namd-2.7_beta2-r1
index f15f84c5e1a1..19028084d1cb 100644
--- a/metadata/md5-cache/sci-chemistry/namd-2.7_beta2-r1
+++ b/metadata/md5-cache/sci-chemistry/namd-2.7_beta2-r1
@@ -8,5 +8,5 @@ RDEPEND=app-shells/tcsh sys-cluster/charm =sci-libs/fftw-2* dev-lang/tcl
 RESTRICT=fetch
 SLOT=0
 SRC_URI=NAMD_2.7b2_Source.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55df5b7afed22f4dc348478f5175fd43
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.3.0 b/metadata/md5-cache/sci-chemistry/openbabel-2.3.0
index 690528575211..0bb4490fb31a 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.3.0
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.3.0
@@ -10,5 +10,5 @@ PDEPEND=perl? ( sci-chemistry/openbabel-perl ) python? ( sci-chemistry/openbabel
 RDEPEND=dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=d63adf151aaf2c5790b3e82602f42c88
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.3.1 b/metadata/md5-cache/sci-chemistry/openbabel-2.3.1
index 85d14e34722d..0d4d7e7e14d2 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.3.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.3.1
@@ -10,5 +10,5 @@ PDEPEND=perl? ( sci-chemistry/openbabel-perl ) python? ( sci-chemistry/openbabel
 RDEPEND=dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=5eb7c56c641f99958a042a5dbfecf571
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0
index 3a056b2fb8b1..9a0172e0f4c8 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0
+++ b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl ~sci-chemistry/openbabel-2.3.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=655faf27c23812273139833de7715bdd
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.1 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.1
index c67bbe850664..f780880a5b8c 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl ~sci-chemistry/openbabel-2.3.1 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=29471507811e5d4ce147be61997c7545
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.1 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.1
index a0ea37e63ab4..d47d669037b8 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel ~sci-chemistry/openbabel-2.3.1 sys-libs/zlib =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f180676d5daa22f5850eba9bb8a12db
diff --git a/metadata/md5-cache/sci-chemistry/pdb-extract-3.11 b/metadata/md5-cache/sci-chemistry/pdb-extract-3.11
new file mode 100644
index 000000000000..30bfe75cc58a
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/pdb-extract-3.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!<app-text/html-xml-utils-5.3 >=sci-libs/cifparse-obj-7.025
+DESCRIPTION=Tools for extracting mmCIF data from structure determination applications
+EAPI=4
+HOMEPAGE=http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=PDB
+RDEPEND=!<app-text/html-xml-utils-5.3
+SLOT=0
+SRC_URI=http://sw-tools.pdb.org/apps/PDB_EXTRACT/pdb-extract-v3.11-prod-src.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2631db57e33b938c5198d2a7466c0b3a
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
index 2dc6128d4695..6f3a16e4717d 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9ff91323aa643daf20936a6792a7803
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
index b8b46e605d23..ab96cef7e393 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df408b8f022cf6c5f3ec8f2a771a9861
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
index 7a507b62f890..de72fe8d0c3f 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.7.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa8796ec278e8ba1b53ab510adf1442d
diff --git a/metadata/md5-cache/sci-chemistry/pdbmat-3.89 b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
index 490b28fb9b80..767fae8242c8 100644
--- a/metadata/md5-cache/sci-chemistry/pdbmat-3.89
+++ b/metadata/md5-cache/sci-chemistry/pdbmat-3.89
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/enm2011.tar.gz -> pdbmat-3.89.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1b50e92131d57766cc8e5f3d7064597
diff --git a/metadata/md5-cache/sci-chemistry/phaser-2.1.4 b/metadata/md5-cache/sci-chemistry/phaser-2.1.4
index c3faba83c6bb..1255506adec3 100644
--- a/metadata/md5-cache/sci-chemistry/phaser-2.1.4
+++ b/metadata/md5-cache/sci-chemistry/phaser-2.1.4
@@ -8,5 +8,5 @@ LICENSE=|| ( phaser phaser-com ccp4 )
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.13/ccp4-6.1.13-phaser-cctbx-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=182b3792950dd828cdc52169aba2d991
diff --git a/metadata/md5-cache/sci-chemistry/platon-20110126 b/metadata/md5-cache/sci-chemistry/platon-20110126
index 845276d947d9..6ca2ef535ff9 100644
--- a/metadata/md5-cache/sci-chemistry/platon-20110126
+++ b/metadata/md5-cache/sci-chemistry/platon-20110126
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran x11-libs/libX11
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cryst.chem.uu.nl/xraysoft/unix/platon.tar.gz -> platon-20110126.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0839082d7dc6cc94f153723cd7d85aab
diff --git a/metadata/md5-cache/sci-chemistry/raster3d-3.0.2 b/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
index 212564b5e7a9..1ff327121624 100644
--- a/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
+++ b/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=virtual/fortran tiff? ( media-libs/tiff:0 ) gd? ( media-libs/gd[jpeg,png] )
 SLOT=0
 SRC_URI=http://www.bmsc.washington.edu/raster3d/Raster3D_3.0-2.tar.gz -> Raster3D_3.0-2.tar
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1bde7ecee7200551f27f37e4e358335
diff --git a/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r2 b/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r2
index d25e18ff6466..70cc659ba116 100644
--- a/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r2
+++ b/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r2
@@ -9,5 +9,5 @@ LICENSE=ccp4
 RDEPEND=sci-chemistry/makecif >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/mmdb <sci-libs/monomer-db-1 virtual/blas virtual/fortran virtual/lapack
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_stable/refmac_5.5.0110.tar.gz test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7139efbff2a26c21601c997742e8d36
diff --git a/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r3 b/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r3
index ae234a4918cb..78672af1bdaf 100644
--- a/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r3
+++ b/metadata/md5-cache/sci-chemistry/refmac-5.5.0110-r3
@@ -9,5 +9,5 @@ LICENSE=ccp4
 RDEPEND=sci-chemistry/makecif >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/mmdb <sci-libs/monomer-db-1 virtual/blas virtual/fortran virtual/lapack
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_stable/refmac_5.5.0110.tar.gz test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d59d35eb7cf462ece6b9618099d9a546
diff --git a/metadata/md5-cache/sci-chemistry/refmac-5.6.0117 b/metadata/md5-cache/sci-chemistry/refmac-5.6.0117
index 36cffa316e3b..7c40ee7dd4d8 100644
--- a/metadata/md5-cache/sci-chemistry/refmac-5.6.0117
+++ b/metadata/md5-cache/sci-chemistry/refmac-5.6.0117
@@ -9,5 +9,5 @@ LICENSE=ccp4
 RDEPEND=!sci-chemistry/makecif >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/mmdb >sci-libs/monomer-db-1 virtual/blas virtual/fortran virtual/lapack
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_experimental/refmac5.6_source_v5.6.0117.tar.gz test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5517193505733003fe39a73683b141dd
diff --git a/metadata/md5-cache/sci-chemistry/refmac-5.6.0119 b/metadata/md5-cache/sci-chemistry/refmac-5.6.0119
index f46c8fc62817..b38c7ae19b1d 100644
--- a/metadata/md5-cache/sci-chemistry/refmac-5.6.0119
+++ b/metadata/md5-cache/sci-chemistry/refmac-5.6.0119
@@ -9,5 +9,5 @@ LICENSE=ccp4
 RDEPEND=!sci-chemistry/makecif >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/mmdb >sci-libs/monomer-db-1 virtual/blas virtual/fortran virtual/lapack
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_experimental/refmac5.6_source_v5.6.0119.tar.gz test? ( http://dev.gentooexperimental.org/~jlec/distfiles/test-framework.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2015d8c21d63f37c36138b1219d757b9
diff --git a/metadata/md5-cache/sci-chemistry/shelx-20060317-r1 b/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
index e6a2d51a20b0..3021ebc63d99 100644
--- a/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
+++ b/metadata/md5-cache/sci-chemistry/shelx-20060317-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=shelx-20060317.tgz openmp? ( shelx-20060317-mp.tgz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db6a257ab6ad907fed12df607d2004f1
diff --git a/metadata/md5-cache/sci-chemistry/sparky-3.115 b/metadata/md5-cache/sci-chemistry/sparky-3.115
index 9ff31cae9ea0..600ad1cc032c 100644
--- a/metadata/md5-cache/sci-chemistry/sparky-3.115
+++ b/metadata/md5-cache/sci-chemistry/sparky-3.115
@@ -10,5 +10,5 @@ RDEPEND=app-shells/tcsh =dev-lang/python-2* =dev-lang/python-2*[tk]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cgl.ucsf.edu/home/sparky/distrib-3.115/sparky-source-3.115.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3893457a4b0531a712299468aebc5aa
diff --git a/metadata/md5-cache/sci-chemistry/tinker-6 b/metadata/md5-cache/sci-chemistry/tinker-6
index 2157cf9463f9..f76e719ba181 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-6
+++ b/metadata/md5-cache/sci-chemistry/tinker-6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !dev-util/diffu
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a232249def3ce0e844cabc38d33c9942
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20120124 b/metadata/md5-cache/sci-chemistry/tm-align-20120124
index e89fc5a15b54..ebcc7d8b73ff 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20120124
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20120124
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20120124.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8804d4c9bc60215e40c22147a4bf3ea
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.2.2 b/metadata/md5-cache/sci-chemistry/votca-csg-1.2.2
index 1b71a6ebda62..a771eb300c45 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.2.2
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.2.2
@@ -11,5 +11,5 @@ RDEPEND==sci-libs/votca-tools-1.2.2[system-boost=] gromacs? ( sci-chemistry/grom
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=http://votca.googlecode.com/files/votca-csg-1.2.2.tar.gz doc? ( http://votca.googlecode.com/files/votca-csg-manual-1.2.2.pdf ) examples? ( http://votca.googlecode.com/files/votca-csg-tutorials-1.2.2.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=501c51521b8f6c387d571221527a867a
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.2.2 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.2.2
index 1d199716627d..397890538872 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.2.2
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.2.2
@@ -9,5 +9,5 @@ RDEPEND==sci-chemistry/votca-csg-1.2.2
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=http://votca.googlecode.com/files/votca-csgapps-1.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e173f2c1ffbd477f4c569fef664b924
diff --git a/metadata/md5-cache/sci-electronics/alliance-5.0.20060509 b/metadata/md5-cache/sci-electronics/alliance-5.0.20060509
index c2b6cf091f80..5108ffe78122 100644
--- a/metadata/md5-cache/sci-electronics/alliance-5.0.20060509
+++ b/metadata/md5-cache/sci-electronics/alliance-5.0.20060509
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/openmotif-2.3:0
 SLOT=0
 SRC_URI=http://www-asim.lip6.fr/pub/alliance/distribution/5.0/alliance-5.0-20060509.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3aba4769f9b1f73c3f925f1d5584f501
diff --git a/metadata/md5-cache/sci-electronics/alliance-5.0.20070718 b/metadata/md5-cache/sci-electronics/alliance-5.0.20070718
index fc7ec2aed542..dfdc047c5c76 100644
--- a/metadata/md5-cache/sci-electronics/alliance-5.0.20070718
+++ b/metadata/md5-cache/sci-electronics/alliance-5.0.20070718
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/openmotif-2.3:0 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www-asim.lip6.fr/pub/alliance/distribution/5.0/alliance-5.0-20070718.tar.gz doc? ( http://www-asim.lip6.fr/pub/alliance/distribution/5.0/alliance-tutorials-5.0-20070718.i386.rpm )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=098267d5c11f865919f1213322b815d4
diff --git a/metadata/md5-cache/sci-electronics/alliance-5.0.20110203 b/metadata/md5-cache/sci-electronics/alliance-5.0.20110203
index b74a7620a55b..9fffada49cec 100644
--- a/metadata/md5-cache/sci-electronics/alliance-5.0.20110203
+++ b/metadata/md5-cache/sci-electronics/alliance-5.0.20110203
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://www-asim.lip6.fr/pub/alliance/distribution/5.0/alliance-5.0-20110203.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f62a08a1ac99191310be346f22783e3
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.3.2 b/metadata/md5-cache/sci-electronics/cirkuit-0.3.2
index 099f3ffd8f15..a1416868ee65 100644
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.3.2
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] virtual/latex-base media-libs/netpbm dev-texlive/texlive-pstricks app-text/ghostscript-gpl app-text/ps2eps media-gfx/pdf2svg >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.3.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f2333fa8b2f5b062ab94e2bc3bad8566
diff --git a/metadata/md5-cache/sci-electronics/kicad-20120119_p3256 b/metadata/md5-cache/sci-electronics/kicad-20120119_p3256
index cdebaa1d4eae..c78096ecd62b 100644
--- a/metadata/md5-cache/sci-electronics/kicad-20120119_p3256
+++ b/metadata/md5-cache/sci-electronics/kicad-20120119_p3256
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X,opengl] sys-libs/zlib sci-electronics/electronics-menu
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bzr	ec4306b727be7630f6d5abaf08c8b818	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bzr	ec4306b727be7630f6d5abaf08c8b818	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=42505ce84e84fa0b6bd3cf221512ff7e
diff --git a/metadata/md5-cache/sci-electronics/kicad-99999999 b/metadata/md5-cache/sci-electronics/kicad-99999999
index 75881fbae5d5..3bc100a06749 100644
--- a/metadata/md5-cache/sci-electronics/kicad-99999999
+++ b/metadata/md5-cache/sci-electronics/kicad-99999999
@@ -7,5 +7,5 @@ IUSE=dev-doc debug doc examples minimal python
 LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X,opengl] sys-libs/zlib sci-electronics/electronics-menu
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bzr	ec4306b727be7630f6d5abaf08c8b818	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bzr	ec4306b727be7630f6d5abaf08c8b818	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=dfb805ac7ecb43167935dc3ec3033984
diff --git a/metadata/md5-cache/sci-electronics/ngspice-24 b/metadata/md5-cache/sci-electronics/ngspice-24
index 4218d9a44f4a..c882f9b5eed9 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-24
+++ b/metadata/md5-cache/sci-electronics/ngspice-24
@@ -10,4 +10,4 @@ RDEPEND=readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libX
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-24.tar.gz mirror://sourceforge/ngspice/ngspice24-manual.pdf.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6a8721cf826254631ae96c01b05ad080
+_md5_=ef7a15f6db4423910e09f5a4a02ad95a
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1 b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
index 412348636eea..af00700af8c3 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
+++ b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/libgnome >=gnome-base/libgnomeui-2.12 >=gnome-base/libgnomecanvas-2.12 >=x11-libs/cairo-1.2 x11-libs/gtksourceview:2.0 sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oregano/oregano_0.69.1.orig.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe6d23f18dd1e81b7bbcd9667a2ff96a
diff --git a/metadata/md5-cache/sci-electronics/osqoop-1.1.1 b/metadata/md5-cache/sci-electronics/osqoop-1.1.1
index 7391e1c29a00..ec76db25b39a 100644
--- a/metadata/md5-cache/sci-electronics/osqoop-1.1.1
+++ b/metadata/md5-cache/sci-electronics/osqoop-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://gentoo/osqoop-1.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6273fcaf94632486d6258e393244f58b
diff --git a/metadata/md5-cache/sci-electronics/puff-20100127 b/metadata/md5-cache/sci-electronics/puff-20100127
index e2001ffa4046..5e8e5cede313 100644
--- a/metadata/md5-cache/sci-electronics/puff-20100127
+++ b/metadata/md5-cache/sci-electronics/puff-20100127
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.vf.utwente.nl/~ptdeboer/ham/puff/puff-20100127.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=96d84ffd72cb351e8279b9481c2e38aa
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5 b/metadata/md5-cache/sci-electronics/spice-3.5.5
index 7502d66289c6..2193277acda1 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses x11-libs/libXaw
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2567904396bf5ece8accdad3943a4409
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5-r1 b/metadata/md5-cache/sci-electronics/spice-3.5.5-r1
index 0ac1e33cb723..66e1d5826d1f 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5-r1
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5-r1
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/ncurses x11-libs/libXaw >=app-misc/editor-wrapper-3
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=afe89b7a0fd2dc963607e7e2bae4fa4d
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-6.0.1 b/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
index a121d3bcdd1b..3411837701fd 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
+++ b/metadata/md5-cache/sci-geosciences/mapserver-6.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) =www-servers/apache-2* >=app-admin/webapp-config-1.50.15 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] php? ( || ( =sci-geosciences/mapserver-6.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) )
 SLOT=0
 SRC_URI=http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=cdd52d62128f1e1c02bc38e8c2b4f0d2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-2.5.0 b/metadata/md5-cache/sci-geosciences/opencpn-2.5.0
index f89d1d12ff87..cc3004cbe0a4 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-2.5.0
+++ b/metadata/md5-cache/sci-geosciences/opencpn-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/tinyxml media-libs/freetype:2 sys-libs/zlib virtual/opengl x11-libs/gtk+:2 >=x11-libs/wxGTK-2.8.8[X] gpsd? ( >=sci-geosciences/gpsd-2.90 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencpn/OpenCPN-2.5.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=1a99dae5144fc4a0554660db44af0ca2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-2.5.0-r1 b/metadata/md5-cache/sci-geosciences/opencpn-2.5.0-r1
index 01acfcf00ca2..1153261429d6 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-2.5.0-r1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/tinyxml media-libs/freetype:2 sys-libs/zlib virtual/opengl x11-libs/gtk+:2 >=x11-libs/wxGTK-2.8.11.0[X] gps? ( >=sci-geosciences/gpsd-2.95 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opencpn/OpenCPN-2.5.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=63d9d310b33fec677112e6da3619f95d
diff --git a/metadata/md5-cache/sci-geosciences/openstreetmap-icons-20110601 b/metadata/md5-cache/sci-geosciences/openstreetmap-icons-20110601
index 04ee2c5314d7..3ad11a1680e6 100644
--- a/metadata/md5-cache/sci-geosciences/openstreetmap-icons-20110601
+++ b/metadata/md5-cache/sci-geosciences/openstreetmap-icons-20110601
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~scarabeus/openstreetmap-icons-20110601.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=152925d247eaea348e1eb3716f67e5e6
diff --git a/metadata/md5-cache/sci-geosciences/openstreetmap-icons-99999999 b/metadata/md5-cache/sci-geosciences/openstreetmap-icons-99999999
index 2d7d4f85f790..7a0b2207782a 100644
--- a/metadata/md5-cache/sci-geosciences/openstreetmap-icons-99999999
+++ b/metadata/md5-cache/sci-geosciences/openstreetmap-icons-99999999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://www.openstreetmap.org/
 LICENSE=public-domain
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ab77800fc71345823e7c19232de083f
diff --git a/metadata/md5-cache/sci-geosciences/qgis-1.7.0 b/metadata/md5-cache/sci-geosciences/qgis-1.7.0
index 29ff811c1110..de49a02f0187 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-1.7.0
+++ b/metadata/md5-cache/sci-geosciences/qgis-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,pytho
 RESTRICT=test
 SLOT=0
 SRC_URI=http://qgis.org/downloads/qgis-1.7.0.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d57696c5847ec49ba86244a124bd721
diff --git a/metadata/md5-cache/sci-geosciences/qgis-1.7.4 b/metadata/md5-cache/sci-geosciences/qgis-1.7.4
index b75dbb9c0d53..de748fe19407 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-1.7.4
+++ b/metadata/md5-cache/sci-geosciences/qgis-1.7.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,pytho
 RESTRICT=test
 SLOT=0
 SRC_URI=http://qgis.org/downloads/qgis-1.7.4.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72b6c5f25111661fe50283d0fe688af3
diff --git a/metadata/md5-cache/sci-geosciences/qlandkartegt-1.4.2 b/metadata/md5-cache/sci-geosciences/qlandkartegt-1.4.2
index f6475c51fc90..14d791539862 100644
--- a/metadata/md5-cache/sci-geosciences/qlandkartegt-1.4.2
+++ b/metadata/md5-cache/sci-geosciences/qlandkartegt-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-libs/gdal-1.8 >=sci-libs/proj-4.7 sys-libs/zlib x11-libs/qt-gui:4[dbus?] x11-libs/qt-script:4 x11-libs/qt-sql:4[sqlite] x11-libs/qt-webkit:4 dmtx? ( media-libs/libdmtx ) exif? ( media-libs/libexif ) gps? ( >=sci-geosciences/gpsd-2.90 ) gpsbabel? ( sci-geosciences/gpsbabel ) opengl? ( x11-libs/qt-opengl:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/qlandkartegt/qlandkartegt-1.4.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f788f9a610a80e30a16423bf0357520a
diff --git a/metadata/md5-cache/sci-geosciences/qlandkartegt-garmindev-0.3.4 b/metadata/md5-cache/sci-geosciences/qlandkartegt-garmindev-0.3.4
index dfe178383bea..10d48b99a0d8 100644
--- a/metadata/md5-cache/sci-geosciences/qlandkartegt-garmindev-0.3.4
+++ b/metadata/md5-cache/sci-geosciences/qlandkartegt-garmindev-0.3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 sci-geosciences/qlandkartegt
 SLOT=0
 SRC_URI=mirror://sourceforge/qlandkartegt/garmindev-0.3.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bfbabd40f4edd75984a67c7088a78818
diff --git a/metadata/md5-cache/sci-libs/armadillo-3.0.2 b/metadata/md5-cache/sci-libs/armadillo-3.0.2
index c3751b244ab3..2d5a84800abf 100644
--- a/metadata/md5-cache/sci-libs/armadillo-3.0.2
+++ b/metadata/md5-cache/sci-libs/armadillo-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.34 atlas? ( sci-libs/lapack-atlas ) blas? ( virtual/blas ) lapack? ( virtual/lapack )
 SLOT=0
 SRC_URI=mirror://sourceforge/arma/armadillo-3.0.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31c2ba3e32c173a03d688bb0357e2394
diff --git a/metadata/md5-cache/sci-libs/armadillo-3.2.2 b/metadata/md5-cache/sci-libs/armadillo-3.2.2
index f0c486c63ca3..46c2fc8b0929 100644
--- a/metadata/md5-cache/sci-libs/armadillo-3.2.2
+++ b/metadata/md5-cache/sci-libs/armadillo-3.2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.34 atlas? ( sci-libs/lapack-atlas ) blas? ( virtual/blas ) lapack? ( virtual/lapack )
 SLOT=0
 SRC_URI=mirror://sourceforge/arma/armadillo-3.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4786f6dba5ca10f7f10e1260e8d2758a
diff --git a/metadata/md5-cache/sci-libs/arpack-0.96-r3 b/metadata/md5-cache/sci-libs/arpack-0.96-r3
index 2251f270d056..386cc3af6b7f 100644
--- a/metadata/md5-cache/sci-libs/arpack-0.96-r3
+++ b/metadata/md5-cache/sci-libs/arpack-0.96-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 SLOT=0
 SRC_URI=http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz http://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.gz http://dev.gentoo.org/~bicatali/arpack-96-patches-2.tar.bz2 doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5dcc83f2dd37db149e3eab19099a0955
diff --git a/metadata/md5-cache/sci-libs/arpack-3.0.2 b/metadata/md5-cache/sci-libs/arpack-3.0.2
index 36ea7afa6db8..a415621f7134 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.0.2
+++ b/metadata/md5-cache/sci-libs/arpack-3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack_3.0.2.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ceed1b698baa6d1e0a629962cd9f32d
diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.1 b/metadata/md5-cache/sci-libs/arpack-3.1.1
index 4cd437840737..28a7475fd964 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.1.1
+++ b/metadata/md5-cache/sci-libs/arpack-3.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng_3.1.1.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=242e504bc504fd549e9af8533f4bf2c0
diff --git a/metadata/md5-cache/sci-libs/arpack-96-r3 b/metadata/md5-cache/sci-libs/arpack-96-r3
index 67db78d9b59d..d88e081a576a 100644
--- a/metadata/md5-cache/sci-libs/arpack-96-r3
+++ b/metadata/md5-cache/sci-libs/arpack-96-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 SLOT=0
 SRC_URI=http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz http://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.gz http://dev.gentoo.org/~bicatali/arpack-96-patches-2.tar.bz2 doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=680db43a8ddb873f3528f1088af17d96
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226 b/metadata/md5-cache/sci-libs/blas-reference-20070226
index 3df34986f55f..1aa9028d7ea4 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-blas doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f82b465b716c1abc24d157f94511da2
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226-r1 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r1
index 7539b06c454d..1d73752f49db 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r1
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-blas doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9ec89269ce9d104233d25f47b807dd5
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226-r2 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
index 8dbbacbfdde0..90ac358e62d3 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-blas doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=515a81565e170fe519efb623cf1fc75c
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.0-r3 b/metadata/md5-cache/sci-libs/cbflib-0.9.0-r3
index a5db22d3bad6..d1946dcc4ca8 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.0-r3
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.0_14Feb10.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d961118c6c79209c56adce3311bfe07c
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.2.2 b/metadata/md5-cache/sci-libs/cbflib-0.9.2.2
index 3a9c391f29ba..8d5763405c76 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.2.2
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.2.2.tar.gz test? ( mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Input.tar.gz mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Output.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b108f950ef68a4f70a389fbf4d09dee
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.2.3 b/metadata/md5-cache/sci-libs/cbflib-0.9.2.3
index 0a3e82a0a1a2..e514a9367aac 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.2.3
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.2.3.tar.gz test? ( mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Input.tar.gz mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Output.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85d6f0238a4bb2afcb6d65f1a67e1eac
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.2.3-r1 b/metadata/md5-cache/sci-libs/cbflib-0.9.2.3-r1
index fb60981af777..10ca298b439e 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.2.3-r1
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.2.3.tar.gz test? ( mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Input.tar.gz mirror://sourceforge/cbflib/CBFlib_0.9.2_Data_Files_Output.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44b9c44e509e0d9035b403e2fc38733c
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.2.4 b/metadata/md5-cache/sci-libs/cbflib-0.9.2.4
index 595ae76cfc86..ed224d87ed50 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.2.4
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.2.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.2.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbe07accd130b54468077a306b17fc8d
diff --git a/metadata/md5-cache/sci-libs/clapack-3.2.1-r6 b/metadata/md5-cache/sci-libs/clapack-3.2.1-r6
index ac68679675fd..3aa7d6da188f 100644
--- a/metadata/md5-cache/sci-libs/clapack-3.2.1-r6
+++ b/metadata/md5-cache/sci-libs/clapack-3.2.1-r6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libf2c-20090407-r1 virtual/blas
 SLOT=0
 SRC_URI=http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd16bf62c514bf273e1c519550b7f164
diff --git a/metadata/md5-cache/sci-libs/clipper-20100511 b/metadata/md5-cache/sci-libs/clipper-20100511
index 72e24ebff8d9..9c56903c4e51 100644
--- a/metadata/md5-cache/sci-libs/clipper-20100511
+++ b/metadata/md5-cache/sci-libs/clipper-20100511
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-100511-ac.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f46e342fa75d52049c08877d850d059
diff --git a/metadata/md5-cache/sci-libs/clipper-20100511-r1 b/metadata/md5-cache/sci-libs/clipper-20100511-r1
index 3be66d562543..b1d03c3b9ef9 100644
--- a/metadata/md5-cache/sci-libs/clipper-20100511-r1
+++ b/metadata/md5-cache/sci-libs/clipper-20100511-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb
 SLOT=0
 SRC_URI=http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-100511-ac.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d104912b5553c51895259cc66277a4f
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.1 b/metadata/md5-cache/sci-libs/cln-1.3.1
index 5a74233c4c78..88e3bfc3b6a5 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.1
+++ b/metadata/md5-cache/sci-libs/cln-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fa228d005ba02ec57c3447358b034c0
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.2 b/metadata/md5-cache/sci-libs/cln-1.3.2
index e9735864345f..1061ead11b46 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.2
+++ b/metadata/md5-cache/sci-libs/cln-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp doc? ( virtual/latex-base )
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd6b5ca8a41a7816732316cd2dcba77d
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.1.4 b/metadata/md5-cache/sci-libs/cminpack-1.1.4
index d706bb64f80b..14b915dd0620 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.1.4
+++ b/metadata/md5-cache/sci-libs/cminpack-1.1.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://devernay.free.fr/hacks/cminpack/cminpack-1.1.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c5d19591da16c929a618ef6cbb9e886
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.2.2 b/metadata/md5-cache/sci-libs/cminpack-1.2.2
index 25bad927be53..549434582532 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.2.2
+++ b/metadata/md5-cache/sci-libs/cminpack-1.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://devernay.free.fr/hacks/cminpack//cminpack-1.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c879cfef161cddfb75821a6f444686aa
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.3.0 b/metadata/md5-cache/sci-libs/cminpack-1.3.0
index b7dad9ab65ed..ca5b028c7e7a 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.3.0
+++ b/metadata/md5-cache/sci-libs/cminpack-1.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://devernay.free.fr/hacks/cminpack//cminpack-1.3.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1abc434ab65c980a7f762573454373fe
diff --git a/metadata/md5-cache/sci-libs/cqrlib-1.0.6 b/metadata/md5-cache/sci-libs/cqrlib-1.0.6
index 098de7caf898..c7de045b9058 100644
--- a/metadata/md5-cache/sci-libs/cqrlib-1.0.6
+++ b/metadata/md5-cache/sci-libs/cqrlib-1.0.6
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/cqrlib/CQRlib-1.0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24997ae5f6305b62ca008ccefecc0fbd
diff --git a/metadata/md5-cache/sci-libs/cqrlib-1.1.2 b/metadata/md5-cache/sci-libs/cqrlib-1.1.2
index 98d76956e35e..9c6273ebc9a7 100644
--- a/metadata/md5-cache/sci-libs/cqrlib-1.1.2
+++ b/metadata/md5-cache/sci-libs/cqrlib-1.1.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/cqrlib/CQRlib-1.1.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4323c98d2f71279b0e994222bd88a483
diff --git a/metadata/md5-cache/sci-libs/cqrlib-1.1.2-r1 b/metadata/md5-cache/sci-libs/cqrlib-1.1.2-r1
index c5555e52b4ac..fb5af30e033a 100644
--- a/metadata/md5-cache/sci-libs/cqrlib-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/cqrlib-1.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/cqrlib/CQRlib-1.1.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29cf746c964cf67096e1127552af80ac
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76 b/metadata/md5-cache/sci-libs/djbfft-0.76
index 39766a514460..234558ee5525 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76
@@ -6,5 +6,5 @@ LICENSE=public-domain
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c6de81224ce2b68fc7a8807091e254f
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76-r1 b/metadata/md5-cache/sci-libs/djbfft-0.76-r1
index 777236aaa7ca..c6227e9da3e1 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76-r1
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76-r1
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-f
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f4fb40b38000616abcaa0412ecb7f03
diff --git a/metadata/md5-cache/sci-libs/fftw-2.1.5-r5 b/metadata/md5-cache/sci-libs/fftw-2.1.5-r5
index 7fdeb33e7858..c095a4a13347 100644
--- a/metadata/md5-cache/sci-libs/fftw-2.1.5-r5
+++ b/metadata/md5-cache/sci-libs/fftw-2.1.5-r5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran ) mpi? ( virtual/mpi )
 SLOT=2.1
 SRC_URI=http://www.fftw.org/fftw-2.1.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1986b842bb4fbaa1c47d8635445a8a4
diff --git a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8 b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
index b1f20893bc77..bf0a452f8f18 100644
--- a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
+++ b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran ) mpi? ( virtual/mpi )
 SLOT=2.1
 SRC_URI=http://www.fftw.org/fftw-2.1.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b09d0c4044fd3d44de6949591b238cc
diff --git a/metadata/md5-cache/sci-libs/fftw-3.2.2 b/metadata/md5-cache/sci-libs/fftw-3.2.2
index bfec4ff106b1..53a9b9266607 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.2.2
+++ b/metadata/md5-cache/sci-libs/fftw-3.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.2.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4be8dfb7781425902dd0b95486b32e65
diff --git a/metadata/md5-cache/sci-libs/fftw-3.2.2-r1 b/metadata/md5-cache/sci-libs/fftw-3.2.2-r1
index 5f4872451672..2f2e8a681642 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.2.2-r1
+++ b/metadata/md5-cache/sci-libs/fftw-3.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.2.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3706cbc06f8a688f20aae0aa287a489
diff --git a/metadata/md5-cache/sci-libs/fftw-3.2.2-r2 b/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
index a8791b117257..5974fed35eb9 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
+++ b/metadata/md5-cache/sci-libs/fftw-3.2.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.2.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e5bbabecfabd6ad162b58fef45fecde
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3-r1 b/metadata/md5-cache/sci-libs/fftw-3.3-r1
index 3ca637dbeb6e..1747451795a4 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3-r1
+++ b/metadata/md5-cache/sci-libs/fftw-3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran ) mpi? ( virtual/mpi )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=955ae615086e0e7d76c67bcd059b62d1
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3-r2 b/metadata/md5-cache/sci-libs/fftw-3.3-r2
index 01fa30de69a1..99dae93dd41d 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3-r2
+++ b/metadata/md5-cache/sci-libs/fftw-3.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran[openmp?] ) mpi? ( virtual/mpi )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4e37943181b543cbb21ba3ded604a66e
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.1 b/metadata/md5-cache/sci-libs/fftw-3.3.1
index 064588340ed3..16322146977d 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.1
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran[openmp?] ) mpi? ( virtual/mpi )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a451e7c628bc4ee881fdb7955517936b
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.2 b/metadata/md5-cache/sci-libs/fftw-3.3.2
index 12ab60885efe..7e065f0cecc4 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.2
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=fortran? ( virtual/fortran[openmp?] ) mpi? ( virtual/mpi )
 SLOT=3.0
 SRC_URI=http://www.fftw.org/fftw-3.3.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cbc8c8118f47d1219f42ecdd39585c5
diff --git a/metadata/md5-cache/sci-libs/flann-1.6.10 b/metadata/md5-cache/sci-libs/flann-1.6.10
index b14421257ad1..cc12bff61811 100644
--- a/metadata/md5-cache/sci-libs/flann-1.6.10
+++ b/metadata/md5-cache/sci-libs/flann-1.6.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/hdf5[mpi?] mpi? ( dev-libs/boost[mpi] ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.10-src.zip test? ( http://dev.gentoo.org/~dilfridge/distfiles/flann-1.6.10-testdata.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a65df7ed2951adf54e69006673562ff
diff --git a/metadata/md5-cache/sci-libs/flann-1.6.11 b/metadata/md5-cache/sci-libs/flann-1.6.11
index 36be614f4344..3fbfca2e8494 100644
--- a/metadata/md5-cache/sci-libs/flann-1.6.11
+++ b/metadata/md5-cache/sci-libs/flann-1.6.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/hdf5[mpi?] mpi? ( dev-libs/boost[mpi] ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.11-src.zip test? ( http://dev.gentoo.org/~dilfridge/distfiles/flann-1.6.10-testdata.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a3ec57a46e10d281266cbaf9b92edcd
diff --git a/metadata/md5-cache/sci-libs/flann-1.6.8 b/metadata/md5-cache/sci-libs/flann-1.6.8
index cf2678acd0b6..d1312baf0a49 100644
--- a/metadata/md5-cache/sci-libs/flann-1.6.8
+++ b/metadata/md5-cache/sci-libs/flann-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/hdf5[mpi,threads] python? ( dev-python/numpy ) python? ( || ( =
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.8-src.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9a335532f7f5e263febfc9f33ac2b7c
diff --git a/metadata/md5-cache/sci-libs/flann-1.7.1 b/metadata/md5-cache/sci-libs/flann-1.7.1
index e5c58fca6d95..dc05d01f15eb 100644
--- a/metadata/md5-cache/sci-libs/flann-1.7.1
+++ b/metadata/md5-cache/sci-libs/flann-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/hdf5[mpi?] mpi? ( dev-libs/boost[mpi] ) octave? ( sci-mathematics/octave ) python? ( dev-python/numpy ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.7.1-src.zip test? ( http://dev.gentoo.org/~dilfridge/distfiles/flann-1.6.10-testdata.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8530ce45c7004f0ab6e5e20e4be37fc0
diff --git a/metadata/md5-cache/sci-libs/gerris-20111123 b/metadata/md5-cache/sci-libs/gerris-20111123
index 78eb8b40bebc..383e37b2ea09 100644
--- a/metadata/md5-cache/sci-libs/gerris-20111123
+++ b/metadata/md5-cache/sci-libs/gerris-20111123
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre sci-libs/lis sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/gerris-20111123.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5322da35e7ef25da672a73accf000e5
diff --git a/metadata/md5-cache/sci-libs/gsl-1.13-r1 b/metadata/md5-cache/sci-libs/gsl-1.13-r1
index b0090c98202c..0b061e4ad774 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.13-r1
+++ b/metadata/md5-cache/sci-libs/gsl-1.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=af764db5ded764a29a3abe33521c3e92
diff --git a/metadata/md5-cache/sci-libs/gsl-1.13-r2 b/metadata/md5-cache/sci-libs/gsl-1.13-r2
index 10cc8036d389..63b658a1758b 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.13-r2
+++ b/metadata/md5-cache/sci-libs/gsl-1.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d64761143bc6fa4a149b795c6d291348
diff --git a/metadata/md5-cache/sci-libs/gsl-1.14 b/metadata/md5-cache/sci-libs/gsl-1.14
index 91fccae04809..ee812f69c2c0 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.14
+++ b/metadata/md5-cache/sci-libs/gsl-1.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.14.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47ea64da2da41c5be395aeb1823244e2
diff --git a/metadata/md5-cache/sci-libs/gsl-1.14-r1 b/metadata/md5-cache/sci-libs/gsl-1.14-r1
index 56f593d98b83..8de8e7300df9 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.14-r1
+++ b/metadata/md5-cache/sci-libs/gsl-1.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.14.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=12fd3bcd81957e394398f6c464c0214c
diff --git a/metadata/md5-cache/sci-libs/gsl-1.15 b/metadata/md5-cache/sci-libs/gsl-1.15
index 3ca4c3913613..b40729b45938 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.15
+++ b/metadata/md5-cache/sci-libs/gsl-1.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
 SRC_URI=mirror://gnu/gsl/gsl-1.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7c69b43853543c07b9a6ba4ff6eea0e
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.6 b/metadata/md5-cache/sci-libs/hdf-4.2.6
index 806375edecc1..d2c863bfee5f 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.6
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.6
@@ -9,5 +9,5 @@ LICENSE=NCSA-HDF
 RDEPEND=virtual/jpeg sys-libs/zlib fortran? ( virtual/jpeg ) szip? ( >=sci-libs/szip-2 )
 SLOT=0
 SRC_URI=ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/hdf-4.2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fbaa32bdd90fe0e7edf94976b606b82
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.7_p1 b/metadata/md5-cache/sci-libs/hdf-4.2.7_p1
index 1f56bd1d13c7..f8159699518b 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.7_p1
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.7_p1
@@ -9,5 +9,5 @@ LICENSE=NCSA-HDF
 RDEPEND=virtual/jpeg sys-libs/zlib fortran? ( virtual/jpeg ) szip? ( >=sci-libs/szip-2 )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.7-patch1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f91fb1bdf0408178eca000a87f4f0336
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2_p4 b/metadata/md5-cache/sci-libs/hdf-4.2_p4
index eb359407b4a1..a96c85e0b3d8 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2_p4
+++ b/metadata/md5-cache/sci-libs/hdf-4.2_p4
@@ -9,5 +9,5 @@ LICENSE=NCSA-HDF
 RDEPEND=fortran? ( virtual/fortran ) sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 )
 SLOT=0
 SRC_URI=ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF4.2r4.tar.gz mirror://gentoo/hdf-4.2_p4-patches.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1793ab3014f490554718fea953cd76a1
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.8.9-r2 b/metadata/md5-cache/sci-libs/hdf5-1.8.9-r2
index 4cc661bb2d12..88ba1f23cfdb 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.8.9-r2
+++ b/metadata/md5-cache/sci-libs/hdf5-1.8.9-r2
@@ -10,5 +10,5 @@ RDEPEND=fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-l
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran ) fortran2003? ( fortran )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.9/src/hdf5-1.8.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20fa52e45491e80090ae7f37ed95aca8
diff --git a/metadata/md5-cache/sci-libs/indilib-0.6 b/metadata/md5-cache/sci-libs/indilib-0.6
index 5c3ee6d88139..162ca5171358 100644
--- a/metadata/md5-cache/sci-libs/indilib-0.6
+++ b/metadata/md5-cache/sci-libs/indilib-0.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=sys-libs/zlib fits? ( >=sci-libs/cfitsio-3.140 ) nova? ( >=sci-libs/libnova-0.12.1 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/indi/libindi0_0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7bfc53488b7fb2d906543370d544db1c
diff --git a/metadata/md5-cache/sci-libs/indilib-0.7.2 b/metadata/md5-cache/sci-libs/indilib-0.7.2
index 5a5aaf2b0470..731e5a493f19 100644
--- a/metadata/md5-cache/sci-libs/indilib-0.7.2
+++ b/metadata/md5-cache/sci-libs/indilib-0.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=sys-libs/zlib fits? ( >=sci-libs/cfitsio-3.140 ) nova? ( >=sci-libs/libnova-0.12.1 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/indi/libindi_0.7.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f146c82330114f4f0c546da19b58f2cf
diff --git a/metadata/md5-cache/sci-libs/indilib-0.9.1 b/metadata/md5-cache/sci-libs/indilib-0.9.1
index eaf6f567b979..d57eee703652 100644
--- a/metadata/md5-cache/sci-libs/indilib-0.9.1
+++ b/metadata/md5-cache/sci-libs/indilib-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=sci-libs/cfitsio-3.140 sys-libs/zlib virtual/libusb:0 nova? ( >=sci-libs/libnova-0.12.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/indi/libindi_0.9.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c2e71d6cf5d6833a5fc9b104d7ed160
diff --git a/metadata/md5-cache/sci-libs/itpp-4.0.6 b/metadata/md5-cache/sci-libs/itpp-4.0.6
index 81ceb66ea582..8aeb4b19963e 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.0.6
+++ b/metadata/md5-cache/sci-libs/itpp-4.0.6
@@ -9,5 +9,5 @@ RDEPEND=!minimal? ( fftw? ( >=sci-libs/fftw-3.0.0 ) ) blas? ( virtual/blas lapac
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.0.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5c9c2c2dd47533c028f2ad723ae95e6
diff --git a/metadata/md5-cache/sci-libs/itpp-4.2-r1 b/metadata/md5-cache/sci-libs/itpp-4.2-r1
index 0182d13ea075..28f15db3b8d5 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.2-r1
+++ b/metadata/md5-cache/sci-libs/itpp-4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=blas? ( virtual/blas lapack? ( virtual/lapack ) ) !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47e306a29de706155ebc74e8eacec449
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.8.0 b/metadata/md5-cache/sci-libs/lapack-atlas-3.8.0
index c0cfacb5f97d..d3d2b9c0b41b 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.8.0
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.8.0 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.8.0.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.7.39-shared-libs.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a18d116ac3738a0f1f8f5e89e369347d
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.8.2 b/metadata/md5-cache/sci-libs/lapack-atlas-3.8.2
index faab28423282..bf153836c120 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.8.2
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.8.2 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.8.2.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.7.39-shared-libs.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=17399f8b44fcb1c5f3b4aae1f3328825
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21
index 88bfd05ba808..9ab81df40108 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.21 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.21.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5dfaeec5a69c0ec92319937ca1a380d7
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21-r1 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21-r1
index 69bd5c687957..40d5c9b5740c 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21-r1
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.21-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.21 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.21.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca991bfdbc15ec0f8b92cc3fa356ec31
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23
index 9cfc041dd100..eb964be4e924 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.23.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a518bc99cedc20b1dd6e5748af3f402
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r2 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r2
index 2842c78e2b4d..9f814082db24 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r2
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.23.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c402b3c63db96b3bbc7f187da75332f0
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r3 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r3
index 463ac6cfbadd..d452e9cb4997 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r3
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.23-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.23.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c4bdb118ec3aa81ed9d9099e313ef8cd
diff --git a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.3 b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.3
index 85b400a34187..5f92e8a482ed 100644
--- a/metadata/md5-cache/sci-libs/lapack-atlas-3.9.3
+++ b/metadata/md5-cache/sci-libs/lapack-atlas-3.9.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.3 doc? ( app-doc/lapack-docs )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.9.3.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.3-shared-libs.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d958e1c0586abc7d870481b4fe8ff7e7
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1 b/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
index 6bde5841b84d..f65a7673dac3 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-lapack virtual/blas
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=88c0d50ff390cd093a5b2d2753d6b4b2
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1 b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1
index 28a2d6554edf..0599c8269be3 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-lapack virtual/blas
 SLOT=0
 SRC_URI=mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c4ab501076cba766b79f74508d5594d
diff --git a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1 b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
index 9a88cd3de312..13910e46d8b6 100644
--- a/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
+++ b/metadata/md5-cache/sci-libs/lapack-reference-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran app-admin/eselect-lapack virtual/blas
 SLOT=0
 SRC_URI=mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bee4173772c82970e420db28c62bde3
diff --git a/metadata/md5-cache/sci-libs/libbufr-000360 b/metadata/md5-cache/sci-libs/libbufr-000360
index f48e87809dc4..deb47351b8e2 100644
--- a/metadata/md5-cache/sci-libs/libbufr-000360
+++ b/metadata/md5-cache/sci-libs/libbufr-000360
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://www.ecmwf.int/products/data/software/download/software_files/bufr_000360.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78e5b141cde7073896e4916bf71d143b
diff --git a/metadata/md5-cache/sci-libs/libbufr-000387 b/metadata/md5-cache/sci-libs/libbufr-000387
index cdfad58661d6..c75b554a9139 100644
--- a/metadata/md5-cache/sci-libs/libbufr-000387
+++ b/metadata/md5-cache/sci-libs/libbufr-000387
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://www.ecmwf.int/products/data/software/download/software_files/bufr_000387.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=607a966c0fa82676a5ddf126d39a9c87
diff --git a/metadata/md5-cache/sci-libs/libcmatrix-3.9.0 b/metadata/md5-cache/sci-libs/libcmatrix-3.9.0
index 91b655f200bd..df89a95ed3fc 100644
--- a/metadata/md5-cache/sci-libs/libcmatrix-3.9.0
+++ b/metadata/md5-cache/sci-libs/libcmatrix-3.9.0
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/minuit atlas? ( || ( sci-libs/atlas sci-libs/blas-atlas ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/libcmatrix-3.9.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7d64cfbe3bcb1d38caa5485892d072d
+_md5_=10b620e5833c54ad8d668c5b6dc15d26
diff --git a/metadata/md5-cache/sci-libs/libgeotiff-1.2.4 b/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
index f2c41983937e..58799407a654 100644
--- a/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
+++ b/metadata/md5-cache/sci-libs/libgeotiff-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/tiff-3.7 virtual/jpeg sci-libs/proj
 SLOT=0
 SRC_URI=ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=635aad004416e4e807e1471707c79876
diff --git a/metadata/md5-cache/sci-libs/libnova-0.12.3 b/metadata/md5-cache/sci-libs/libnova-0.12.3
index c9632b57f503..c288a08c5cdc 100644
--- a/metadata/md5-cache/sci-libs/libnova-0.12.3
+++ b/metadata/md5-cache/sci-libs/libnova-0.12.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libnova/libnova-0.12.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49b448217d626aafb244b88e38bd4694
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.11 b/metadata/md5-cache/sci-libs/libsvm-3.11
index 6d1b91c40fac..177a26769458 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.11
+++ b/metadata/md5-cache/sci-libs/libsvm-3.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=java? ( >=virtual/jdk-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=350d7148ca0f2cdcffb41dc30d2e08c7
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.12 b/metadata/md5-cache/sci-libs/libsvm-3.12
index 9165308824fa..8dd69cb6fdd6 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.12
+++ b/metadata/md5-cache/sci-libs/libsvm-3.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=java? ( >=virtual/jdk-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eaa9ad9c5e185d28ac5d3a384186a975
diff --git a/metadata/md5-cache/sci-libs/neartree-2.3.2 b/metadata/md5-cache/sci-libs/neartree-2.3.2
index a81d5cca257a..cd29d5d992c6 100644
--- a/metadata/md5-cache/sci-libs/neartree-2.3.2
+++ b/metadata/md5-cache/sci-libs/neartree-2.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/neartree/NearTree-2.3.2/NearTree-2.3.2.tar.gz -> neartree-2.3.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e86e4aa7c8219e33a071cb04286d9ba
diff --git a/metadata/md5-cache/sci-libs/neartree-3.1.1 b/metadata/md5-cache/sci-libs/neartree-3.1.1
index 219a5d1faaff..9469f0a93437 100644
--- a/metadata/md5-cache/sci-libs/neartree-3.1.1
+++ b/metadata/md5-cache/sci-libs/neartree-3.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/neartree/NearTree-3.1.1/NearTree-3.1.1.tar.gz -> neartree-3.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5309707f4eb4e86c1eeb51f241b1093
diff --git a/metadata/md5-cache/sci-libs/neartree-3.1.1-r3 b/metadata/md5-cache/sci-libs/neartree-3.1.1-r3
index 3d5480acf77a..b8504ab9e77a 100644
--- a/metadata/md5-cache/sci-libs/neartree-3.1.1-r3
+++ b/metadata/md5-cache/sci-libs/neartree-3.1.1-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/neartree/NearTree-3.1.1/NearTree-3.1.1.tar.gz -> neartree-3.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28cb3a0e6e8782e7ea1c443760e4d6c4
diff --git a/metadata/md5-cache/sci-libs/netcdf-3.6.3 b/metadata/md5-cache/sci-libs/netcdf-3.6.3
index 7d7b18053329..b20f4d574644 100644
--- a/metadata/md5-cache/sci-libs/netcdf-3.6.3
+++ b/metadata/md5-cache/sci-libs/netcdf-3.6.3
@@ -9,5 +9,5 @@ LICENSE=UCAR-Unidata
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae0226a67799282d9e4381f2b30013eb
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.5 b/metadata/md5-cache/sci-libs/opencascade-6.5
index 695b064735dc..6c02b476ec02 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.5
+++ b/metadata/md5-cache/sci-libs/opencascade-6.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/tcl-8.4 >=dev-
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.5_release/OpenCASCADE650.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd5f8f9717e169beb7cbddcee572e05e
diff --git a/metadata/md5-cache/sci-libs/plplot-5.9.9 b/metadata/md5-cache/sci-libs/plplot-5.9.9
index 19589c5039a8..51344470c6ee 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.9.9
+++ b/metadata/md5-cache/sci-libs/plplot-5.9.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=fortran? ( virtual/fortran ) ada? ( virtual/gnat ) cairo? ( x11-libs/cairo[svg?,X?] ) java? ( >=virtual/jre-1.5 ) gd? ( media-libs/gd[jpeg?,png?] ) latex? ( virtual/latex-base app-text/ghostscript-gpl ) lua? ( dev-lang/lua ) ocaml? ( dev-lang/ocaml dev-ml/camlidl dev-ml/lablgtk ) octave? ( sci-mathematics/octave ) pdf? ( media-libs/libharu ) perl? ( dev-perl/PDL dev-perl/XML-DOM ) python? ( dev-python/numpy qt4? ( dev-python/PyQt4 ) ) qhull? ( media-libs/qhull ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) tcl? ( dev-lang/tcl dev-tcltk/itcl tk? ( dev-lang/tk dev-tcltk/itk ) ) truetype? ( media-fonts/freefont-ttf media-libs/lasi gd? ( media-libs/gd[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/plplot/plplot-5.9.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=01460b7d35004cd00c359f2acdd0a63d
diff --git a/metadata/md5-cache/sci-libs/plplot-5.9.9-r1 b/metadata/md5-cache/sci-libs/plplot-5.9.9-r1
index 546ac89b1d8e..2fe4b2e28586 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.9.9-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.9.9-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=fortran? ( virtual/fortran ) ada? ( virtual/gnat ) cairo? ( x11-libs/cairo[svg?,X?] ) java? ( >=virtual/jre-1.5 ) gd? ( media-libs/gd[jpeg?,png?] ) latex? ( virtual/latex-base app-text/ghostscript-gpl ) lua? ( dev-lang/lua ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave ) pdf? ( media-libs/libharu ) perl? ( dev-perl/PDL dev-perl/XML-DOM ) python? ( dev-python/numpy qt4? ( dev-python/PyQt4 ) ) qhull? ( media-libs/qhull ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) tcl? ( dev-lang/tcl dev-tcltk/itcl tk? ( dev-lang/tk dev-tcltk/itk ) ) truetype? ( media-fonts/freefont-ttf media-libs/lasi gd? ( media-libs/gd[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/plplot/plplot-5.9.9.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=5d382228a870ffeb9f2e8580aaf4cbf6
diff --git a/metadata/md5-cache/sci-libs/primegen-0.97-r1 b/metadata/md5-cache/sci-libs/primegen-0.97-r1
index 646a33a5eb12..71b18b803d6a 100644
--- a/metadata/md5-cache/sci-libs/primegen-0.97-r1
+++ b/metadata/md5-cache/sci-libs/primegen-0.97-r1
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://cr.yp.to/primegen/primegen-0.97.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40fbc2dcb943b6b63bcdb98466b2a0d1
diff --git a/metadata/md5-cache/sci-libs/proj-4.8.0 b/metadata/md5-cache/sci-libs/proj-4.8.0
index 15a7add8bfa8..25e0969fcb5f 100644
--- a/metadata/md5-cache/sci-libs/proj-4.8.0
+++ b/metadata/md5-cache/sci-libs/proj-4.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp.remotesensing.org/pub/proj/proj-4.8.0.tar.gz http://download.osgeo.org/proj/proj-datumgrid-1.5.zip http://trac.osgeo.org/proj/export/2190/tags/4.8.0/proj/src/org_proj4_PJ.h -> proj-4.8.0-org_proj4_PJ.h
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bce2938770e2b4ff429400e0ca0a70c6
diff --git a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1 b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1
index 648e95c11f9d..ef6c2b6b307b 100644
--- a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1
+++ b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1
@@ -8,5 +8,5 @@ RDEPEND=sci-biology/ncbi-tools sci-biology/ncbi-tools++ sci-biology/psipred
 RESTRICT=fetch
 SLOT=0
 SRC_URI=rosetta3.1_fragments.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92e476680bdd03f40c3d890f755999f4
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.11 b/metadata/md5-cache/sci-libs/scikits_learn-0.11
index dc54f483df9e..8d971d1740a2 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.11
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=sci-libs/scipy >=sci-libs/libsvm-2.91 sci-libs/scikits dev-python/matplotlib =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/scikit-learn/scikit-learn-0.11.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b97e1d72280af9458afff3d77c0c1a33
diff --git a/metadata/md5-cache/sci-libs/scipy-0.10.0 b/metadata/md5-cache/sci-libs/scipy-0.10.0
index 5fd3038490a2..75f96ec3f906 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.10.0
+++ b/metadata/md5-cache/sci-libs/scipy-0.10.0
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=virtual/fortran dev-python/numpy media-libs/qhull sci-libs/arpack >=sci-libs/superlu-4.3 virtual/cblas virtual/lapack umfpack? ( sci-libs/umfpack ) dev-python/imaging dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.10.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.10.0/scipy-html.zip -> scipy-0.10.0-html.zip http://docs.scipy.org/doc/scipy-0.10.0/scipy-ref.pdf -> scipy-0.10.0-ref.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ba7ece9ac75dcb47e705c76f12ee321
diff --git a/metadata/md5-cache/sci-libs/scipy-0.10.1 b/metadata/md5-cache/sci-libs/scipy-0.10.1
index 4e65c4c5c607..6d39713bee28 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.10.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.10.1
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=virtual/fortran dev-python/numpy sci-libs/arpack virtual/cblas virtual/lapack umfpack? ( sci-libs/umfpack ) dev-python/imaging dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.10.1.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.10.1/scipy-html.zip -> scipy-0.10.1-html.zip http://docs.scipy.org/doc/scipy-0.10.1/scipy-ref.pdf -> scipy-0.10.1-ref.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=849f9ae6b7a6690b53e26b698544fb36
diff --git a/metadata/md5-cache/sci-libs/scipy-0.9.0-r1 b/metadata/md5-cache/sci-libs/scipy-0.9.0-r1
index 13dda3cb063f..053db7b4f091 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.9.0-r1
+++ b/metadata/md5-cache/sci-libs/scipy-0.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran >=dev-python/numpy-1.5[lapack] media-libs/qhull sci-libs/arpack sci-libs/superlu virtual/cblas virtual/lapack umfpack? ( sci-libs/umfpack ) dev-python/imaging dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.9.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.9.0/scipy-html.zip -> scipy-0.9-html.zip http://docs.scipy.org/doc/scipy-0.9.0/scipy-ref.pdf -> scipy-0.9-ref.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e17011442d2a7f5c5dc1d2d54f656129
diff --git a/metadata/md5-cache/sci-libs/scipy-0.9.0-r3 b/metadata/md5-cache/sci-libs/scipy-0.9.0-r3
index 86376ff26e33..7082fea52a71 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.9.0-r3
+++ b/metadata/md5-cache/sci-libs/scipy-0.9.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/fortran >=dev-python/numpy-1.5 media-libs/qhull sci-libs/arpack >=sci-libs/superlu-4.3 virtual/cblas virtual/lapack umfpack? ( sci-libs/umfpack ) dev-python/imaging dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.9.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.9.0/scipy-html.zip -> scipy-0.9-html.zip http://docs.scipy.org/doc/scipy-0.9.0/scipy-ref.pdf -> scipy-0.9-ref.pdf )
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bceb19081a8632bc925a69b77a33a8a7
diff --git a/metadata/md5-cache/sci-libs/scotch-5.1.12b b/metadata/md5-cache/sci-libs/scotch-5.1.12b
index 93dd546f8089..648317ca1909 100644
--- a/metadata/md5-cache/sci-libs/scotch-5.1.12b
+++ b/metadata/md5-cache/sci-libs/scotch-5.1.12b
@@ -9,5 +9,5 @@ LICENSE=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~patrick/scotch_5.1.12b_esmumps.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60f1a3f73b3f49bed1fc4c41c223d893
diff --git a/metadata/md5-cache/sci-libs/spooles-2.2 b/metadata/md5-cache/sci-libs/spooles-2.2
index e08dd845523e..dfb6b080b9b1 100644
--- a/metadata/md5-cache/sci-libs/spooles-2.2
+++ b/metadata/md5-cache/sci-libs/spooles-2.2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.netlib.org/linalg/spooles/spooles.2.2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=808ac76c3a01dd790fb2e8c434027563
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3 b/metadata/md5-cache/sci-libs/superlu-4.3
index 77d2cb7f3e00..e2544c245629 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3
+++ b/metadata/md5-cache/sci-libs/superlu-4.3
@@ -10,4 +10,4 @@ RDEPEND=virtual/fortran virtual/blas
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c5506fc0db751ee1de951fd21814c9fc
+_md5_=c3d0d7e3621480015ddbb6a7b9842379
diff --git a/metadata/md5-cache/sci-libs/taucs-2.2 b/metadata/md5-cache/sci-libs/taucs-2.2
index 4d996e861d7d..19f2fed4d2c7 100644
--- a/metadata/md5-cache/sci-libs/taucs-2.2
+++ b/metadata/md5-cache/sci-libs/taucs-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/blas virtual/fortran virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) cilk? ( dev-lang/cilk )
 SLOT=0
 SRC_URI=http://www.tau.ac.il/~stoledo/taucs/2.2/taucs.tgz -> taucs-2.2.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66f70109b7fb3a412d1b5a622bae33f6
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.2.2 b/metadata/md5-cache/sci-libs/votca-tools-1.2.2
index 50706743f8d2..fb6b77a65e54 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.2.2
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=fftw? ( sci-libs/fftw:3.0 ) dev-libs/expat gsl? ( sci-libs/gsl ) system-
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=system-boost? ( http://votca.googlecode.com/files/votca-tools-1.2.2_pristine.tar.gz ) !system-boost? ( http://votca.googlecode.com/files/votca-tools-1.2.2.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e774d49eb405e8698810ab3ba921bc3
diff --git a/metadata/md5-cache/sci-libs/vtk-5.10.0 b/metadata/md5-cache/sci-libs/vtk-5.10.0
index bd99056d3481..0dee6ef44ca3 100644
--- a/metadata/md5-cache/sci-libs/vtk-5.10.0
+++ b/metadata/md5-cache/sci-libs/vtk-5.10.0
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng media-libs/mesa media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) ffmpeg? ( virtual/ffmpeg ) java? ( >=virtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) python? ( dev-python/sip ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 python? ( dev-python/PyQt4 ) ) tk? ( dev-lang/tk ) theora? ( media-libs/libtheora ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/5.10/vtk-5.10.0.tar.gz doc? ( http://www.vtk.org/files/release/5.10/vtkDocHtml-5.10.0.tar.gz ) examples? ( http://www.vtk.org/files/release/5.10/vtkdata-5.10.0.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eff70f7c7d5d484df0eee4553932f3da
diff --git a/metadata/md5-cache/sci-libs/vtk-5.6.1 b/metadata/md5-cache/sci-libs/vtk-5.6.1
index 8f416d32a91c..16a9198712e4 100644
--- a/metadata/md5-cache/sci-libs/vtk-5.6.1
+++ b/metadata/md5-cache/sci-libs/vtk-5.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) ffmpeg? ( virtual/ffmpeg ) java? ( >=virtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 ) tcl? ( dev-lang/tcl ) theora? ( media-libs/libtheora ) tk? ( dev-lang/tk ) R? ( dev-lang/R ) dev-libs/expat dev-libs/libxml2:2 media-libs/freetype virtual/jpeg media-libs/libpng media-libs/mesa media-libs/tiff sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/5.6/vtk-5.6.1.tar.gz examples? ( http://www.vtk.org/files/release/5.6/vtkdata-5.6.1.tar.gz ) doc? ( http://www.vtk.org/doc/release/5.6/vtkDocHtml-5.6.1.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=132867e4327bb13da9fbdc49a09b5b5d
diff --git a/metadata/md5-cache/sci-libs/vtk-5.8.0 b/metadata/md5-cache/sci-libs/vtk-5.8.0
index 83ef596fdf0d..a7f69cc6941a 100644
--- a/metadata/md5-cache/sci-libs/vtk-5.8.0
+++ b/metadata/md5-cache/sci-libs/vtk-5.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng media-libs/mesa media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) ffmpeg? ( virtual/ffmpeg ) java? ( >=virtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) python? ( dev-python/sip ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 python? ( dev-python/PyQt4 ) ) tk? ( dev-lang/tk ) theora? ( media-libs/libtheora ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/5.8/vtk-5.8.0.tar.gz doc? ( http://www.vtk.org/doc/release/5.8/vtkDocHtml-5.8.0.tar.gz ) examples? ( http://www.vtk.org/files/release/5.8/vtkdata-5.8.0.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2e3e6520c759a8f988ea8e8747774af0
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
index fd7a6cc60895..0129cfeba142 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/factory-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/libfac-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha5-2010-09-03.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//SourceCode/Macaulay2-1.4-r12617-src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89d4ff9b7cbb096f5eb2c149af5c0336
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
index 2eda7c264ab3..5af7fa4e0020 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=s
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/factory-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/libfac-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha5-2010-09-03.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//SourceCode/Macaulay2-1.4-r12617-src.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=169dbda86bd006edf411f832f263a7b0
diff --git a/metadata/md5-cache/sci-mathematics/axiom-200805 b/metadata/md5-cache/sci-mathematics/axiom-200805
index eae17a798deb..725f15120134 100644
--- a/metadata/md5-cache/sci-mathematics/axiom-200805
+++ b/metadata/md5-cache/sci-mathematics/axiom-200805
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.axiom-developer.org/axiom-website/downloads/axiom-may2008-src.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9feab39cc17c3d42973106294ce30be2
diff --git a/metadata/md5-cache/sci-mathematics/cgal-3.9 b/metadata/md5-cache/sci-mathematics/cgal-3.9
index 8f6f21096ad9..8a0817f171ea 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-3.9
+++ b/metadata/md5-cache/sci-mathematics/cgal-3.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT QPL
 RDEPEND=dev-libs/boost dev-libs/mpfr sys-libs/zlib x11-libs/libX11 virtual/opengl gmp? ( dev-libs/gmp[cxx=] ) lapack? ( virtual/lapack ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) mpfi? ( sci-libs/mpfi )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/29122/CGAL-3.9.tar.xz doc? ( http://gforge.inria.fr/frs/download.php/29120/CGAL-3.9-doc_html.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37e9f62c924b9bdc612398a54a2d09bd
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.0 b/metadata/md5-cache/sci-mathematics/cgal-4.0
index a913bdf3f886..a35225e06679 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-4.0
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=dev-libs/boost dev-libs/mpfr sys-libs/zlib x11-libs/libX11 virtual/opengl gmp? ( dev-libs/gmp[cxx=] ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) mpfi? ( sci-libs/mpfi )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/30385/CGAL-4.0.tar.xz doc? ( http://gforge.inria.fr/frs/download.php/30389/CGAL-4.0-doc_html.tar.xz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=541766ffb9c352508c4f956bd74012c3
diff --git a/metadata/md5-cache/sci-mathematics/diagrtb-2.64 b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
index 0e8bfbe0a180..f8b51d0572e3 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/rtb2011.tar.gz -> diagrtb-2.64.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a03e2f6a02ec9aafad294fcb770d83f
diff --git a/metadata/md5-cache/sci-mathematics/fann-2.2.0 b/metadata/md5-cache/sci-mathematics/fann-2.2.0
index da81edc8c0e5..43da552cf94c 100644
--- a/metadata/md5-cache/sci-mathematics/fann-2.2.0
+++ b/metadata/md5-cache/sci-mathematics/fann-2.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/fann/FANN-2.2.0-Source.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7ad006fd857e8c91daf65774d37fc44
diff --git a/metadata/md5-cache/sci-mathematics/freemat-4.0 b/metadata/md5-cache/sci-mathematics/freemat-4.0
index a3a078ae2016..1d3a8fe3fb85 100644
--- a/metadata/md5-cache/sci-mathematics/freemat-4.0
+++ b/metadata/md5-cache/sci-mathematics/freemat-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre media-libs/portaudio sci-libs/arpack sci-libs/fftw:3.0 sci-libs/umfpack sys-libs/ncurses virtual/lapack virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 volpack? ( media-libs/volpack )
 SLOT=0
 SRC_URI=mirror://sourceforge/freemat/FreeMat-4.0-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da40d1fed98f40dfb709425f51c17d20
diff --git a/metadata/md5-cache/sci-mathematics/freemat-4.1 b/metadata/md5-cache/sci-mathematics/freemat-4.1
index e09b97755f4d..59a0e2343001 100644
--- a/metadata/md5-cache/sci-mathematics/freemat-4.1
+++ b/metadata/md5-cache/sci-mathematics/freemat-4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre media-libs/portaudio sci-libs/arpack sci-libs/fftw:3.0 sci-libs/matio sci-libs/umfpack sys-libs/ncurses virtual/glu virtual/lapack virtual/libffi virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 volpack? ( media-libs/volpack ) vtk? ( sci-libs/vtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/freemat/FreeMat-4.1-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f12cfe2f4658254f393bac9dd0d1a79
diff --git a/metadata/md5-cache/sci-mathematics/geomview-1.9.4 b/metadata/md5-cache/sci-mathematics/geomview-1.9.4
index 5759c11091e9..90dfca0122d7 100644
--- a/metadata/md5-cache/sci-mathematics/geomview-1.9.4
+++ b/metadata/md5-cache/sci-mathematics/geomview-1.9.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/openmotif-2.3:0 virtual/opengl emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib ) app-arch/gzip virtual/w3m bzip2? ( app-arch/bzip2 ) netpbm? ( >=media-libs/netpbm-10.37.0 ) pdf? ( || ( app-text/xpdf app-text/gv app-text/gsview app-text/epdfview app-text/acroread ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/geomview/geomview-1.9.4.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/geomview.png.tar
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4583e07688a3967723c9c541f9bd5dfc
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.35 b/metadata/md5-cache/sci-mathematics/glpk-4.35
index 684baedaa8a1..6a2b2b626c7f 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.35
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.35
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) gmp? ( dev-libs/gmp ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://gnu/glpk/glpk-4.35.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd1ca42002923e186a130bfeb66fc289
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.44 b/metadata/md5-cache/sci-mathematics/glpk-4.44
index 2e32955973c2..2833b8553767 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.44
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.44
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) gmp? ( dev-libs/gmp ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://gnu/glpk/glpk-4.44.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d977df48ccf528acdb9fdda0f161f143
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.45 b/metadata/md5-cache/sci-mathematics/glpk-4.45
index 50f26324585b..16215bd12054 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.45
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.45
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/zlib odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) gmp? ( dev-libs/gmp ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://gnu/glpk/glpk-4.45.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c15bf018f3ba12949d2f8c59a3f288e9
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.47 b/metadata/md5-cache/sci-mathematics/glpk-4.47
index 0a93f69da838..6f3f31f22877 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.47
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.47
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) gmp? ( dev-libs/gmp ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://gnu/glpk/glpk-4.47.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=869ffb293836b6e7bc6485118070d33d
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.2 b/metadata/md5-cache/sci-mathematics/mathomatic-15.8.2
index c8c22ec76d21..18be912abfed 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.2
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-15.8.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses gnuplot? ( sci-visualization/gnuplot )
 SLOT=0
 SRC_URI=http://www.mathomatic.org//archive/mathomatic-15.8.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f9b0c3beb3c03faa113c0253d1b2cf6
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5 b/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5
index 30b35a6409e7..83007f9d48ce 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-15.8.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses gnuplot? ( sci-visualization/gnuplot )
 SLOT=0
 SRC_URI=http://www.mathomatic.org//archive/mathomatic-15.8.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87872022f5563519d7e67ecffdd9d32a
diff --git a/metadata/md5-cache/sci-mathematics/nusmv-2.5.2 b/metadata/md5-cache/sci-mathematics/nusmv-2.5.2
index 4478ec733428..5fb6d76760a6 100644
--- a/metadata/md5-cache/sci-mathematics/nusmv-2.5.2
+++ b/metadata/md5-cache/sci-mathematics/nusmv-2.5.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=http://nusmv.fbk.eu/distrib/NuSMV-2.5.2.tar.gz minisat? ( mirror://gentoo/MiniSat_v1.14_src.zip )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82ed0fbd32081622e5871d169a6f9743
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.3.4-r1 b/metadata/md5-cache/sci-mathematics/pari-2.3.4-r1
index f1d615a06284..39b4a09f8a78 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.3.4-r1
+++ b/metadata/md5-cache/sci-mathematics/pari-2.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline emacs? ( virtual/emacs ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) )
 SLOT=0
 SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.4.tar.gz data? ( http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/nftables.tgz )
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a32a870dcd76f8de54e449b5dd8fe434
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.3.5 b/metadata/md5-cache/sci-mathematics/pari-2.3.5
index 9da1ed73c20d..6e960a86a168 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.3.5
+++ b/metadata/md5-cache/sci-mathematics/pari-2.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline emacs? ( virtual/emacs ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) )
 SLOT=0
 SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.5.tar.gz data? ( http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz http://pari.math.u-bordeaux.fr/pub/pari/packages/nftables.tgz )
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a0c9de32d706ecf1d3245769e335727
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3 b/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
index 53ab8fd6981e..a48eaae67f0a 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
+++ b/metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data )
 SLOT=0
 SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56a00c8ccc35a6cae53fe3d0ce7d8e53
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.5.1 b/metadata/md5-cache/sci-mathematics/pari-2.5.1
index 62f72874a585..08c547581e74 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.1
+++ b/metadata/md5-cache/sci-mathematics/pari-2.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/readline fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp ) X? ( x11-libs/libX11 ) doc? ( X? ( x11-misc/xdg-utils ) ) data? ( sci-mathematics/pari-data )
 SLOT=0
 SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=56ecae06505ac44b2bfd713de6048484
diff --git a/metadata/md5-cache/sci-mathematics/polymake-2.10 b/metadata/md5-cache/sci-mathematics/polymake-2.10
index 04282cfdeb4c..7d10c4e741ce 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-2.10
+++ b/metadata/md5-cache/sci-mathematics/polymake-2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp dev-libs/boost dev-libs/libxml2:2 dev-perl/XML-LibXML dev-libs/libxslt dev-perl/XML-LibXSLT dev-perl/XML-Writer dev-perl/Term-ReadLine-Gnu
 SLOT=0
 SRC_URI=http://polymake.org/lib/exe/fetch.php/download/polymake-2.10-2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=84e408f6eaabb1964066e47a7c078f12
diff --git a/metadata/md5-cache/sci-mathematics/polymake-2.11 b/metadata/md5-cache/sci-mathematics/polymake-2.11
index ab88819987e8..3d83dbc22392 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-2.11
+++ b/metadata/md5-cache/sci-mathematics/polymake-2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp dev-libs/boost dev-libs/libxml2:2 dev-perl/XML-LibXML dev-libs/libxslt dev-perl/XML-LibXSLT dev-perl/XML-Writer dev-perl/Term-ReadLine-Gnu
 SLOT=0
 SRC_URI=http://polymake.org/lib/exe/fetch.php/download/polymake-2.11_rc2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79878633af478ec28876f4492cad4438
diff --git a/metadata/md5-cache/sci-mathematics/polymake-2.12 b/metadata/md5-cache/sci-mathematics/polymake-2.12
index 20de3f182559..eb6b2de895c3 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-2.12
+++ b/metadata/md5-cache/sci-mathematics/polymake-2.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp dev-libs/boost dev-libs/libxml2:2 dev-perl/XML-LibXML dev-libs/libxslt dev-perl/XML-LibXSLT dev-perl/XML-Writer dev-perl/Term-ReadLine-Gnu
 SLOT=0
 SRC_URI=http://polymake.org/lib/exe/fetch.php/download/polymake-2.12-rc3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a1d106c58b8ed6f23ce892343583e60d
diff --git a/metadata/md5-cache/sci-mathematics/qtoctave-0.10.1 b/metadata/md5-cache/sci-mathematics/qtoctave-0.10.1
index 2e81ce87b749..c370ddbe17a0 100644
--- a/metadata/md5-cache/sci-mathematics/qtoctave-0.10.1
+++ b/metadata/md5-cache/sci-mathematics/qtoctave-0.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-gui-4.6 >=x11-libs/qt-svg-4.6 >=sci-mathematics/octave-3.2.0
 SLOT=0
 SRC_URI=http://forja.rediris.es/frs/download.php/2054/qtoctave-0.10.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99a29ebef4fbac707381ac3a77fad413
diff --git a/metadata/md5-cache/sci-mathematics/qtoctave-0.9.1-r1 b/metadata/md5-cache/sci-mathematics/qtoctave-0.9.1-r1
index 26077e1781b3..bc2841b84679 100644
--- a/metadata/md5-cache/sci-mathematics/qtoctave-0.9.1-r1
+++ b/metadata/md5-cache/sci-mathematics/qtoctave-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-gui-4.5 >=x11-libs/qt-svg-4.5 >=sci-mathematics/octave-3.2.0
 SLOT=0
 SRC_URI=http://forja.rediris.es/frs/download.php/1760/qtoctave-0.9.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0993f527128477bd2d07603e4883ce37
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.5.4 b/metadata/md5-cache/sci-mathematics/rkward-0.5.4
index 62c839fc8a36..ee5db2b3ad04 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.5.4
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R || ( <kde-base/kdelibs-4.6.50 ( >=kde-base/katepart-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.5.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f779d035647e888dfb1bf1f784201bb5
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.5.5 b/metadata/md5-cache/sci-mathematics/rkward-0.5.5
index c80dd2c44104..1fd9b38d11cd 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.5.5
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R || ( <kde-base/kdelibs-4.6.50 ( >=kde-base/katepart-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.5.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=71c9fddd7a166bc26af84aee76cfdf19
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.5.6 b/metadata/md5-cache/sci-mathematics/rkward-0.5.6
index 1be8cb7b36bc..073973ad0a8c 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.5.6
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R || ( <kde-base/kdelibs-4.6.50 ( >=kde-base/katepart-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.5.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a82ad12ea1355fe03637cb69ffa4575
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.5.6-r1 b/metadata/md5-cache/sci-mathematics/rkward-0.5.6-r1
index 3e2abfeca595..a70188d7dcf9 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.5.6-r1
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R || ( <kde-base/kdelibs-4.6.50 ( >=kde-base/katepart-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.5.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a2ebc924b89113ba35737658fb014132
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.5.7 b/metadata/md5-cache/sci-mathematics/rkward-0.5.7
index 4d8de66e1587..b915ca25f566 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.5.7
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R || ( <kde-base/kdelibs-4.6.50 ( >=kde-base/katepart-4.4:4[aqua=] ) ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.5.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c99f3a987a9073044695a3a13dde5543
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2 b/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
index 046aea8f171b..4fd0ae406fb7 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-2/Singular-3-1-2.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-2/Singular-3-1-2-share.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75450a1d7cd2220cbe11e3674f4c5632
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.3.1 b/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
index a5840479f064..c987ddca3638 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-1.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-1-share.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dffde356567749fb9a91f1b8e8f47c35
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.3.3 b/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
index ed4445d45207..49448184f1ad 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-3.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-3-share.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35e8ff242cdb40393c05a1d9075d3cb0
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.4 b/metadata/md5-cache/sci-mathematics/singular-3.1.4
index 96ee2d506b8e..afd0f605375e 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.4
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) python?
 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	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0f760fc87b2efeee660238b55f9e6ee
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 02d1245e472d..d34b9de4faf7 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) python?
 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	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	prefix	21058c21ca48453d771df15500873ede	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb2d14d919b29e926d733e564e8cc7be
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.16.2 b/metadata/md5-cache/sci-mathematics/topcom-0.16.2
index 086efd064a81..56f86a6499d4 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.16.2
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.16.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1-r1 >=sci-libs/cddlib-094f
 SLOT=0
 SRC_URI=http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/Software/TOPCOM-0.16.2.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ffecb3fbcaeb3b3b2d9ea1d33e41d99
diff --git a/metadata/md5-cache/sci-misc/boinc-6.12.42 b/metadata/md5-cache/sci-misc/boinc-6.12.42
index 5cc8a2e62085..dd5e70ffdc2e 100644
--- a/metadata/md5-cache/sci-misc/boinc-6.12.42
+++ b/metadata/md5-cache/sci-misc/boinc-6.12.42
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 dev-libs/openssl net-misc/curl[ssl,-gnutls] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] )
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/boinc-6.12.42.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=b2454bcd279bc9adb1bb109facdd4412
diff --git a/metadata/md5-cache/sci-misc/nco-3.9.9 b/metadata/md5-cache/sci-misc/nco-3.9.9
index bc873e45b26e..468564ff24a5 100644
--- a/metadata/md5-cache/sci-misc/nco-3.9.9
+++ b/metadata/md5-cache/sci-misc/nco-3.9.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-libs/netcdf mpi? ( virtual/mpi ) udunits? ( >=sci-libs/udunits-2 )
 SLOT=0
 SRC_URI=http://dust.ess.uci.edu/nco/src/nco-3.9.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=caefe68025736a23e3de58ef88cb141f
diff --git a/metadata/md5-cache/sci-misc/nco-4.0.8 b/metadata/md5-cache/sci-misc/nco-4.0.8
index d26365b417e2..539b9efa5017 100644
--- a/metadata/md5-cache/sci-misc/nco-4.0.8
+++ b/metadata/md5-cache/sci-misc/nco-4.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/netcdf-4[dap=] gsl? ( sci-libs/gsl ) udunits? ( >=sci-libs/udunits-2 )
 SLOT=0
 SRC_URI=http://nco.sf.net/src/nco-4.0.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c89fff7282f54b7f5a282f3db7037b0c
diff --git a/metadata/md5-cache/sci-misc/ncview-1.93g b/metadata/md5-cache/sci-misc/ncview-1.93g
index 1b99c563e58f..eb2873cecec7 100644
--- a/metadata/md5-cache/sci-misc/ncview-1.93g
+++ b/metadata/md5-cache/sci-misc/ncview-1.93g
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/netpbm sci-libs/netcdf x11-libs/libXaw udunits? ( sci-libs/udunits )
 SLOT=0
 SRC_URI=ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.93g.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=032e9b0fe8d247de7cb3a754d335391c
diff --git a/metadata/md5-cache/sci-physics/bullet-2.77 b/metadata/md5-cache/sci-physics/bullet-2.77
index a12bf7711776..bd8f34c6eaaf 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.77
+++ b/metadata/md5-cache/sci-physics/bullet-2.77
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/freeglut virtual/opengl
 SLOT=0
 SRC_URI=http://bullet.googlecode.com/files/bullet-2.77.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c582d10db6c568fd6d91424e8571993d
diff --git a/metadata/md5-cache/sci-physics/bullet-2.79-r1 b/metadata/md5-cache/sci-physics/bullet-2.79-r1
index 62194844d71b..ec042c62250b 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.79-r1
+++ b/metadata/md5-cache/sci-physics/bullet-2.79-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut
 SLOT=0
 SRC_URI=http://bullet.googlecode.com/files/bullet-2.79-rev2440.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df4c7e6c3f2e1e15231a2ce11c2be364
diff --git a/metadata/md5-cache/sci-physics/bullet-2.80 b/metadata/md5-cache/sci-physics/bullet-2.80
index bf48d122614b..2ffa085e5c05 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.80
+++ b/metadata/md5-cache/sci-physics/bullet-2.80
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut
 SLOT=0
 SRC_URI=http://bullet.googlecode.com/files/bullet-2.80-rev2531.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09ad389044bd44c95348d443f312d732
diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.1 b/metadata/md5-cache/sci-physics/fastjet-3.0.1
index 32a70cded023..192061bd8725 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.1
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=cgal? ( sci-mathematics/cgal )
 SLOT=0
 SRC_URI=http://www.fastjet.fr//repo/fastjet-3.0.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6df7e3a1cee144dacb27b3945745941b
diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.2 b/metadata/md5-cache/sci-physics/fastjet-3.0.2
index 89409ac7a20f..a3f68a98d083 100644
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.2
+++ b/metadata/md5-cache/sci-physics/fastjet-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=cgal? ( sci-mathematics/cgal )
 SLOT=0
 SRC_URI=http://www.fastjet.fr//repo/fastjet-3.0.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05a6a5852442c83491d0323714587149
diff --git a/metadata/md5-cache/sci-physics/geant-4.9.4_p03 b/metadata/md5-cache/sci-physics/geant-4.9.4_p03
index 1dd917640c50..04cfc12b9509 100644
--- a/metadata/md5-cache/sci-physics/geant-4.9.4_p03
+++ b/metadata/md5-cache/sci-physics/geant-4.9.4_p03
@@ -9,5 +9,5 @@ LICENSE=geant4
 RDEPEND=virtual/fortran >=sci-physics/clhep-2.1 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) gdml? ( dev-libs/xerces-c ) geant3? ( sci-physics/geant:3 ) dawn? ( media-gfx/dawn ) zlib? ( sys-libs/zlib )
 SLOT=4
 SRC_URI=http://geant4.cern.ch/support/source/geant4.9.4.p03.tar.gz data? ( http://geant4.cern.ch/support/source/G4NDL.3.14.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4EMLOW.6.19.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4RadioactiveDecay.3.3.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4NEUTRONXS.1.0.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4PII.1.2.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4PhotonEvaporation.2.1.tar.gz ) data? ( http://geant4.cern.ch/support/source/G4ABLA.3.0.tar.gz ) data? ( http://geant4.cern.ch/support/source/RealSurface.1.0.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ff9f4d16c489e58517260940e99c63f
diff --git a/metadata/md5-cache/sci-physics/geant-4.9.5-r1 b/metadata/md5-cache/sci-physics/geant-4.9.5-r1
index 8f0fbfeac045..e9fa6f398cf3 100644
--- a/metadata/md5-cache/sci-physics/geant-4.9.5-r1
+++ b/metadata/md5-cache/sci-physics/geant-4.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=geant4
 RDEPEND=virtual/fortran >=sci-physics/clhep-2.1.1 dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) motif? ( x11-libs/openmotif:0 ) opengl? ( virtual/opengl ) openinventor? ( media-libs/openinventor ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) ) zlib? ( sys-libs/zlib )
 SLOT=4
 SRC_URI=http://geant4.cern.ch/support/source/geant4.9.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b633e852f15268539a8a88516d56a6f3
diff --git a/metadata/md5-cache/sci-physics/geant-4.9.5_p01 b/metadata/md5-cache/sci-physics/geant-4.9.5_p01
index c6f51d68f0e8..92cf38dea773 100644
--- a/metadata/md5-cache/sci-physics/geant-4.9.5_p01
+++ b/metadata/md5-cache/sci-physics/geant-4.9.5_p01
@@ -9,5 +9,5 @@ LICENSE=geant4
 RDEPEND=virtual/fortran >=sci-physics/clhep-2.1.1 dawn? ( media-gfx/dawn ) gdml? ( dev-libs/xerces-c ) motif? ( x11-libs/openmotif:0 ) opengl? ( virtual/opengl ) openinventor? ( media-libs/openinventor ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) ) zlib? ( sys-libs/zlib )
 SLOT=4
 SRC_URI=http://geant4.cern.ch/support/source/geant4.9.5.p01.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fdae8c84c2d9b8a6fddb52fe2d7f9c5
diff --git a/metadata/md5-cache/sci-physics/hepmc-2.06.08 b/metadata/md5-cache/sci-physics/hepmc-2.06.08
index cedf2a4bc6bb..3695cbbf598c 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.08
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.08
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.08.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6b5b716c7c8722bb11ff5d161d682b2
diff --git a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2 b/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
index 7fa211258429..d057090ff616 100644
--- a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
+++ b/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://ab-initio.mit.edu/mpb/mpb-1.4.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c9e5118136dd895f8888dbdcb5571853
diff --git a/metadata/md5-cache/sci-physics/sassena-1.4.1 b/metadata/md5-cache/sci-physics/sassena-1.4.1
index 99901adbb81d..86b0c7b9e8e5 100644
--- a/metadata/md5-cache/sci-physics/sassena-1.4.1
+++ b/metadata/md5-cache/sci-physics/sassena-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost[mpi] sci-libs/hdf5[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 virtual/mpi virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=http://www.sassena.org/software/source-code/releases/v1.4.1/sassena-v1.4.1.tar.gz/at_download/file -> sassena-v1.4.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22fdfb1ac0862ad5e3294392cacc0ec2
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.4b b/metadata/md5-cache/sci-visualization/gle-4.2.4b
index c1aaec4a82ff..0e0879206152 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.4b
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.4b
@@ -9,5 +9,5 @@ LICENSE=BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )
 RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( x11-libs/qt-opengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.4bf-src.tar.gz doc? ( mirror://sourceforge/glx/gle-manual-4.2.2.pdf mirror://sourceforge/glx/GLEusersguide.pdf )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21ed1267053a0c7f23ffb83053740792
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.0 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.0
index 705153ffde40..8307c91031d0 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.0
+++ b/metadata/md5-cache/sci-visualization/gnuplot-4.6.0
@@ -9,5 +9,5 @@ LICENSE=gnuplot GPL-2 bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) gd? ( media-libs/gd[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) plotutils? ( media-libs/plotutils ) qt4? ( >=x11-libs/qt-core-4.5 >=x11-libs/qt-gui-4.5 >=x11-libs/qt-svg-4.5 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw ) xemacs? ( app-editors/xemacs app-xemacs/xemacs-base )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.0.tar.gz
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
 _md5_=698505735ac6078adc300aff55003fb5
diff --git a/metadata/md5-cache/sci-visualization/kst-2.0.4 b/metadata/md5-cache/sci-visualization/kst-2.0.4
index 11fb0bf259a5..04c015de5a3d 100644
--- a/metadata/md5-cache/sci-visualization/kst-2.0.4
+++ b/metadata/md5-cache/sci-visualization/kst-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf[cxx] x11-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/kst/kst-2.0.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5974a6d048328ebe392a17699a50aa9e
diff --git a/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4 b/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
index 7d9be52cfd9a..c0e5b695b19d 100644
--- a/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
+++ b/metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
@@ -9,5 +9,5 @@ LICENSE=IBM
 RDEPEND=x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/openmotif-2.3:0 virtual/opengl virtual/glu szip? ( sci-libs/szip ) hdf? ( sci-libs/hdf ) cdf? ( sci-libs/cdf ) netcdf? ( sci-libs/netcdf ) tiff? ( media-libs/tiff ) imagemagick? ( >=media-gfx/imagemagick-5.3.4 )
 SLOT=0
 SRC_URI=http://opendx.sdsc.edu/source/dx-4.4.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f05f09a84991ff20c15b02926c312d08
diff --git a/metadata/md5-cache/sci-visualization/paraview-3.6.2 b/metadata/md5-cache/sci-visualization/paraview-3.6.2
index 6c4c9574e4f2..bcf3278261ec 100644
--- a/metadata/md5-cache/sci-visualization/paraview-3.6.2
+++ b/metadata/md5-cache/sci-visualization/paraview-3.6.2
@@ -9,5 +9,5 @@ LICENSE=paraview GPL-2
 RDEPEND=sci-libs/hdf5[mpi=] mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2[cxx] ) ) gui? ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 x11-libs/qt-opengl:4 || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ) ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) dev-libs/libxml2:2 media-libs/libpng virtual/jpeg media-libs/tiff virtual/ffmpeg dev-libs/expat sys-libs/zlib media-libs/freetype >=app-admin/eselect-opengl-1.0.6-r1 virtual/opengl sci-libs/netcdf x11-libs/libXmu python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://gentoo/paraview-3.6.2.tar.gz mirror://gentoo/paraview-3.6.2-openfoam-gpl-r173.patch.bz2 mirror://gentoo/paraview-3.6.2-openfoam-r173.patch.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05193e7ee02a178a9436772bff724c3b
diff --git a/metadata/md5-cache/sci-visualization/pyxplot-0.8.3 b/metadata/md5-cache/sci-visualization/pyxplot-0.8.3
index 223242151a79..5428fdeee7e6 100644
--- a/metadata/md5-cache/sci-visualization/pyxplot-0.8.3
+++ b/metadata/md5-cache/sci-visualization/pyxplot-0.8.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base sci-libs/cfitsio sci-libs/fftw:3.0 >=sci-libs/gsl-1.10 sci-libs/scipy media-libs/libpng dev-libs/libxml2:2 app-text/gv || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/pyxplot/pyxplot_0.8.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bae37489667c1cd5b62aebd1076e326
diff --git a/metadata/md5-cache/sci-visualization/spyview-20110803 b/metadata/md5-cache/sci-visualization/spyview-20110803
index 5daee624e353..83194f9c594a 100644
--- a/metadata/md5-cache/sci-visualization/spyview-20110803
+++ b/metadata/md5-cache/sci-visualization/spyview-20110803
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42 media-libs/netpbm media-libs/libpng:1.2 x11-libs/fltk:1 app-text/ghostscript-gpl virtual/glu sci-visualization/gnuplot
 SLOT=0
 SRC_URI=http://kavli.nano.tudelft.nl/~gsteele/spyview/versions/spyview-20110803.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7264af34dfbb0e769884f5b0ac4f2a95
diff --git a/metadata/md5-cache/sci-visualization/spyview-20111018 b/metadata/md5-cache/sci-visualization/spyview-20111018
index 4653a12792e1..f1a504a6f560 100644
--- a/metadata/md5-cache/sci-visualization/spyview-20111018
+++ b/metadata/md5-cache/sci-visualization/spyview-20111018
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42 media-libs/netpbm media-libs/libpng:1.2 x11-libs/fltk:1 app-text/ghostscript-gpl virtual/glu sci-visualization/gnuplot
 SLOT=0
 SRC_URI=http://kavli.nano.tudelft.nl/~gsteele/spyview/versions/spyview-20111018.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed36026929e80b9e5ffaafe91599acb6
diff --git a/metadata/md5-cache/sci-visualization/xds-viewer-0.6 b/metadata/md5-cache/sci-visualization/xds-viewer-0.6
index ab69fc580fe8..960873d07bea 100644
--- a/metadata/md5-cache/sci-visualization/xds-viewer-0.6
+++ b/metadata/md5-cache/sci-visualization/xds-viewer-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/libpng x11-libs/qt-gui
 SLOT=0
 SRC_URI=mirror://sourceforge/xds-viewer/xds-viewer-0.6.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78438bf8fc63a6b8e6b2b9cc16c626f6
diff --git a/metadata/md5-cache/sys-apps/915resolution-0.5.3-r2 b/metadata/md5-cache/sys-apps/915resolution-0.5.3-r2
index 81fcdfa06959..c5434e9ce4db 100644
--- a/metadata/md5-cache/sys-apps/915resolution-0.5.3-r2
+++ b/metadata/md5-cache/sys-apps/915resolution-0.5.3-r2
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/915resolution-0.5.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f174f925d537b49c5f2f490db14d26e2
diff --git a/metadata/md5-cache/sys-apps/915resolution-0.5.3-r3 b/metadata/md5-cache/sys-apps/915resolution-0.5.3-r3
index ec90dca9d833..8252f2fc1851 100644
--- a/metadata/md5-cache/sys-apps/915resolution-0.5.3-r3
+++ b/metadata/md5-cache/sys-apps/915resolution-0.5.3-r3
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/915resolution-0.5.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0abe7fba64b094c33615f82cea8f1a7b
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.14 b/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.14
index 6764616726ef..dd8d139ccb8b 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.14
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/readline-5.0-r1 >=app-shells/bash-3.1_p7 >=sys-apps/coreutils-5.2.1 kernel_Darwin? ( sys-process/pidof-bsd ) kernel_FreeBSD? ( sys-process/pidof-bsd )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grobian/distfiles/baselayout-prefix-1.12.14.1709.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=265e08aa5a80039d2279d855923c6bcb
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.5-r11 b/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.5-r11
index ec8552643f2a..9db683af1841 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.5-r11
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-1.12.5-r11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/readline-5.0-r1 >=app-shells/bash-3.1_p7 >=sys-apps/coreutils-5.2.1 kernel_Darwin? ( sys-process/pidof-bsd ) kernel_FreeBSD? ( sys-process/pidof-bsd )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~grobian/distfiles/baselayout-prefix-1.12.5.1701.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e64e1835edb0b5ad950ff50a7adcb49a
diff --git a/metadata/md5-cache/sys-apps/busybox-1.19.3-r1 b/metadata/md5-cache/sys-apps/busybox-1.19.3-r1
index daa250e01264..9190efa39243 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.19.3-r1
+++ b/metadata/md5-cache/sys-apps/busybox-1.19.3-r1
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.19.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5689abdcd14f07ce40da43d9a937f8b0
diff --git a/metadata/md5-cache/sys-apps/busybox-1.20.0 b/metadata/md5-cache/sys-apps/busybox-1.20.0
index e1f8930f23c5..8c7d68ce52ca 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.20.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.20.0
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.20.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=110a2f05714edd60444eef99cd1a254e
diff --git a/metadata/md5-cache/sys-apps/busybox-1.20.1 b/metadata/md5-cache/sys-apps/busybox-1.20.1
index aafbbbe27b8a..156afcc8ec73 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.20.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.20.1
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.20.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d41bcccf916701eb5bf13011a540a379
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 31ea449df2c2..f5b990ec5436 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8f339f245c2a46bc1b1d260a22aadbd8
diff --git a/metadata/md5-cache/sys-apps/chpax-0.7 b/metadata/md5-cache/sys-apps/chpax-0.7
index e5f8982ada97..7fce8b416671 100644
--- a/metadata/md5-cache/sys-apps/chpax-0.7
+++ b/metadata/md5-cache/sys-apps/chpax-0.7
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://pax.grsecurity.net/chpax-0.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=815bbbf95b6edb8d230008383af2c604
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.10 b/metadata/md5-cache/sys-apps/coreutils-8.10
index bab9d17bea8d..4bb3d54b7756 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.10
+++ b/metadata/md5-cache/sys-apps/coreutils-8.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.10.tar.xz mirror://gnu/coreutils/coreutils-8.10.tar.xz mirror://gentoo/coreutils-8.10.tar.xz mirror://gentoo/coreutils-8.10-patches-2.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.10-patches-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9a6d321be6342fac039cd71fd916282
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.11 b/metadata/md5-cache/sys-apps/coreutils-8.11
index 2e6b3ece7678..527cadcd7c7f 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.11
+++ b/metadata/md5-cache/sys-apps/coreutils-8.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.11.tar.xz mirror://gnu/coreutils/coreutils-8.11.tar.xz mirror://gentoo/coreutils-8.11.tar.xz mirror://gentoo/coreutils-8.11-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.11-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a1aa51a918c3561520469f35f48924e
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.12 b/metadata/md5-cache/sys-apps/coreutils-8.12
index be5a97fb4911..b96910b017c7 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.12
+++ b/metadata/md5-cache/sys-apps/coreutils-8.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.12.tar.xz mirror://gnu/coreutils/coreutils-8.12.tar.xz mirror://gentoo/coreutils-8.12.tar.xz mirror://gentoo/coreutils-8.12-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.12-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c254b4d3017443bbb68c03534f7d4fd5
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.13 b/metadata/md5-cache/sys-apps/coreutils-8.13
index f439267e2bbd..d6489eefb553 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.13
+++ b/metadata/md5-cache/sys-apps/coreutils-8.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.13.tar.xz mirror://gnu/coreutils/coreutils-8.13.tar.xz mirror://gentoo/coreutils-8.13.tar.xz mirror://gentoo/coreutils-8.13-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.13-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d79a7a2ad8ce45a10d6b92cf24f21097
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.14 b/metadata/md5-cache/sys-apps/coreutils-8.14
index f50b319ca218..77154b7fe47c 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.14
+++ b/metadata/md5-cache/sys-apps/coreutils-8.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.14.tar.xz mirror://gnu/coreutils/coreutils-8.14.tar.xz mirror://gentoo/coreutils-8.14.tar.xz mirror://gentoo/coreutils-8.14-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.14-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9f0b9be06631ef8f50eacaea788b040
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.15 b/metadata/md5-cache/sys-apps/coreutils-8.15
index b831f627bf34..02c548ac377f 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.15
+++ b/metadata/md5-cache/sys-apps/coreutils-8.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.15.tar.xz mirror://gnu/coreutils/coreutils-8.15.tar.xz mirror://gentoo/coreutils-8.15.tar.xz mirror://gentoo/coreutils-8.15-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.15-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d567d268b6a7be081fb37156aac13ff
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.16 b/metadata/md5-cache/sys-apps/coreutils-8.16
index d1cfb9a6b668..1c05c92b8a15 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.16
+++ b/metadata/md5-cache/sys-apps/coreutils-8.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.16.tar.xz mirror://gnu/coreutils/coreutils-8.16.tar.xz mirror://gentoo/coreutils-8.16.tar.xz mirror://gentoo/coreutils-8.16-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.16-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0fe821a48136a6d27121183de59b1b0
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.17 b/metadata/md5-cache/sys-apps/coreutils-8.17
index 4cd9d6ee3345..0efcbecee3f5 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.17
+++ b/metadata/md5-cache/sys-apps/coreutils-8.17
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.17.tar.xz mirror://gnu/coreutils/coreutils-8.17.tar.xz mirror://gentoo/coreutils-8.17.tar.xz mirror://gentoo/coreutils-8.17-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.17-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e05567e8c0ecac2498061dc77cdc52a9
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.5 b/metadata/md5-cache/sys-apps/coreutils-8.5
index df61db17f42d..da9d5d388d48 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.5
+++ b/metadata/md5-cache/sys-apps/coreutils-8.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 >=sys-libs/ncurses-5.3-r5
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.5.tar.gz mirror://gnu/coreutils/coreutils-8.5.tar.gz mirror://gentoo/coreutils-8.5.tar.gz mirror://gentoo/coreutils-8.5-patches-1.tar.lzma http://dev.gentoo.org/~vapier/dist/coreutils-8.5-patches-1.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db703b05f53cfd5269f1b0f0f7eb9f46
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.5-r1 b/metadata/md5-cache/sys-apps/coreutils-8.5-r1
index d8371e698e0b..1e2fb6da39d9 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.5-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 >=sys-libs/ncurses-5.3-r5
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.5.tar.gz mirror://gnu/coreutils/coreutils-8.5.tar.gz mirror://gentoo/coreutils-8.5.tar.gz mirror://gentoo/coreutils-8.5-patches-2.tar.lzma http://dev.gentoo.org/~vapier/dist/coreutils-8.5-patches-2.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78bf5cb219db80d6decd69fbc1175a6c
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.7 b/metadata/md5-cache/sys-apps/coreutils-8.7
index 1df0ce6bec33..df9a124f6913 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.7
+++ b/metadata/md5-cache/sys-apps/coreutils-8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.7.tar.xz mirror://gnu/coreutils/coreutils-8.7.tar.xz mirror://gentoo/coreutils-8.7.tar.xz mirror://gentoo/coreutils-8.7-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.7-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=68f50b6fa3102fb872ab6b1d9fe3134e
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.8 b/metadata/md5-cache/sys-apps/coreutils-8.8
index ad05a6ba3d61..36022c549c7a 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.8
+++ b/metadata/md5-cache/sys-apps/coreutils-8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.8.tar.xz mirror://gnu/coreutils/coreutils-8.8.tar.xz mirror://gentoo/coreutils-8.8.tar.xz mirror://gentoo/coreutils-8.8-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.8-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=731f976139aef1aae44fb9118b40d31e
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.9 b/metadata/md5-cache/sys-apps/coreutils-8.9
index cbf734401e8c..75631097a746 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.9
+++ b/metadata/md5-cache/sys-apps/coreutils-8.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.9.tar.xz mirror://gnu/coreutils/coreutils-8.9.tar.xz mirror://gentoo/coreutils-8.9.tar.xz mirror://gentoo/coreutils-8.9-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.9-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9bbfd6b1462c9cd2d73636bbea63c26
diff --git a/metadata/md5-cache/sys-apps/dbus-1.4.16 b/metadata/md5-cache/sys-apps/dbus-1.4.16
index 2708ca73e4ad..176ad47f0ce7 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.4.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.4.16
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.16.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=1b261a23133a98c15e23d74b239fb5bf
diff --git a/metadata/md5-cache/sys-apps/dbus-1.4.20 b/metadata/md5-cache/sys-apps/dbus-1.4.20
index cd6070723c68..d2492433bec2 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.4.20
+++ b/metadata/md5-cache/sys-apps/dbus-1.4.20
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.4.20.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f8b25d1b32f0ea6ec39aa5f0b5dbaaee
diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.0 b/metadata/md5-cache/sys-apps/dbus-1.6.0
index 5292838916d9..e2733927d793 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.6.0
+++ b/metadata/md5-cache/sys-apps/dbus-1.6.0
@@ -9,5 +9,5 @@ LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-32 ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d15ffd87167c32f3b9feee5fa6807065
diff --git a/metadata/md5-cache/sys-apps/debianutils-3.4.4 b/metadata/md5-cache/sys-apps/debianutils-3.4.4
index 69ca1703f065..a932dbd69603 100644
--- a/metadata/md5-cache/sys-apps/debianutils-3.4.4
+++ b/metadata/md5-cache/sys-apps/debianutils-3.4.4
@@ -7,5 +7,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_3.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9aa97274817e7d5923344881c3041db3
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.1 b/metadata/md5-cache/sys-apps/debianutils-4.1
index f76721a46a62..563de81f971b 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.1
+++ b/metadata/md5-cache/sys-apps/debianutils-4.1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2ebdbb663c19e5685cc06b1f10e467b
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.2.1 b/metadata/md5-cache/sys-apps/debianutils-4.2.1
index 9c5f298acf79..8dae9a170f92 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.2.1
+++ b/metadata/md5-cache/sys-apps/debianutils-4.2.1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06256c10527d5410aba1ee68a1c14895
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.2.2 b/metadata/md5-cache/sys-apps/debianutils-4.2.2
index 200770eca8f5..13c1e68ba964 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.2.2
+++ b/metadata/md5-cache/sys-apps/debianutils-4.2.2
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.2.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87d6edb8b1686a173d39399fd8c12c48
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.3 b/metadata/md5-cache/sys-apps/debianutils-4.3
index cd38e21183ae..1d7cb3142ac6 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.3
+++ b/metadata/md5-cache/sys-apps/debianutils-4.3
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c572eada43cf6ef8294fe034df0856c
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.3.1 b/metadata/md5-cache/sys-apps/debianutils-4.3.1
index c9363f7a3264..ffd25411a634 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.3.1
+++ b/metadata/md5-cache/sys-apps/debianutils-4.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 SMAIL
 PDEPEND=|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1465b7b781a15b96d847ef2cdd65a5a
diff --git a/metadata/md5-cache/sys-apps/diffutils-2.8.7-r2 b/metadata/md5-cache/sys-apps/diffutils-2.8.7-r2
index 0d6b71b0a155..208a8fbb23b7 100644
--- a/metadata/md5-cache/sys-apps/diffutils-2.8.7-r2
+++ b/metadata/md5-cache/sys-apps/diffutils-2.8.7-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbs
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-2.8.7.tar.gz mirror://gentoo/diffutils-2.8.7-i18n.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ad53e056ffaa4d650e070a96f5de4da
diff --git a/metadata/md5-cache/sys-apps/diffutils-2.9 b/metadata/md5-cache/sys-apps/diffutils-2.9
index 6ba6fce2f57a..3b0cf93ce2e1 100644
--- a/metadata/md5-cache/sys-apps/diffutils-2.9
+++ b/metadata/md5-cache/sys-apps/diffutils-2.9
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-2.9.tar.gz mirror://gnu/diffutils/diffutils-2.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=883e7bec0bbb57d3ed8ab1e48fd8fe5e
diff --git a/metadata/md5-cache/sys-apps/diffutils-2.9-r1 b/metadata/md5-cache/sys-apps/diffutils-2.9-r1
index f7d8b6ab7b87..c4f48aa8cee2 100644
--- a/metadata/md5-cache/sys-apps/diffutils-2.9-r1
+++ b/metadata/md5-cache/sys-apps/diffutils-2.9-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-2.9.tar.gz mirror://gnu/diffutils/diffutils-2.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5ff973c3768692fe70ee685e2c73ab7
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.0 b/metadata/md5-cache/sys-apps/diffutils-3.0
index e3b40ffa0eff..b238d767b840 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.0
+++ b/metadata/md5-cache/sys-apps/diffutils-3.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.0.tar.gz mirror://gnu/diffutils/diffutils-3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=91ebe768932b52e5a9b0e74f0c397a05
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.1 b/metadata/md5-cache/sys-apps/diffutils-3.1
index 7b476227ec0e..20c5849e58e7 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.1
+++ b/metadata/md5-cache/sys-apps/diffutils-3.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.1.tar.gz mirror://gnu/diffutils/diffutils-3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8ab313d145e3ac61687f2d7234c70c02
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.2 b/metadata/md5-cache/sys-apps/diffutils-3.2
index 614d20756a93..53b681575313 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.2
+++ b/metadata/md5-cache/sys-apps/diffutils-3.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.2.tar.gz mirror://gnu/diffutils/diffutils-3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e49aa51dbbaef58d8c3473b2e5bc597
diff --git a/metadata/md5-cache/sys-apps/dmidecode-2.10 b/metadata/md5-cache/sys-apps/dmidecode-2.10
index fb3bfc3ddc03..f69a79269175 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-2.10
+++ b/metadata/md5-cache/sys-apps/dmidecode-2.10
@@ -5,5 +5,5 @@ KEYWORDS=-* amd64 arm ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/dmidecode/dmidecode-2.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5cfa4b58907b57602f1ce326862bb7e6
diff --git a/metadata/md5-cache/sys-apps/dmidecode-2.11 b/metadata/md5-cache/sys-apps/dmidecode-2.11
index 4b9910193736..8a3ab1085a93 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-2.11
+++ b/metadata/md5-cache/sys-apps/dmidecode-2.11
@@ -6,5 +6,5 @@ KEYWORDS=-* ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/dmidecode/dmidecode-2.11.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cec16c605e19bd9f77413fd41540402
diff --git a/metadata/md5-cache/sys-apps/fbset-2.1 b/metadata/md5-cache/sys-apps/fbset-2.1
index 2229a537975f..bb8dfd3cdb51 100644
--- a/metadata/md5-cache/sys-apps/fbset-2.1
+++ b/metadata/md5-cache/sys-apps/fbset-2.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19877a30dc764a39f1269ad4df2ca392
diff --git a/metadata/md5-cache/sys-apps/file-5.05 b/metadata/md5-cache/sys-apps/file-5.05
index 7e64b8859a7a..7999b1015be7 100644
--- a/metadata/md5-cache/sys-apps/file-5.05
+++ b/metadata/md5-cache/sys-apps/file-5.05
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.05.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.05.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cdd461dd17a3728bf625b71175f246fd
diff --git a/metadata/md5-cache/sys-apps/file-5.06 b/metadata/md5-cache/sys-apps/file-5.06
index 7b91bddd4690..6558a8ded106 100644
--- a/metadata/md5-cache/sys-apps/file-5.06
+++ b/metadata/md5-cache/sys-apps/file-5.06
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.06.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.06.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8920e44224dbbd60fb84a82213120d61
diff --git a/metadata/md5-cache/sys-apps/file-5.07 b/metadata/md5-cache/sys-apps/file-5.07
index 8a68a1a95d28..1f4fbe7cc2b8 100644
--- a/metadata/md5-cache/sys-apps/file-5.07
+++ b/metadata/md5-cache/sys-apps/file-5.07
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.07.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.07.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9249d1b0e0ba2d63ccf219fb73f95f31
diff --git a/metadata/md5-cache/sys-apps/file-5.07-r1 b/metadata/md5-cache/sys-apps/file-5.07-r1
index d26ddd35672e..3bd6f5042a8a 100644
--- a/metadata/md5-cache/sys-apps/file-5.07-r1
+++ b/metadata/md5-cache/sys-apps/file-5.07-r1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.07.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.07.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9cfa6a18454a4e97d4fa6e7312a2a000
diff --git a/metadata/md5-cache/sys-apps/file-5.07-r2 b/metadata/md5-cache/sys-apps/file-5.07-r2
index 450e9d4f06cd..9f8304055fa5 100644
--- a/metadata/md5-cache/sys-apps/file-5.07-r2
+++ b/metadata/md5-cache/sys-apps/file-5.07-r2
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.07.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.07.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e8847ede2b67f263802cf36eb1aa905
diff --git a/metadata/md5-cache/sys-apps/file-5.07-r3 b/metadata/md5-cache/sys-apps/file-5.07-r3
index 72f2b365b0ec..70231c1883bb 100644
--- a/metadata/md5-cache/sys-apps/file-5.07-r3
+++ b/metadata/md5-cache/sys-apps/file-5.07-r3
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.07.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.07.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cac1241e394816adbfb84c0355716ac0
diff --git a/metadata/md5-cache/sys-apps/file-5.08 b/metadata/md5-cache/sys-apps/file-5.08
index 297bf9645b07..ebf03e0972dd 100644
--- a/metadata/md5-cache/sys-apps/file-5.08
+++ b/metadata/md5-cache/sys-apps/file-5.08
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.08.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.08.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc5a58a54da3a195a134f6663f8095d0
diff --git a/metadata/md5-cache/sys-apps/file-5.09 b/metadata/md5-cache/sys-apps/file-5.09
index fd32fc31ac52..166b6ce5f767 100644
--- a/metadata/md5-cache/sys-apps/file-5.09
+++ b/metadata/md5-cache/sys-apps/file-5.09
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.09.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.09.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca8ca4fbd5c712ff566af42938af5857
diff --git a/metadata/md5-cache/sys-apps/file-5.10 b/metadata/md5-cache/sys-apps/file-5.10
index aa6013729167..2bcd96596976 100644
--- a/metadata/md5-cache/sys-apps/file-5.10
+++ b/metadata/md5-cache/sys-apps/file-5.10
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.10.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.10.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c39013e5c3ff60c230e4ed34cd30126
diff --git a/metadata/md5-cache/sys-apps/file-5.11 b/metadata/md5-cache/sys-apps/file-5.11
index 6d4789909ed1..a12ace1eaa90 100644
--- a/metadata/md5-cache/sys-apps/file-5.11
+++ b/metadata/md5-cache/sys-apps/file-5.11
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.11.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.11.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc3aa0135e44cbbe13e10b3437be4909
diff --git a/metadata/md5-cache/sys-apps/findutils-4.4.2 b/metadata/md5-cache/sys-apps/findutils-4.4.2
index 92493bd26890..7816dbcdfd00 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.4.2
+++ b/metadata/md5-cache/sys-apps/findutils-4.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.4.2.tar.gz mirror://gnu/findutils/findutils-4.4.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e4971c458a3a0454c208406fe204d80
diff --git a/metadata/md5-cache/sys-apps/findutils-4.4.2-r1 b/metadata/md5-cache/sys-apps/findutils-4.4.2-r1
index 03117fbd2048..65639c694924 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.4.2-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.4.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.4.2.tar.gz mirror://gnu/findutils/findutils-4.4.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4512e0c1929b2f55a210597633f8e8e8
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.10 b/metadata/md5-cache/sys-apps/findutils-4.5.10
index e70da6f66142..32ccad4c7863 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.10
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1eb31ba48f65d0b9546e7aff8331838
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.10-r1 b/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
index 6da6e44ea40b..7d58cf2880df 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=934e0b87603e6a70aaeb8be7e4472286
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.8 b/metadata/md5-cache/sys-apps/findutils-4.5.8
index 9f6bd810f387..36e3d7744c85 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.8
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae0e3c8bfa42a6bd7d82044ff9cea370
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.9 b/metadata/md5-cache/sys-apps/findutils-4.5.9
index 14aa5ef2e961..44dcbe99278e 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.9
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1570b0a319dd05bdac0946a9ed8724a4
diff --git a/metadata/md5-cache/sys-apps/gradm-2.2.1.201012301333-r1 b/metadata/md5-cache/sys-apps/gradm-2.2.1.201012301333-r1
index 8a068a1969b5..300b142cd5f8 100644
--- a/metadata/md5-cache/sys-apps/gradm-2.2.1.201012301333-r1
+++ b/metadata/md5-cache/sys-apps/gradm-2.2.1.201012301333-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/udev
 SLOT=0
 SRC_URI=mirror://gentoo/gradm-2.2.1-201012301333.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1f054c80fcb003ea6f576ccca48b866
diff --git a/metadata/md5-cache/sys-apps/gradm-2.2.2.201202161905 b/metadata/md5-cache/sys-apps/gradm-2.2.2.201202161905
index ad5a91d77e8e..a0148efe3c35 100644
--- a/metadata/md5-cache/sys-apps/gradm-2.2.2.201202161905
+++ b/metadata/md5-cache/sys-apps/gradm-2.2.2.201202161905
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/udev
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.2.2-201202161905.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ae3babae8f468ab2178f4996b75ca77
diff --git a/metadata/md5-cache/sys-apps/gradm-2.9.1.201206091838 b/metadata/md5-cache/sys-apps/gradm-2.9.1.201206091838
index eefd3a1013b8..9b90d5ab624a 100644
--- a/metadata/md5-cache/sys-apps/gradm-2.9.1.201206091838
+++ b/metadata/md5-cache/sys-apps/gradm-2.9.1.201206091838
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/udev
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.9.1-201206091838.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ae6e0ad57f7551e75cfd2e04cdbf8ca3
diff --git a/metadata/md5-cache/sys-apps/gradm-2.9.201202232055 b/metadata/md5-cache/sys-apps/gradm-2.9.201202232055
index e2e2fda76b69..cfc2460622a8 100644
--- a/metadata/md5-cache/sys-apps/gradm-2.9.201202232055
+++ b/metadata/md5-cache/sys-apps/gradm-2.9.201202232055
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/udev
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.9-201202232055.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea4e05120797a1b2b06b0ce08fb8f8f3
diff --git a/metadata/md5-cache/sys-apps/hwdata-redhat-0.187 b/metadata/md5-cache/sys-apps/hwdata-redhat-0.187
index 42060a0528dd..6997ceb6cb5c 100644
--- a/metadata/md5-cache/sys-apps/hwdata-redhat-0.187
+++ b/metadata/md5-cache/sys-apps/hwdata-redhat-0.187
@@ -7,5 +7,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=virtual/modutils !sys-apps/hwdata-gentoo
 SLOT=0
 SRC_URI=mirror://fedora/development/source/SRPMS/hwdata-0.187-1.src.rpm
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa3bcb778cdc8c34d3424764ea43a725
diff --git a/metadata/md5-cache/sys-apps/hwdata-redhat-0.217 b/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
index c71f1b06e41e..e175be445f72 100644
--- a/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
+++ b/metadata/md5-cache/sys-apps/hwdata-redhat-0.217
@@ -8,5 +8,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=virtual/modutils !sys-apps/hwdata-gentoo
 SLOT=0
 SRC_URI=mirror://fedora-dev/releases/9/Everything/source/SRPMS/hwdata-0.217-1.fc9.src.rpm
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bb35f612873bc4f7af48385256d2300
diff --git a/metadata/md5-cache/sys-apps/hwsetup-1.2-r2 b/metadata/md5-cache/sys-apps/hwsetup-1.2-r2
index b93939353efa..af8e0a8f805b 100644
--- a/metadata/md5-cache/sys-apps/hwsetup-1.2-r2
+++ b/metadata/md5-cache/sys-apps/hwsetup-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) sys-apps/pciutils sys-apps/hwdata-gentoo
 SLOT=0
 SRC_URI=http://debian-knoppix.alioth.debian.org/sources/hwsetup_1.2-7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bea4acc297fe18054eb2717304a7397d
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.0.2 b/metadata/md5-cache/sys-apps/i2c-tools-3.0.2
index 490044a28e6c..f975e8b0cd99 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.0.2
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/lm_sensors-3 python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.0.2.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d70a221205ede91577f97b3bca868177
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.0.3 b/metadata/md5-cache/sys-apps/i2c-tools-3.0.3
index d90ffb4d9eb5..6dc6b1c6ee73 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.0.3
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/lm_sensors-3 python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.0.3.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26aebd41a498f099379e248b91d1c028
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.1.0 b/metadata/md5-cache/sys-apps/i2c-tools-3.1.0
index 17842804a889..90aa2bed7341 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.1.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/lm_sensors-3 python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.0.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4bc272f29998700b3cb28133ddc9dd4a
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2 b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
index 433f9f3373c4..5c80a40360ee 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.35.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8a992d5d2401ab3f8c38099c7a6601d
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3 b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
index 712e5e513a5b..355a6cdf6349 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.35-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.35.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c97c8557c8e7b4230826378fb1a9506
diff --git a/metadata/md5-cache/sys-apps/iproute2-2.6.38 b/metadata/md5-cache/sys-apps/iproute2-2.6.38
index afc107d32f06..a297c4dc0555 100644
--- a/metadata/md5-cache/sys-apps/iproute2-2.6.38
+++ b/metadata/md5-cache/sys-apps/iproute2-2.6.38
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-2.6.38.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ef80396066d0d7cc9d11a30eea2e270
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.1.0 b/metadata/md5-cache/sys-apps/iproute2-3.1.0
index bcf531f7768f..8994e0c98062 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.1.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c6e35dd9ff746a53dcb1a372d02ef9ff
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.3.0 b/metadata/md5-cache/sys-apps/iproute2-3.3.0
index 9d1463ae2241..d049eda44483 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.3.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.3.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1a6558bd6610d9388e731061506376c
diff --git a/metadata/md5-cache/sys-apps/iproute2-9999 b/metadata/md5-cache/sys-apps/iproute2-9999
index a49ae7549b76..cfbc21f3bb81 100644
--- a/metadata/md5-cache/sys-apps/iproute2-9999
+++ b/metadata/md5-cache/sys-apps/iproute2-9999
@@ -7,5 +7,5 @@ IUSE=atm berkdb +iptables ipv6 minimal
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1b199b8ebc50ee0013185887f2ddcd1
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
index 42306743c462..35c1cbe734f0 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fd255706808c37fe82f798284c487fd
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.3 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
index d92a061a7cdd..c17e35ebad36 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=61a5132e7c73d802ff4d08d5497b4d4a
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
index 61697a0ce89a..7b763bf84ae5 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9702036b153d14edcce16352f2396ee1
diff --git a/metadata/md5-cache/sys-apps/lshw-02.15b b/metadata/md5-cache/sys-apps/lshw-02.15b
index 45ed25fb87b6..12a4e84fa865 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.15b
+++ b/metadata/md5-cache/sys-apps/lshw-02.15b
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=http://ezix.org/software/files/lshw-B.02.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=18471e4180ee3ecbad2523b18f743566
diff --git a/metadata/md5-cache/sys-apps/lshw-02.16b b/metadata/md5-cache/sys-apps/lshw-02.16b
index dce14cf89d95..e2f4b8f4fde6 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.16b
+++ b/metadata/md5-cache/sys-apps/lshw-02.16b
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=http://ezix.org/software/files/lshw-B.02.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ef84bb6ad1e1a65aa4d64a92d6904de
diff --git a/metadata/md5-cache/sys-apps/lshw-02.16b-r1 b/metadata/md5-cache/sys-apps/lshw-02.16b-r1
index b745f46832e1..2007380de6c4 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.16b-r1
+++ b/metadata/md5-cache/sys-apps/lshw-02.16b-r1
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
 REQUIRED_USE=static? ( !gtk )
 SLOT=0
 SRC_URI=http://ezix.org/software/files/lshw-B.02.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac4e89f6559492076318cafb253272e4
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.11.1 b/metadata/md5-cache/sys-apps/module-init-tools-3.11.1
index 96276728b831..8c5259d3e85f 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.11.1
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.11.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=sys-apps/baselayout-2.0.1 !sys-apps/modutils
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.11.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f4967d8df100e75a64efd50f3e9af41
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.12 b/metadata/md5-cache/sys-apps/module-init-tools-3.12
index f0c398745589..7f8eee9dd37f 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.12
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=sys-apps/baselayout-2.0.1 !sys-apps/modutils
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb3bc68e80a75156b4a92b6ea767d983
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.12-r1 b/metadata/md5-cache/sys-apps/module-init-tools-3.12-r1
index 5124a2108a37..5ded4123dc91 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.12-r1
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.12-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib >=sys-apps/baselayout-2.0.1 !sys-apps/modutils
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.12.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f43af9ecf72a1ddb8288f3e15a59714
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.13 b/metadata/md5-cache/sys-apps/module-init-tools-3.13
index af99127ba60f..b56a79ae3972 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.13
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.13
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !<sys-apps/baselayout-2.0.1 !sys-apps/modutils
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.13.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ead3bb06abaee5bede634e2eb71027cc
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.16 b/metadata/md5-cache/sys-apps/module-init-tools-3.16
index 52da460c66eb..2f31858ba1b7 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.16
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.16
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !<sys-apps/baselayout-2.0.1 !sys-apps/modutils
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=747e4563cc18bff3b4a8212f6a50ee42
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.16-r1 b/metadata/md5-cache/sys-apps/module-init-tools-3.16-r1
index 53f0839f5ba7..49257f686463 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.16-r1
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.16-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !<sys-apps/baselayout-2.0.1 !sys-apps/kmod !sys-apps/modut
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2 mirror://gentoo/module-init-tools-3.16-man.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72d735c1d90d6a7112ba6503c616f7f6
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.5 b/metadata/md5-cache/sys-apps/module-init-tools-3.5
index 0e2bb84f6e0a..d7269c5ac941 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.5
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.5
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib >=sys-apps/baselayout-1.12.7-r2 !sys-apps/modutils
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.5.tar.bz2 old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aefb6310b6ef30ce024db333c4e75dcf
diff --git a/metadata/md5-cache/sys-apps/module-init-tools-3.6-r1 b/metadata/md5-cache/sys-apps/module-init-tools-3.6-r1
index 5463446d01a6..9ff2f30676dc 100644
--- a/metadata/md5-cache/sys-apps/module-init-tools-3.6-r1
+++ b/metadata/md5-cache/sys-apps/module-init-tools-3.6-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib >=sys-apps/baselayout-1.12.7-r2 !sys-apps/modutils
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.6.tar.bz2 old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2 ) mirror://gentoo/module-init-tools-3.6-man.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5aa57cdea77389334d88fe42ac648d6e
diff --git a/metadata/md5-cache/sys-apps/more-2.12r b/metadata/md5-cache/sys-apps/more-2.12r
index d7eb83e2a9d4..94b21488095d 100644
--- a/metadata/md5-cache/sys-apps/more-2.12r
+++ b/metadata/md5-cache/sys-apps/more-2.12r
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 selinux? ( sys-libs/libselinux ) !sys-apps/util-linux
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/util-linux-2.12r.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec677fcbdfd1284855500c5e572bb7fb
diff --git a/metadata/md5-cache/sys-apps/mtree-2007.4 b/metadata/md5-cache/sys-apps/mtree-2007.4
index 3b09a20280e4..9901d2acc094 100644
--- a/metadata/md5-cache/sys-apps/mtree-2007.4
+++ b/metadata/md5-cache/sys-apps/mtree-2007.4
@@ -5,5 +5,5 @@ KEYWORDS=amd64 ppc ~s390 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.netbsd.org/pub/pkgsrc/pkgsrc-2007Q4/pkgsrc-2007Q4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e138a2e6c49a4d9896c008d2ced563b
diff --git a/metadata/md5-cache/sys-apps/net-tools-1.60_p20110409135728 b/metadata/md5-cache/sys-apps/net-tools-1.60_p20110409135728
index 44d40ee01dfc..57e8c1d6dc5a 100644
--- a/metadata/md5-cache/sys-apps/net-tools-1.60_p20110409135728
+++ b/metadata/md5-cache/sys-apps/net-tools-1.60_p20110409135728
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-l
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/net-tools-1.60_p20110409135728.tar.xz mirror://gentoo/net-tools-1.60_p20110409135728-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0ca8b178e794b6e75b371ab684159265
diff --git a/metadata/md5-cache/sys-apps/net-tools-1.60_p20111120203157 b/metadata/md5-cache/sys-apps/net-tools-1.60_p20111120203157
index f1ce0c7fef28..b1e41343f5a1 100644
--- a/metadata/md5-cache/sys-apps/net-tools-1.60_p20111120203157
+++ b/metadata/md5-cache/sys-apps/net-tools-1.60_p20111120203157
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/net-tools-1.60_p201111202031570500.tar.xz mirror://gentoo/net-tools-1.60_p201111202031570500-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5772715732d34ff83871218ce8f5ac5
diff --git a/metadata/md5-cache/sys-apps/net-tools-1.60_p20120127084908 b/metadata/md5-cache/sys-apps/net-tools-1.60_p20120127084908
index 8c38c4d0b6aa..3e5c3f60860b 100644
--- a/metadata/md5-cache/sys-apps/net-tools-1.60_p20120127084908
+++ b/metadata/md5-cache/sys-apps/net-tools-1.60_p20120127084908
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.9.3
 SLOT=0
 SRC_URI=mirror://gentoo/net-tools-1.60_p20120127084908.tar.xz mirror://gentoo/net-tools-1.60_p20120127084908-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d5919ee2db0346382fb1b6f938fdd9a
diff --git a/metadata/md5-cache/sys-apps/net-tools-9999 b/metadata/md5-cache/sys-apps/net-tools-9999
index eee8f612672f..250cbc2becf5 100644
--- a/metadata/md5-cache/sys-apps/net-tools-9999
+++ b/metadata/md5-cache/sys-apps/net-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://net-tools.sourceforge.net/
 IUSE=nls old-output static
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e915fe31a78d5ede74a953495b62ec58
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10 b/metadata/md5-cache/sys-apps/openrc-0.10
index fcd93704d015..02fdaaf5b809 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.10
+++ b/metadata/md5-cache/sys-apps/openrc-0.10
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb012e2e0f9c99baf06a6c988712103e
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10.1 b/metadata/md5-cache/sys-apps/openrc-0.10.1
index ee3989d74abd..4d1872c3afb9 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.10.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.10.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.10.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=135c46bb96503058535f9f478aaaa6e4
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10.2 b/metadata/md5-cache/sys-apps/openrc-0.10.2
index c178440fa28a..fa80bda05b18 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.10.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.10.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.10.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=668e4b2f98098ca16ad9caeb242173f2
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10.3 b/metadata/md5-cache/sys-apps/openrc-0.10.3
index e17ade490251..ba329c094cad 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.10.3
+++ b/metadata/md5-cache/sys-apps/openrc-0.10.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.10.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0f422553cdd85943747beb182e17102e
diff --git a/metadata/md5-cache/sys-apps/openrc-0.9.8.4 b/metadata/md5-cache/sys-apps/openrc-0.9.8.4
index 84e3a1114bee..cacff4693994 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.9.8.4
+++ b/metadata/md5-cache/sys-apps/openrc-0.9.8.4
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.9.8.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07eae334f23337d10b66d6cd445968b9
diff --git a/metadata/md5-cache/sys-apps/openrc-0.9.9 b/metadata/md5-cache/sys-apps/openrc-0.9.9
index fa71404b1ecf..3407bebf8887 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.9.9
+++ b/metadata/md5-cache/sys-apps/openrc-0.9.9
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.9.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d25905e1f0b8ffe5fe034942bfad938
diff --git a/metadata/md5-cache/sys-apps/openrc-0.9.9.1 b/metadata/md5-cache/sys-apps/openrc-0.9.9.1
index 48c201e91547..b2bb4807ee47 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.9.9.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.9.9.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.9.9.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4376b0b4fcfc1fc82ab8c42dae34af25
diff --git a/metadata/md5-cache/sys-apps/openrc-0.9.9.2 b/metadata/md5-cache/sys-apps/openrc-0.9.9.2
index bc4712d92ea4..45308b0a85de 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.9.9.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.9.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.9.9.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69eae26e4512640d47d6152954a4d1a9
diff --git a/metadata/md5-cache/sys-apps/openrc-0.9.9.3 b/metadata/md5-cache/sys-apps/openrc-0.9.9.3
index 007c3ad48c82..dc36f0fdea2a 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.9.9.3
+++ b/metadata/md5-cache/sys-apps/openrc-0.9.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.0.0 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
 SRC_URI=mirror://gentoo/openrc-0.9.9.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=80c13f1fed4423199b881f66721ab2df
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index f85d39bb8dea..a092847ed9da 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -7,5 +7,5 @@ IUSE=debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kern
 LICENSE=BSD-2
 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2dd532da7a79560e3eb94a9e9a98c72
diff --git a/metadata/md5-cache/sys-apps/paxctl-0.4 b/metadata/md5-cache/sys-apps/paxctl-0.4
index 52cab82f18d7..6277e04d9adf 100644
--- a/metadata/md5-cache/sys-apps/paxctl-0.4
+++ b/metadata/md5-cache/sys-apps/paxctl-0.4
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pax.grsecurity.net/paxctl-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89aac8496cb39e1d7d14b694e7164fe4
diff --git a/metadata/md5-cache/sys-apps/paxctl-0.5 b/metadata/md5-cache/sys-apps/paxctl-0.5
index 87b373e0e33d..405cc131ce70 100644
--- a/metadata/md5-cache/sys-apps/paxctl-0.5
+++ b/metadata/md5-cache/sys-apps/paxctl-0.5
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pax.grsecurity.net/paxctl-0.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45a91948870c42dfeb63da85c2173cd8
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-015 b/metadata/md5-cache/sys-apps/pcmciautils-015
index b00e372f6482..73ef21998748 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-015
+++ b/metadata/md5-cache/sys-apps/pcmciautils-015
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/sysfsutils-1.2.0-r1 virtual/modutils
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/pcmcia/pcmciautils-015.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f866d691aa4ddb073338c3b555132270
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-016 b/metadata/md5-cache/sys-apps/pcmciautils-016
index a891854557f0..b4f9edd52db8 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-016
+++ b/metadata/md5-cache/sys-apps/pcmciautils-016
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/sysfsutils-1.3.0 virtual/modutils
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/pcmcia/pcmciautils-016.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75f2f00d42786e86e79cd77182d3ecc1
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-017 b/metadata/md5-cache/sys-apps/pcmciautils-017
index d6b61d7af11f..2a724a99e22b 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-017
+++ b/metadata/md5-cache/sys-apps/pcmciautils-017
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/sysfsutils-1.3.0 virtual/modutils
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/pcmcia/pcmciautils-017.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd49c19320b66dab9620ddf1e9783016
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11 b/metadata/md5-cache/sys-apps/portage-2.1.11.1
similarity index 86%
rename from metadata/md5-cache/sys-apps/portage-2.1.11
rename to metadata/md5-cache/sys-apps/portage-2.1.11.1
index dd02fa78522b..90c744b300eb 100644
--- a/metadata/md5-cache/sys-apps/portage-2.1.11
+++ b/metadata/md5-cache/sys-apps/portage-2.1.11.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
-SRC_URI=mirror://gentoo/portage-2.1.11.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+SRC_URI=mirror://gentoo/portage-2.1.11.1.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.1.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4736fe7778934cabc7c9cdd5347ae5dd
+_md5_=2d64bac5ff838e4890902399d2998bab
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha111 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha112
similarity index 91%
rename from metadata/md5-cache/sys-apps/portage-2.2.0_alpha111
rename to metadata/md5-cache/sys-apps/portage-2.2.0_alpha112
index 2d78e15d2ffa..94a73448aeab 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha111
+++ b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha112
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
-SRC_URI=mirror://gentoo/portage-2.2.0_alpha111.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha111.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+SRC_URI=mirror://gentoo/portage-2.2.0_alpha111.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha111.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha112.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha112.patch.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=24ffa300a0d97005c9fc795820f79240
+_md5_=4a6082ed03c4cdc045c8f9eb6a71c3e8
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0 b/metadata/md5-cache/sys-apps/qingy-1.0.0
index be4aa512e4ad..dde7e2412d84 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.4-r6 opensslcrypt? ( >=dev-libs/openssl-0.9.7e ) crypt? ( >=dev-libs/libgcrypt-1.2.1 ) directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] ) emacs? ( virtual/emacs ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-proto/scrnsaverproto ) pam? ( sys-auth/pambase )
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2
-_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=57dff19cdafa173826cf5b3d7ced5371
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.16 b/metadata/md5-cache/sys-apps/razercfg-0.16
index 97d15db589b6..e7ea272aaf2e 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.16
+++ b/metadata/md5-cache/sys-apps/razercfg-0.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-core ) dev-lang/python
 SLOT=0
 SRC_URI=http://bu3sch.de/razercfg/razercfg-0.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9514fd8af522bc62669df66c245206cc
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.16-r1 b/metadata/md5-cache/sys-apps/razercfg-0.16-r1
index f4d5a2a05f18..5ff080287f93 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.16-r1
+++ b/metadata/md5-cache/sys-apps/razercfg-0.16-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-core ) dev-lang/python
 SLOT=0
 SRC_URI=http://bu3sch.de/razercfg/razercfg-0.16.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d04e86461a82ab980bb7d9354e93cf25
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.17 b/metadata/md5-cache/sys-apps/razercfg-0.17
index d8ea9165e273..8c1bceabbe9c 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.17
+++ b/metadata/md5-cache/sys-apps/razercfg-0.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pm-utils? ( sys-power/pm-utils ) qt4? ( dev-python/PyQt4 ) dev-lang/python
 SLOT=0
 SRC_URI=http://bu3sch.de/razercfg/razercfg-0.17.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbb14d565214f072c8b0c99919bfcaa4
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.17_p20111028 b/metadata/md5-cache/sys-apps/razercfg-0.17_p20111028
index 767917315d7e..ae36bc965575 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.17_p20111028
+++ b/metadata/md5-cache/sys-apps/razercfg-0.17_p20111028
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pm-utils? ( sys-power/pm-utils ) qt4? ( dev-python/PyQt4 ) dev-lang/python
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~joker/distfiles/razercfg-0.17_p20111028.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9192901a48810aceef6da3a8dd80b061
diff --git a/metadata/md5-cache/sys-apps/sandbox-1.6-r2 b/metadata/md5-cache/sys-apps/sandbox-1.6-r2
index c66b388b1df1..bff02995989c 100644
--- a/metadata/md5-cache/sys-apps/sandbox-1.6-r2
+++ b/metadata/md5-cache/sys-apps/sandbox-1.6-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-1.6.tar.lzma http://dev.gentoo.org/~vapier/dist/sandbox-1.6.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=52ccfd95493693371a597b6b9910974d
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.3-r1 b/metadata/md5-cache/sys-apps/sandbox-2.3-r1
index 4fd9c77d53aa..366e49fbda34 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.3-r1
+++ b/metadata/md5-cache/sys-apps/sandbox-2.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.3.tar.xz http://dev.gentoo.org/~vapier/dist/sandbox-2.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=051d98f8db05ffee66e6ad6702c669b6
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.4 b/metadata/md5-cache/sys-apps/sandbox-2.4
index 48eb7d4c8a23..4c3e559e35b4 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.4.tar.xz http://dev.gentoo.org/~vapier/dist/sandbox-2.4.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b9e875a2f881c2f453a1edeb245c90a
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.5 b/metadata/md5-cache/sys-apps/sandbox-2.5
index 55828c8c919c..f20f6f7f9f2e 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.5
+++ b/metadata/md5-cache/sys-apps/sandbox-2.5
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.5.tar.xz http://dev.gentoo.org/~vapier/dist/sandbox-2.5.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=41370214d031d182be11508a9416e8b4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ec4079d11c54e39d01adc71c2c7eb261
diff --git a/metadata/md5-cache/sys-apps/sed-4.2 b/metadata/md5-cache/sys-apps/sed-4.2
index 1fb60f4b9e49..7145166f7ab2 100644
--- a/metadata/md5-cache/sys-apps/sed-4.2
+++ b/metadata/md5-cache/sys-apps/sed-4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2ee261cc785100b1068e24515a00eff1
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.1 b/metadata/md5-cache/sys-apps/sed-4.2.1
index e91c466a99b7..ac025a0799ad 100644
--- a/metadata/md5-cache/sys-apps/sed-4.2.1
+++ b/metadata/md5-cache/sys-apps/sed-4.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.2.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6bf540acfff9e955f49e4fe28b7b93fd
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.1-r1 b/metadata/md5-cache/sys-apps/sed-4.2.1-r1
index 51bf6d1820c6..7c59131c39fa 100644
--- a/metadata/md5-cache/sys-apps/sed-4.2.1-r1
+++ b/metadata/md5-cache/sys-apps/sed-4.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.2.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad97dc026f8a91e4f979d6236d61a7fe
diff --git a/metadata/md5-cache/sys-apps/shadow-4.1.4.2-r6 b/metadata/md5-cache/sys-apps/shadow-4.1.4.2-r6
index 4f4ea582d95a..cb237cf4071c 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.1.4.2-r6
+++ b/metadata/md5-cache/sys-apps/shadow-4.1.4.2-r6
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8416fee7d63179024b038d4e0cdbfee
diff --git a/metadata/md5-cache/sys-apps/shadow-4.1.4.3 b/metadata/md5-cache/sys-apps/shadow-4.1.4.3
index 9eaadedecf14..594e001c37f6 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.1.4.3
+++ b/metadata/md5-cache/sys-apps/shadow-4.1.4.3
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.4.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2219077d0ac553b46a7e510455f4246
diff --git a/metadata/md5-cache/sys-apps/shadow-4.1.5 b/metadata/md5-cache/sys-apps/shadow-4.1.5
index 30970209bd59..81556d59df6b 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.1.5
+++ b/metadata/md5-cache/sys-apps/shadow-4.1.5
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e94c07e059c623c27b6779e547ff811
diff --git a/metadata/md5-cache/sys-apps/shadow-4.1.5-r1 b/metadata/md5-cache/sys-apps/shadow-4.1.5-r1
index cfd844bf29f1..195656d84061 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.1.5-r1
+++ b/metadata/md5-cache/sys-apps/shadow-4.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20120417 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bbee0159c39d7eb7a47a594ae2795915
diff --git a/metadata/md5-cache/sys-apps/shadow-4.1.5-r2 b/metadata/md5-cache/sys-apps/shadow-4.1.5-r2
index 9a89b6ed899a..efcfca5e1d14 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.1.5-r2
+++ b/metadata/md5-cache/sys-apps/shadow-4.1.5-r2
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 sys-libs/libsemanage ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20120417 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77491f49a65285445f2b413fa7f78693
diff --git a/metadata/md5-cache/sys-apps/smartmontools-5.38 b/metadata/md5-cache/sys-apps/smartmontools-5.38
index 3ea5c68fa005..24bc75c79b41 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-5.38
+++ b/metadata/md5-cache/sys-apps/smartmontools-5.38
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.38.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6d52cd1364ba1a4d23853f2d70cea74
diff --git a/metadata/md5-cache/sys-apps/smartmontools-5.39.1 b/metadata/md5-cache/sys-apps/smartmontools-5.39.1
index bdb7b9cbfb24..e35adce4b470 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-5.39.1
+++ b/metadata/md5-cache/sys-apps/smartmontools-5.39.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!minimal? ( virtual/mailx )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.39.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=039ddf2e3900178efaf095f212732944
diff --git a/metadata/md5-cache/sys-apps/smartmontools-5.40 b/metadata/md5-cache/sys-apps/smartmontools-5.40
index 446f2c4a2182..58be70cf636e 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-5.40
+++ b/metadata/md5-cache/sys-apps/smartmontools-5.40
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!minimal? ( virtual/mailx caps? ( sys-libs/libcap-ng ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.40.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=30693ea78e6568d2f44832ca163b228b
diff --git a/metadata/md5-cache/sys-apps/smartmontools-5.41-r1 b/metadata/md5-cache/sys-apps/smartmontools-5.41-r1
index cf52f92d79b0..deeb8bb833e0 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-5.41-r1
+++ b/metadata/md5-cache/sys-apps/smartmontools-5.41-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!minimal? ( caps? ( sys-libs/libcap-ng ) ) !minimal? ( virtual/mailx )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.41.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ab3051030de3d0a87eeebebf27b224b
diff --git a/metadata/md5-cache/sys-apps/smartmontools-5.42 b/metadata/md5-cache/sys-apps/smartmontools-5.42
index e508dd2abde8..d045321319e5 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-5.42
+++ b/metadata/md5-cache/sys-apps/smartmontools-5.42
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!minimal? ( caps? ( sys-libs/libcap-ng ) ) !minimal? ( virtual/mailx )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.42.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1a1d55452f2347c803703f16b334a6fa
diff --git a/metadata/md5-cache/sys-apps/smartmontools-9999 b/metadata/md5-cache/sys-apps/smartmontools-9999
index a469b59fef64..af4acac0848e 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-9999
+++ b/metadata/md5-cache/sys-apps/smartmontools-9999
@@ -7,5 +7,5 @@ IUSE=static minimal caps
 LICENSE=GPL-2
 RDEPEND=!minimal? ( caps? ( sys-libs/libcap-ng ) ) !minimal? ( virtual/mailx )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1c9e70bab6660c3921fa69b2d5c7954
diff --git a/metadata/md5-cache/sys-apps/systemd-185 b/metadata/md5-cache/sys-apps/systemd-185
index 7e1f50209d78..d1d8cc752a7a 100644
--- a/metadata/md5-cache/sys-apps/systemd-185
+++ b/metadata/md5-cache/sys-apps/systemd-185
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-fs/udev >=sys-apps/dbus-1.4.10 >=sys-apps/kmod-5 sys-apps/pciutils sys-apps/sysvinit sys-apps/usbutils >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( sys-fs/cryptsetup ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-185.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c434cb753bdb40f780c51a0becd21c7
diff --git a/metadata/md5-cache/sys-apps/systemd-29-r3 b/metadata/md5-cache/sys-apps/systemd-29-r3
index 26304eaff504..0f814147c475 100644
--- a/metadata/md5-cache/sys-apps/systemd-29-r3
+++ b/metadata/md5-cache/sys-apps/systemd-29-r3
@@ -10,5 +10,5 @@ PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=>=sys-apps/dbus-1.4.10 >=sys-fs/udev-171 >=sys-apps/util-linux-2.19 sys-libs/libcap audit? ( >=sys-process/audit-2 ) cryptsetup? ( sys-fs/cryptsetup ) gtk? ( dev-libs/dbus-glib >=dev-libs/glib-2.26 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 ) pam? ( virtual/pam ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) !<sys-apps/openrc-0.8.3 !=sys-apps/systemd-29-r4 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-29.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion	003731da0df19d26955927bd534f3058	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a456d26505425c78349f1127aef6151d
diff --git a/metadata/md5-cache/sys-apps/systemd-29-r6 b/metadata/md5-cache/sys-apps/systemd-29-r6
index 312a696bd47f..29c651858e6f 100644
--- a/metadata/md5-cache/sys-apps/systemd-29-r6
+++ b/metadata/md5-cache/sys-apps/systemd-29-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4.10 sys-apps/sysvinit >=sys-apps/util-linux-2.19 >=sys-fs/udev-171 sys-libs/libcap audit? ( >=sys-process/audit-2 ) cryptsetup? ( sys-fs/cryptsetup ) gtk? ( dev-libs/dbus-glib >=dev-libs/glib-2.26 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 ) pam? ( virtual/pam ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) !<sys-apps/openrc-0.8.3
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-29.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2323a02719755111a0e07ce072649bcd
diff --git a/metadata/md5-cache/sys-apps/systemd-39 b/metadata/md5-cache/sys-apps/systemd-39
index e0568a72ffb4..f1b0f1af0d5c 100644
--- a/metadata/md5-cache/sys-apps/systemd-39
+++ b/metadata/md5-cache/sys-apps/systemd-39
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4.10 sys-apps/sysvinit >=sys-apps/util-linux-2.19 >=sys-fs/udev-172 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( sys-fs/cryptsetup ) gtk? ( dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libgee:0 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) !<sys-apps/openrc-0.8.3
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-39.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75f2ba43875183c5ca1017f394378450
diff --git a/metadata/md5-cache/sys-apps/systemd-44-r1 b/metadata/md5-cache/sys-apps/systemd-44-r1
index f4fda1d8b611..81b9e65459cd 100644
--- a/metadata/md5-cache/sys-apps/systemd-44-r1
+++ b/metadata/md5-cache/sys-apps/systemd-44-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4.10 >=sys-apps/kmod-5 sys-apps/sysvinit >=sys-apps/util-linux-2.19 >=sys-fs/udev-172 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( sys-fs/cryptsetup ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-44.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb6b81236499a7aa96a618f407555516
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.87-r3 b/metadata/md5-cache/sys-apps/sysvinit-2.87-r3
index a944987ef93b..60db0c038e4e 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.87-r3
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.87-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/sysvinit/sysvinit_2.87dsf.orig.tar.gz mirror://gentoo/sysvinit-2.87-patches-2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7f8e0da198d6fb36a01c648cdf1c680e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88 b/metadata/md5-cache/sys-apps/sysvinit-2.88
index aad4826db57b..8625a7d1e596 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.88
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 )
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.88dsf.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e699fb0189546940ae40fe2fe9ba6317
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88-r1 b/metadata/md5-cache/sys-apps/sysvinit-2.88-r1
index a1e421df74f3..193dde22befc 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88-r1
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.88-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 )
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.88dsf.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd92ba90b78f0956ec079fab60d22909
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88-r2 b/metadata/md5-cache/sys-apps/sysvinit-2.88-r2
index 7e6df8b94ae8..8b34d60d62db 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88-r2
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.88-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 )
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.88dsf.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6aae5b79970ba3c6fd06a710ce8865c
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88-r3 b/metadata/md5-cache/sys-apps/sysvinit-2.88-r3
index 31e375daa6e0..65d58e10dcf4 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88-r3
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.88-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) !<sys-apps/util-linux-2.20
 SLOT=0
 SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.88dsf.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9173889b1b29e6dd992b5fb8232ef5bd
diff --git a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22 b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22
index 4bfec00615f1..9a895b6a5750 100644
--- a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22
+++ b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=tcp_wrappers_license
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-22.debian.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31c8b1d040d4ac3e91d0466108e82c30
diff --git a/metadata/md5-cache/sys-apps/texinfo-4.13 b/metadata/md5-cache/sys-apps/texinfo-4.13
index 22c9acf968d6..8b21450ef3e7 100644
--- a/metadata/md5-cache/sys-apps/texinfo-4.13
+++ b/metadata/md5-cache/sys-apps/texinfo-4.13
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-4.13.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2428005fedac86d74f00de5dfbe9aa7
diff --git a/metadata/md5-cache/sys-apps/texinfo-4.13-r1 b/metadata/md5-cache/sys-apps/texinfo-4.13-r1
index f6e5c1b8eada..76e3a4372945 100644
--- a/metadata/md5-cache/sys-apps/texinfo-4.13-r1
+++ b/metadata/md5-cache/sys-apps/texinfo-4.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-4.13.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c73bd7f3c2757680a942b4d98d679db
diff --git a/metadata/md5-cache/sys-apps/texinfo-4.13-r2 b/metadata/md5-cache/sys-apps/texinfo-4.13-r2
index 4965d19dd885..a9c9c21ffe66 100644
--- a/metadata/md5-cache/sys-apps/texinfo-4.13-r2
+++ b/metadata/md5-cache/sys-apps/texinfo-4.13-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-4.13.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37c9dc040daa330a4c4b8d538ddc7a8e
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r2 b/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r2
index e85eee1b4b93..4379a20e85cf 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r2
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db7337e59e73f9f31ee229853a18b6f0
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r3 b/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r3
index e708e13f9b34..cba96fa7c67d 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r3
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.1-r3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.1.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aefe2580cde9d853cc7e3903de80c34a
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.70-r1 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.70-r1
index 77ecb22acf78..0bb47602b886 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.70-r1
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.70-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=dev-libs/openssl-0.9.6g sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.superscript.com/ucspi-ssl/ucspi-ssl-0.70.tar.gz http://www.suspectclass.com/~sgifford/ucspi-tls/files/ucspi-ssl-0.70-ucspitls-0.1.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1cf231671e18fbb388bdabf159741f6
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17
index 6a0b6c66b23b..e9d700c841f2 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r17
@@ -9,5 +9,5 @@ RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1f2f7bc040269db024e3fd41b3268e7
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.19.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.19.1-r1
index a59d67432d52..182b2d5dc482 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.19.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.19.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.19/util-linux-2.19.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35126315630990440b425eb6991f535e
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20-r1 b/metadata/md5-cache/sys-apps/util-linux-2.20-r1
index 4611186dd39a..1e2e79f9f6fd 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccc034b8b187b5f4bb2a8757a54fadff
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20.1 b/metadata/md5-cache/sys-apps/util-linux-2.20.1
index 1bbab7189c16..18cf827abde3 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4b27896fd4c7105f4598ea19983e65c
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
index 3ac438024342..aa8b18f293bb 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a8161c8b6bfe5bb590caeb5ece05a95
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2 b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
index 97323d2c76c6..e46e64a040d8 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.20.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.20/util-linux-2.20.1.tar.bz2 loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf0f7224e5d8478704d18b5f3be416d9
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.21 b/metadata/md5-cache/sys-apps/util-linux-2.21
index e9a0f9a8d23a..3c32423c8ee7 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.21
+++ b/metadata/md5-cache/sys-apps/util-linux-2.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.tar.xz loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50083d1a2af136d5ee14aaad300e566b
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.21.1 b/metadata/md5-cache/sys-apps/util-linux-2.21.1
index f994309f0a6f..6fcc983580e2 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.21.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.21.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.1.tar.xz loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e91e03e13bdc53b6cdf18005ec2164b4
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.21.2 b/metadata/md5-cache/sys-apps/util-linux-2.21.2
index 50616b1c1db2..e219b8afe73f 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.21.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.21.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( sys-fs/udev )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.xz loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8c8d9698682b00a7dc56aca50153d1c
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index b914ca80ea34..8f1217a60bde 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -7,5 +7,5 @@ IUSE=+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang stati
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( sys-fs/udev )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=286dccfb268e82064918c83b95c5a4d3
diff --git a/metadata/md5-cache/sys-apps/v86d-0.1.10 b/metadata/md5-cache/sys-apps/v86d-0.1.10
index 043e348f32e8..ca5297dca5c7 100644
--- a/metadata/md5-cache/sys-apps/v86d-0.1.10
+++ b/metadata/md5-cache/sys-apps/v86d-0.1.10
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3df5e5730c3e5607dbe8ef0d6c94ed6d
diff --git a/metadata/md5-cache/sys-apps/v86d-0.1.9 b/metadata/md5-cache/sys-apps/v86d-0.1.9
index 2b15f4c8678b..81d3b5ec44d9 100644
--- a/metadata/md5-cache/sys-apps/v86d-0.1.9
+++ b/metadata/md5-cache/sys-apps/v86d-0.1.9
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24c2f99bba072ecaebc69d4fefcf2a47
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.12 b/metadata/md5-cache/sys-apps/watchdog-5.12
index be46daf95d03..8d98b9e3a008 100644
--- a/metadata/md5-cache/sys-apps/watchdog-5.12
+++ b/metadata/md5-cache/sys-apps/watchdog-5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nfs? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=mirror://sourceforge/watchdog/watchdog-5.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b8ed9f77c33c3c9c2bc1b3d065e8c99
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.9-r1 b/metadata/md5-cache/sys-apps/watchdog-5.9-r1
index fe64f6e113e6..920bccf6c899 100644
--- a/metadata/md5-cache/sys-apps/watchdog-5.9-r1
+++ b/metadata/md5-cache/sys-apps/watchdog-5.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nfs? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=mirror://sourceforge/watchdog/watchdog-5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8a4f855344175f5a2fb5852928afaab
diff --git a/metadata/md5-cache/sys-apps/whdd-1.0 b/metadata/md5-cache/sys-apps/whdd-1.0
index 50c32beb1364..9eec8b6c1ab2 100644
--- a/metadata/md5-cache/sys-apps/whdd-1.0
+++ b/metadata/md5-cache/sys-apps/whdd-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog sys-libs/ncurses[unicode] sys-apps/smartmontools
 SLOT=0
 SRC_URI=http://github.com/krieger-od/whdd/tarball/1.0 -> whdd-1.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ec11eacd74c41eb98955beacce2a126
diff --git a/metadata/md5-cache/sys-apps/whdd-9999 b/metadata/md5-cache/sys-apps/whdd-9999
index f756e4b214c3..7e791210d9ca 100644
--- a/metadata/md5-cache/sys-apps/whdd-9999
+++ b/metadata/md5-cache/sys-apps/whdd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://github.com/krieger-od/whdd
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog sys-libs/ncurses[unicode] sys-apps/smartmontools
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aee2797d9800aed9b2a38c87e5bc6d28
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30 b/metadata/md5-cache/sys-apps/x86info-1.30
index 57a214900ade..ac80cf909dbe 100644
--- a/metadata/md5-cache/sys-apps/x86info-1.30
+++ b/metadata/md5-cache/sys-apps/x86info-1.30
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edca4250ae107b43f621a9d9fbbcb060
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.14-r1 b/metadata/md5-cache/sys-apps/xinetd-2.3.14-r1
index a67416ae9257..f97aebe1db6f 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.14-r1
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.14-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d38844eb588a18c49824884db19e8e8c
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15 b/metadata/md5-cache/sys-apps/xinetd-2.3.15
index 4e68c5069521..25084de4a49d 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15
@@ -4,10 +4,10 @@ DESCRIPTION=powerful replacement for inetd
 EAPI=4
 HOMEPAGE=http://www.xinetd.org/
 IUSE=perl rpc tcpd
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e9716a6164eaba733b670b4461941927
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=181817255753197c872ba374e6fd4eb7
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5-r1 b/metadata/md5-cache/sys-auth/consolekit-0.4.5-r1
index 2add58009f84..74011c6b3fe1 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed09adfb776e1ac8d60b0d479f4a4d18
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
index 9aa48e2ca290..c9a297869028 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl sys-apps/coreutils[acl] >=sys-fs/udev-171-r6 !<sys-fs/udev-171-r6[acl] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/ConsoleKit-0.4.5_p20120320.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85411ad1a35e6151a233d486efecc43a
diff --git a/metadata/md5-cache/sys-auth/icmpdn-0.4 b/metadata/md5-cache/sys-auth/icmpdn-0.4
index 9690dbbc0c31..48b1e5d71744 100644
--- a/metadata/md5-cache/sys-auth/icmpdn-0.4
+++ b/metadata/md5-cache/sys-auth/icmpdn-0.4
@@ -5,5 +5,5 @@ KEYWORDS=~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.dolda2000.com/~fredrik/icmp-dn/icmpdn-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d681e81a2e3ecccd9ebe254bbff5dc52
diff --git a/metadata/md5-cache/sys-auth/libyubikey-1.6 b/metadata/md5-cache/sys-auth/libyubikey-1.6
deleted file mode 100644
index 213150b3daa3..000000000000
--- a/metadata/md5-cache/sys-auth/libyubikey-1.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Yubico C low-level library
-EAPI=2
-HOMEPAGE=http://code.google.com/p/yubico-c/
-KEYWORDS=~amd64
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://yubico-c.googlecode.com/files/libyubikey-1.6.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6891faef11f1eb4ffede5d4e50edc13f
diff --git a/metadata/md5-cache/sys-auth/libyubikey-1.9 b/metadata/md5-cache/sys-auth/libyubikey-1.9
new file mode 100644
index 000000000000..bc12441a50c1
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/libyubikey-1.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install test
+DESCRIPTION=Yubico C low-level library
+EAPI=4
+HOMEPAGE=https://github.com/Yubico/yubico-c
+IUSE=static-libs
+KEYWORDS=~amd64
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://yubico-c.googlecode.com/files/libyubikey-1.9.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ed893cbd1cacdd1a4f2b39054f2c457e
diff --git a/metadata/md5-cache/sys-auth/pam-afs-session-1.3 b/metadata/md5-cache/sys-auth/pam-afs-session-1.3
index 1fb1d078d49d..7a64f211b0fe 100644
--- a/metadata/md5-cache/sys-auth/pam-afs-session-1.3
+++ b/metadata/md5-cache/sys-auth/pam-afs-session-1.3
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=virtual/krb5 virtual/pam
 SLOT=0
 SRC_URI=http://archives.eyrie.org/software/afs/pam-afs-session-1.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=417dd3b23a56228d71afcd0e2335b28c
diff --git a/metadata/md5-cache/sys-auth/pam-afs-session-1.5 b/metadata/md5-cache/sys-auth/pam-afs-session-1.5
index b91493f3755a..7151ca112c3a 100644
--- a/metadata/md5-cache/sys-auth/pam-afs-session-1.5
+++ b/metadata/md5-cache/sys-auth/pam-afs-session-1.5
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=virtual/krb5 virtual/pam
 SLOT=0
 SRC_URI=http://archives.eyrie.org/software/afs/pam-afs-session-1.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2d33ad9301ef74b3abaa4b75b43b2cee
diff --git a/metadata/md5-cache/sys-auth/pam-afs-session-1.6 b/metadata/md5-cache/sys-auth/pam-afs-session-1.6
index 11d20eee5215..8d2675813500 100644
--- a/metadata/md5-cache/sys-auth/pam-afs-session-1.6
+++ b/metadata/md5-cache/sys-auth/pam-afs-session-1.6
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=virtual/krb5 virtual/pam
 SLOT=0
 SRC_URI=http://archives.eyrie.org/software/afs/pam-afs-session-1.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82371b61034525d203e811fe084e6c16
diff --git a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3 b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3
index 8968a5430abe..caa847e1947f 100644
--- a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3
+++ b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam >=dev-db/postgresql-base-8.0 >=dev-libs/libgcrypt-1.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-pgsql/pam-pgsql-0.7.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9dfb6152646ad365102f84d6bd9dce3
diff --git a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.1 b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.1
index 1b73ddda5613..87da102ff3ec 100644
--- a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.1
+++ b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam >=dev-db/postgresql-base-8.0 >=dev-libs/libgcrypt-1.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-pgsql/pam-pgsql-0.7.3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270c3260f4d174e77759b0da7ae6b876
diff --git a/metadata/md5-cache/sys-auth/pam_abl-0.2.3-r1 b/metadata/md5-cache/sys-auth/pam_abl-0.2.3-r1
index 0ce8ade229f0..4c996961da66 100644
--- a/metadata/md5-cache/sys-auth/pam_abl-0.2.3-r1
+++ b/metadata/md5-cache/sys-auth/pam_abl-0.2.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/pam-0.78-r2 >=sys-libs/db-4.2.52_p2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-abl/pam_abl-0.2.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6779d0586eb84cc34eeeaa8333bada9d
diff --git a/metadata/md5-cache/sys-auth/pam_abl-0.4.1 b/metadata/md5-cache/sys-auth/pam_abl-0.4.1
index 84b039c209fb..f82de01f34fb 100644
--- a/metadata/md5-cache/sys-auth/pam_abl-0.4.1
+++ b/metadata/md5-cache/sys-auth/pam_abl-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.78-r2 >=sys-libs/db-4.2.52_p2
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-abl/pam-abl-0.4.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b916ba0637801ca4ab73901e27681392
diff --git a/metadata/md5-cache/sys-auth/pam_blue-0.9.0 b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
index eef8cfad2ac0..101fa8bfda87 100644
--- a/metadata/md5-cache/sys-auth/pam_blue-0.9.0
+++ b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam net-wireless/bluez
 SLOT=0
 SRC_URI=http://pam.0xdef.net/source/pam_blue-0.9.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62059b46b271ebc7f5285efa3925b429
diff --git a/metadata/md5-cache/sys-auth/pam_chroot-0.9.2 b/metadata/md5-cache/sys-auth/pam_chroot-0.9.2
index 0e8e7e5e11ce..b27555a2a83f 100644
--- a/metadata/md5-cache/sys-auth/pam_chroot-0.9.2
+++ b/metadata/md5-cache/sys-auth/pam_chroot-0.9.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam !<sys-libs/pam-0.99
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-chroot/pam_chroot-0.9.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edd25fa66457e007ce2e9eac42c5bca4
diff --git a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1 b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
index 73eb59bbab5a..f8e3898e61e1 100644
--- a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
+++ b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/pam_dotfile/pam_dotfile-0.7.tar.gz http://digilander.libero.it/dgp85/gentoo/pam_dotfile-patches-1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43b60577b4253887c9458ec9753f1637
diff --git a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1 b/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
index d6b63aeee253..d04c20d37fe9 100644
--- a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
+++ b/metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-auth/libfprint sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/fprint/pam_fprint-0.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21bedb42a0a78ed18e3d8a06883c3ce6
diff --git a/metadata/md5-cache/sys-auth/pam_keystore-0.1.3 b/metadata/md5-cache/sys-auth/pam_keystore-0.1.3
index e4178b34e3c7..d7ba907bc1ca 100644
--- a/metadata/md5-cache/sys-auth/pam_keystore-0.1.3
+++ b/metadata/md5-cache/sys-auth/pam_keystore-0.1.3
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/pam >=sys-apps/keyutils-1.1
 SLOT=0
 SRC_URI=ftp://ftp.calculate.ru/pub/calculate/pam_keystore/pam_keystore-0.1.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=565f225fdaf15cd57d0b50af5bb4f866
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-183 b/metadata/md5-cache/sys-auth/pam_ldap-183
index 33d39f00e2f3..ae5d6fa9cb32 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-183
+++ b/metadata/md5-cache/sys-auth/pam_ldap-183
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-183.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc2a5ab46f2a26596a0f1a81b44d1f7e
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-184 b/metadata/md5-cache/sys-auth/pam_ldap-184
index 6a5866a230ee..2f2bf9c3f14e 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-184
+++ b/metadata/md5-cache/sys-auth/pam_ldap-184
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-184.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a027266586160e25b5e16e6e905f2ea
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-186 b/metadata/md5-cache/sys-auth/pam_ldap-186
index 015c4cab36d8..5e53cde8ad37 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-186
+++ b/metadata/md5-cache/sys-auth/pam_ldap-186
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-186.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d851c662da5b2353dcf36e7ce7e0b2d
diff --git a/metadata/md5-cache/sys-auth/pam_mktemp-1.0.3 b/metadata/md5-cache/sys-auth/pam_mktemp-1.0.3
index dbfe7d4a2494..a70b7eb10698 100644
--- a/metadata/md5-cache/sys-auth/pam_mktemp-1.0.3
+++ b/metadata/md5-cache/sys-auth/pam_mktemp-1.0.3
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.0.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac12a9171cba81d01150e866c6d63574
diff --git a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1 b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
index 519439fb640c..6c544afede0e 100644
--- a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/pam selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31f77478ca6e14c0d61e654331bde14b
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r2 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r2
index 1badc67c66bf..b42cfba96cc2 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r2
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72 virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d3a40be121f5598267842d5a7a23d27
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
index 70874ee6e8c1..510f781991dd 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72 virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=27b794c1ea351d521ae8cfc7339a629a
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
index c3caf2e2cc25..22dca0540e3f 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72 virtual/mysql
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2bebadd1c8edbeb8e33f65af6b66843
diff --git a/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1 b/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
index d40abfaff25c..72643c3309a1 100644
--- a/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
+++ b/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/pam dev-libs/libp11 dev-libs/openssl
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/pam_p11/pam_p11-0.1.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1e10ec126fc50a53f36c87e50a8f2b8
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
index 70e1634e5b9e..94eb2d5c8066 100644
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
+++ b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
@@ -7,5 +7,5 @@ LICENSE=BSD as-is
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eeda91153d87e960ed060822fe0e9e4c
diff --git a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5 b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
index e0badd6c99ad..29140d43415c 100644
--- a/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
+++ b/metadata/md5-cache/sys-auth/pam_passwdqc-1.0.5
@@ -7,5 +7,5 @@ LICENSE=BSD as-is
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95185347a2a2071f7acf2666a9c55676
diff --git a/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.6 b/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.6
index 71c2f5671863..085b5b755e4d 100644
--- a/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.6
+++ b/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/pam curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) nss? ( dev-libs/nss curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,nss,-gnutls] ) ) ) !nss? ( dev-libs/openssl curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,-nss,-gnutls] ) ) ) pcsc-lite? ( sys-apps/pcsc-lite )
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/pam_pkcs11/pam_pkcs11-0.6.6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=720c36385e8aaf23acca2d2bbe9c0d4b
diff --git a/metadata/md5-cache/sys-auth/pam_radius-1.3.17 b/metadata/md5-cache/sys-auth/pam_radius-1.3.17
index ecb428516d0d..a322e6b5508b 100644
--- a/metadata/md5-cache/sys-auth/pam_radius-1.3.17
+++ b/metadata/md5-cache/sys-auth/pam_radius-1.3.17
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/pam
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/pam_radius-1.3.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bffb32c54ba531b5fb5b8666c9e06e70
diff --git a/metadata/md5-cache/sys-auth/pam_require-0.6 b/metadata/md5-cache/sys-auth/pam_require-0.6
index e4746073d43d..f99c7ae8c806 100644
--- a/metadata/md5-cache/sys-auth/pam_require-0.6
+++ b/metadata/md5-cache/sys-auth/pam_require-0.6
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.splitbrain.org/Programming/C/pam_require/pam_require-0.6.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38977e9ea27b7cc525ac9ed58be4e56c
diff --git a/metadata/md5-cache/sys-auth/pam_require-0.7 b/metadata/md5-cache/sys-auth/pam_require-0.7
index 663f3c87c64f..ccf8671e8e96 100644
--- a/metadata/md5-cache/sys-auth/pam_require-0.7
+++ b/metadata/md5-cache/sys-auth/pam_require-0.7
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=http://www.splitbrain.org/_media/projects/pamrequire/pam_require-0.7.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=643d7ee87f6fe93e827314f6e4b7587b
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
index 21b067dcfcd4..6c98b187b5c8 100644
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
+++ b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 SLOT=0
 SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-4.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=347b78a1557186aa8911736f3abad8c9
diff --git a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1 b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
index 6c0fe207b01a..6e020b937d46 100644
--- a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
+++ b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=mirror://samba/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f35adb9087a26e4fc11e4fa03537a3c
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
index 9b7ddaa96f2a..cdd5521b695f 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r1
@@ -8,5 +8,5 @@ LICENSE=BSD as-is
 RDEPEND=sys-libs/pam virtual/ssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2a0f9ab800e666627eedb8c3d677d85
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
index 699b06b44e84..e0e25940a997 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
@@ -8,5 +8,5 @@ LICENSE=BSD as-is
 RDEPEND=sys-libs/pam net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=869dc7fa5507a76952acc3d420a1a7da
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3 b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
index b4eeb8635fbc..54dc1df93260 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.97-r3
@@ -8,5 +8,5 @@ LICENSE=BSD as-is
 RDEPEND=sys-libs/pam net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e5ad1879f31bc0455a6398c8f57f1c1
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
index e21b71b66dc7..b6037e9ccbbd 100644
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
+++ b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
 SLOT=0
 SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.2/pam_ssh_agent_auth-0.9.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1e05fd613d052e69aa27afffa7689359
diff --git a/metadata/md5-cache/sys-auth/pam_usb-0.5.0 b/metadata/md5-cache/sys-auth/pam_usb-0.5.0
index 788c5c6fd9dd..0e0e12dc1e52 100644
--- a/metadata/md5-cache/sys-auth/pam_usb-0.5.0
+++ b/metadata/md5-cache/sys-auth/pam_usb-0.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 sys-apps/dbus virtual/pam dev-python/celementtree dev-python/dbus-python dev-python/pygobject:2 sys-apps/pmount sys-fs/udisks:0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/pamusb/pam_usb-0.5.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36a2fe996d4e1cb2e79350e143cf7384
diff --git a/metadata/md5-cache/sys-auth/polkit-0.104-r1 b/metadata/md5-cache/sys-auth/polkit-0.104-r1
index fd63f437f273..e315709622d9 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.104-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.104-r1
@@ -10,5 +10,5 @@ PDEPEND=!systemd? ( >=sys-auth/consolekit-0.4.5[policykit] ) pam? ( sys-auth/pam
 RDEPEND=>=dev-libs/glib-2.30 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://hal.freedesktop.org/releases/polkit-0.104.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14986878c66445b3178d6dc014b8c3f3
diff --git a/metadata/md5-cache/sys-auth/polkit-0.105 b/metadata/md5-cache/sys-auth/polkit-0.105
index d6b566779cfe..eac48bd9a0b8 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.105
+++ b/metadata/md5-cache/sys-auth/polkit-0.105
@@ -10,5 +10,5 @@ PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde?
 RDEPEND=>=dev-libs/glib-2.30 >=dev-libs/expat-2 introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.105.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4c91e63876bb34f8a7ff63d4314f67a
diff --git a/metadata/md5-cache/sys-auth/polkit-0.106-r2 b/metadata/md5-cache/sys-auth/polkit-0.106-r2
index be0ba3ad52bd..75c4560b06d8 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.106-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.106-r2
@@ -10,5 +10,5 @@ PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde?
 RDEPEND=>=dev-lang/spidermonkey-1.8.5 >=dev-libs/glib-2.32 >=dev-libs/expat-2 introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.106.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8803240e6cae806529a0172647c77be0
diff --git a/metadata/md5-cache/sys-auth/polkit-kde-0.95.1-r1 b/metadata/md5-cache/sys-auth/polkit-kde-0.95.1-r1
index 969b3e766d5d..88943d7c7269 100644
--- a/metadata/md5-cache/sys-auth/polkit-kde-0.95.1-r1
+++ b/metadata/md5-cache/sys-auth/polkit-kde-0.95.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-auth/polkit-qt-0.95.1 !>=sys-auth/polkit-qt-0.99 !sys-auth/polkit-kde-agent >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/apps/KDE4.x/admin/polkit-kde-1-0.95.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4f8e187473c6e54a9b79ec9a0f5671b6
diff --git a/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.0 b/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.0
index 41ed1fe542d4..b7357ebf0c73 100644
--- a/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.0
+++ b/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-auth/polkit-qt-0.98_pre !sys-auth/polkit-kde >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/apps/KDE4.x/admin/polkit-kde-agent-1-0.99.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e9b9497127bbbea8edcc732909418ba5
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.103.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.103.0
index f887ce73508f..2ff26a7f172f 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.103.0
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.103.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 >=sys-auth/polkit-0.103 x11-libs/qt-core[glib] x11-libs/qt-gui[dbus,glib]
 SLOT=0
 SRC_URI=mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.103.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82835b350925c22a1cdbc275d2eec8e0
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.99.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.99.0
index 4db8893eeb06..4b8ab30f4a54 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.99.0
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.99.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 >=sys-auth/polkit-0.99 x11-libs/qt-core[glib] x11-libs/qt-gui[dbus,glib] examples? ( !sys-auth/policykit-qt[examples] )
 SLOT=0
 SRC_URI=mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.99.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c53d2e888d7e008b48ba49445e87089
diff --git a/metadata/md5-cache/sys-auth/skey-1.1.5-r8 b/metadata/md5-cache/sys-auth/skey-1.1.5-r8
index f82cd19b40db..74bc92a95313 100644
--- a/metadata/md5-cache/sys-auth/skey-1.1.5-r8
+++ b/metadata/md5-cache/sys-auth/skey-1.1.5-r8
@@ -9,5 +9,5 @@ LICENSE=BSD MIT RSA-MD4 RSA-MD5 BEER-WARE
 RDEPEND=dev-lang/perl sys-libs/cracklib
 SLOT=0
 SRC_URI=mirror://gentoo/skey-1.1.5.tar.bz2 mirror://gentoo/skey-1.1.5-patches-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4c18596e8f177093d342f97c4cc1a7de
diff --git a/metadata/md5-cache/sys-auth/sssd-1.8.1-r1 b/metadata/md5-cache/sys-auth/sssd-1.8.1-r1
index f64520a0f275..ffca429721a1 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.8.1-r1
+++ b/metadata/md5-cache/sys-auth/sssd-1.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam dev-libs/popt dev-libs/glib:2 >=dev-libs/ding-libs-0.1.2 >=sys-libs/talloc-2.0 sys-libs/tdb sys-libs/tevent sys-libs/ldb >=net-nds/openldap-2.4.19 !!~net-nds/openldap-2.4.28 dev-libs/libpcre >=app-crypt/mit-krb5-1.9.1 sys-apps/keyutils >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 sec-policy/selinux-sssd ) net-dns/bind-tools dev-libs/cyrus-sasl sys-apps/dbus nls? ( >=sys-devel/gettext-0.17 ) virtual/libintl netlink? ( dev-libs/libnl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.8.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f35cf412cc344270b57c24308fd39c2
diff --git a/metadata/md5-cache/sys-auth/sssd-1.8.2 b/metadata/md5-cache/sys-auth/sssd-1.8.2
index 9c9cb4f54c21..d2b9bb3b02ad 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.8.2
+++ b/metadata/md5-cache/sys-auth/sssd-1.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam dev-libs/popt dev-libs/glib:2 >=dev-libs/ding-libs-0.1.2 >=sys-libs/talloc-2.0 sys-libs/tdb sys-libs/tevent sys-libs/ldb >=net-nds/openldap-2.4.19 !!~net-nds/openldap-2.4.28 dev-libs/libpcre >=app-crypt/mit-krb5-1.9.1 sys-apps/keyutils >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 sec-policy/selinux-sssd ) net-dns/bind-tools dev-libs/cyrus-sasl sys-apps/dbus nls? ( >=sys-devel/gettext-0.17 ) virtual/libintl netlink? ( dev-libs/libnl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.8.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b30ad4d5efde3ee89f9698266f2c6f5d
diff --git a/metadata/md5-cache/sys-auth/sssd-1.8.4 b/metadata/md5-cache/sys-auth/sssd-1.8.4
index a4cf1cd9bf68..2e6f8a2e135f 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.8.4
+++ b/metadata/md5-cache/sys-auth/sssd-1.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pam dev-libs/popt dev-libs/glib:2 >=dev-libs/ding-libs-0.1.2 >=sys-libs/talloc-2.0 sys-libs/tdb sys-libs/tevent sys-libs/ldb >=net-nds/openldap-2.4.19 !!~net-nds/openldap-2.4.28 dev-libs/libpcre >=app-crypt/mit-krb5-1.9.1 sys-apps/keyutils >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.0.94 >=sys-libs/libsemanage-2.0.45 sec-policy/selinux-sssd ) net-dns/bind-tools dev-libs/cyrus-sasl sys-apps/dbus nls? ( >=sys-devel/gettext-0.17 ) virtual/libintl netlink? ( dev-libs/libnl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.8.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9be74fcb66169c49c113a4da67d43d3e
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index 4c8594097689..ca6abcf8fea3 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6091a08605e206d5193c9b4d9332f42d
diff --git a/metadata/md5-cache/sys-auth/ykclient-2.3 b/metadata/md5-cache/sys-auth/ykclient-2.3
deleted file mode 100644
index 581307883a03..000000000000
--- a/metadata/md5-cache/sys-auth/ykclient-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=net-misc/curl-7.21.1 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Yubico C client library
-EAPI=2
-HOMEPAGE=http://code.google.com/p/yubico-c-client/
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=net-misc/curl-7.21.1
-RESTRICT=test
-SLOT=0
-SRC_URI=http://yubico-c-client.googlecode.com/files/ykclient-2.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ade9dadda5c02dd6ce1ce977f24da48
diff --git a/metadata/md5-cache/sys-auth/ykclient-2.8 b/metadata/md5-cache/sys-auth/ykclient-2.8
new file mode 100644
index 000000000000..4a3977d18b35
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ykclient-2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=net-misc/curl-7.21.1
+DESCRIPTION=Yubico C client library
+EAPI=4
+HOMEPAGE=https://github.com/Yubico/yubico-c-client
+IUSE=static-libs
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=net-misc/curl-7.21.1
+RESTRICT=test
+SLOT=0
+SRC_URI=http://yubico-c-client.googlecode.com/files/ykclient-2.8.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=68ef6ee3a413e1823bed2f2402673f2b
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.3.4 b/metadata/md5-cache/sys-auth/ykpers-1.3.4
deleted file mode 100644
index da0beb2b5006..000000000000
--- a/metadata/md5-cache/sys-auth/ykpers-1.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Library and tool for personalization of Yubico's YubiKey
-EAPI=2
-HOMEPAGE=http://code.google.com/p/yubikey-personalization
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1
-SLOT=0
-SRC_URI=http://yubikey-personalization.googlecode.com/files/ykpers-1.3.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c19ce8fe560278f2f40a29d465e9f69a
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.7.0 b/metadata/md5-cache/sys-auth/ykpers-1.7.0
new file mode 100644
index 000000000000..9f0b21cc523a
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ykpers-1.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 virtual/pkgconfig
+DESCRIPTION=Library and tool for personalization of Yubico's YubiKey
+EAPI=4
+HOMEPAGE=https://github.com/Yubico/yubikey-personalization
+IUSE=static-libs
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1
+SLOT=0
+SRC_URI=http://yubikey-personalization.googlecode.com/files/ykpers-1.7.0.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b11f7a4cabf85f8b709b476c4e8030b4
diff --git a/metadata/md5-cache/sys-block/btrace-0.0.20071210202527 b/metadata/md5-cache/sys-block/btrace-0.0.20071210202527
index a1c23112c584..abbff72dd90e 100644
--- a/metadata/md5-cache/sys-block/btrace-0.0.20071210202527
+++ b/metadata/md5-cache/sys-block/btrace-0.0.20071210202527
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-git-20071210202527.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25ff5df47c8af816e9f44b63a535cf7d
diff --git a/metadata/md5-cache/sys-block/btrace-1.0.0 b/metadata/md5-cache/sys-block/btrace-1.0.0
index 444352015d75..9b625ee75239 100644
--- a/metadata/md5-cache/sys-block/btrace-1.0.0
+++ b/metadata/md5-cache/sys-block/btrace-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3401e1fa00adff1bd3a8b4d90ef1967
diff --git a/metadata/md5-cache/sys-block/btrace-1.0.1 b/metadata/md5-cache/sys-block/btrace-1.0.1
index 6f8d92c7f729..9bb5e74e2073 100644
--- a/metadata/md5-cache/sys-block/btrace-1.0.1
+++ b/metadata/md5-cache/sys-block/btrace-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ee2770d59412312735e94011973cf68
diff --git a/metadata/md5-cache/sys-block/btrace-1.0.1-r1 b/metadata/md5-cache/sys-block/btrace-1.0.1-r1
index e192e7e0194a..c94490b5d9d3 100644
--- a/metadata/md5-cache/sys-block/btrace-1.0.1-r1
+++ b/metadata/md5-cache/sys-block/btrace-1.0.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f36f9ecc32957357989501af64fbcbb9
diff --git a/metadata/md5-cache/sys-block/btrace-1.0.3 b/metadata/md5-cache/sys-block/btrace-1.0.3
index 68aba1d3e223..6b1df15e21cb 100644
--- a/metadata/md5-cache/sys-block/btrace-1.0.3
+++ b/metadata/md5-cache/sys-block/btrace-1.0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b999279041c18c62c5d03801b31e824c
diff --git a/metadata/md5-cache/sys-block/buffer-1.19-r2 b/metadata/md5-cache/sys-block/buffer-1.19-r2
index f3dea5a61e06..d5bcd11a27e2 100644
--- a/metadata/md5-cache/sys-block/buffer-1.19-r2
+++ b/metadata/md5-cache/sys-block/buffer-1.19-r2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/buffer-1.19.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8fdd4eeb30cf64bf3dd564ca497a0e8e
diff --git a/metadata/md5-cache/sys-block/fio-1.17 b/metadata/md5-cache/sys-block/fio-1.17
index ecb8c613274d..8e3e33cfb465 100644
--- a/metadata/md5-cache/sys-block/fio-1.17
+++ b/metadata/md5-cache/sys-block/fio-1.17
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b5b8bbbc17cd3322e58e30ba53608c07
diff --git a/metadata/md5-cache/sys-block/fio-1.17.2 b/metadata/md5-cache/sys-block/fio-1.17.2
index e6fbeba2d711..533f1f2638b5 100644
--- a/metadata/md5-cache/sys-block/fio-1.17.2
+++ b/metadata/md5-cache/sys-block/fio-1.17.2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.17.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9d9e465934365bcb7395b31a66ea0fd
diff --git a/metadata/md5-cache/sys-block/fio-1.18.1 b/metadata/md5-cache/sys-block/fio-1.18.1
index 0d0262abfb29..1247d96913af 100644
--- a/metadata/md5-cache/sys-block/fio-1.18.1
+++ b/metadata/md5-cache/sys-block/fio-1.18.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.18.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b253b2931e83a9dc20058b0f93019141
diff --git a/metadata/md5-cache/sys-block/fio-1.20 b/metadata/md5-cache/sys-block/fio-1.20
index 1010f370ff2c..e0f74ca2b9e4 100644
--- a/metadata/md5-cache/sys-block/fio-1.20
+++ b/metadata/md5-cache/sys-block/fio-1.20
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.20.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=82beb187304af5d031b13fd070345f45
diff --git a/metadata/md5-cache/sys-block/fio-1.21 b/metadata/md5-cache/sys-block/fio-1.21
index a1d49f51900e..c0136faf6ac5 100644
--- a/metadata/md5-cache/sys-block/fio-1.21
+++ b/metadata/md5-cache/sys-block/fio-1.21
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.21.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24f7be9f158cb13c774a48a3e42b9e9e
diff --git a/metadata/md5-cache/sys-block/fio-1.21_rc3 b/metadata/md5-cache/sys-block/fio-1.21_rc3
index 8dc80d0874e1..40974f53a0be 100644
--- a/metadata/md5-cache/sys-block/fio-1.21_rc3
+++ b/metadata/md5-cache/sys-block/fio-1.21_rc3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.21-rc3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62361c77cd9a784565d98a016650561b
diff --git a/metadata/md5-cache/sys-block/fio-1.22 b/metadata/md5-cache/sys-block/fio-1.22
index 5bc7743cf8cb..0cf7e1b53e41 100644
--- a/metadata/md5-cache/sys-block/fio-1.22
+++ b/metadata/md5-cache/sys-block/fio-1.22
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=910541d13758cf5a762a6a33039d77dc
diff --git a/metadata/md5-cache/sys-block/fio-1.23 b/metadata/md5-cache/sys-block/fio-1.23
index 741f51ca576d..77de9bc0d67a 100644
--- a/metadata/md5-cache/sys-block/fio-1.23
+++ b/metadata/md5-cache/sys-block/fio-1.23
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.23.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e71cfa094e6eaa9ac29e2b1d8c30375
diff --git a/metadata/md5-cache/sys-block/fio-1.25.1 b/metadata/md5-cache/sys-block/fio-1.25.1
index c23248c164ed..bacebaa676a8 100644
--- a/metadata/md5-cache/sys-block/fio-1.25.1
+++ b/metadata/md5-cache/sys-block/fio-1.25.1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.25.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=79cbca6d1e52026cce4f454acc1f9134
diff --git a/metadata/md5-cache/sys-block/fio-1.34 b/metadata/md5-cache/sys-block/fio-1.34
index 984a1eb916da..5009c9491514 100644
--- a/metadata/md5-cache/sys-block/fio-1.34
+++ b/metadata/md5-cache/sys-block/fio-1.34
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.34.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=475a35e8881597a421f39acae8e2fb6c
diff --git a/metadata/md5-cache/sys-block/fio-1.50_rc4 b/metadata/md5-cache/sys-block/fio-1.50_rc4
index 63c9e2d946c9..cd6cf0f095ec 100644
--- a/metadata/md5-cache/sys-block/fio-1.50_rc4
+++ b/metadata/md5-cache/sys-block/fio-1.50_rc4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.50-rc4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cc003d07d0ac4582fde8eef50e199e1
diff --git a/metadata/md5-cache/sys-block/fio-1.58 b/metadata/md5-cache/sys-block/fio-1.58
index 6055cdcb560c..bcf58146cd31 100644
--- a/metadata/md5-cache/sys-block/fio-1.58
+++ b/metadata/md5-cache/sys-block/fio-1.58
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.58.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1175cfa1c68429ccdd8bc99d0a90c69
diff --git a/metadata/md5-cache/sys-block/fio-1.99.10 b/metadata/md5-cache/sys-block/fio-1.99.10
index 8c26be88c409..32fd6f834cbc 100644
--- a/metadata/md5-cache/sys-block/fio-1.99.10
+++ b/metadata/md5-cache/sys-block/fio-1.99.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-1.99.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16a7023a1012f60a2485d032045832d1
diff --git a/metadata/md5-cache/sys-block/fio-2.0.3 b/metadata/md5-cache/sys-block/fio-2.0.3
index 2682183ec2e9..c9c686ff7c96 100644
--- a/metadata/md5-cache/sys-block/fio-2.0.3
+++ b/metadata/md5-cache/sys-block/fio-2.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78ad962274edd2036b823f8f6be95100
diff --git a/metadata/md5-cache/sys-block/iscsitarget-0.4.17 b/metadata/md5-cache/sys-block/iscsitarget-0.4.17
index 8eee6390bb21..a95dc408ac4a 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-0.4.17
+++ b/metadata/md5-cache/sys-block/iscsitarget-0.4.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-0.4.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16155bbd8b07d20d772922542b751726
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.19 b/metadata/md5-cache/sys-block/iscsitarget-1.4.19
index cae28586c953..4779c3b89711 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.19
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-1.4.19.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47a113c6353d7e8c59ae9f4d0700afe2
diff --git a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2 b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
index 7882f627cead..cc75e394cf44 100644
--- a/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
+++ b/metadata/md5-cache/sys-block/iscsitarget-1.4.20.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/iscsitarget/iscsitarget-1.4.20.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6e1b7477bd6f837ac654a2a08c9f0b4
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.870.3-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.870.3-r1
index f72f525e28cf..a74881116181 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.870.3-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.870.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/linux-sources virtual/modutils sys-apps/util-linux kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-870.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c96267e889b6de175eff39be0bd86d94
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.871 b/metadata/md5-cache/sys-block/open-iscsi-2.0.871
index 5a74f23e71ba..3eb3dc890b7e 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.871
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.871
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/linux-sources sys-apps/util-linux kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-871.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d65c0293e273b7d207780b33361888b
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.871-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.871-r1
index 5dea1c6f73f3..cddd71485d38 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.871-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.871-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-871.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d61a0a56ee85740d22c5e41fc559f5ac
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.871.3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.871.3
index d66f5f021e51..56d9ea22bd83 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.871.3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.871.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-2.0.871.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=39c9737f609f4526e4f8562d723237d4
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872
index 51e93ebdbbf4..33e4140efc93 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b46a65099f4082d5a986e90f7f069ea
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r1
index af422f2518e3..c894c0a3af78 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7dd99c5f7fd0baee6f9b07ea08ca1f4
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.8 b/metadata/md5-cache/sys-block/partimage-0.6.8
index 0bf68dd16031..c67fabc73753 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.8
+++ b/metadata/md5-cache/sys-block/partimage-0.6.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05b74de05dc529453ef23440591b2452
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9 b/metadata/md5-cache/sys-block/partimage-0.6.9
index e891de7306bd..4611571edb44 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5cdbdf8ea47a7c37ef0039d80ccdbd03
diff --git a/metadata/md5-cache/sys-block/partitionmanager-1.0.3_p20110912 b/metadata/md5-cache/sys-block/partitionmanager-1.0.3_p20110912
index 5c4d76b54618..6972d822ff6a 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-1.0.3_p20110912
+++ b/metadata/md5-cache/sys-block/partitionmanager-1.0.3_p20110912
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libatasmart >=sys-block/parted-3 sys-apps/util-linux >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://gentoo/partitionmanager-1.0.3_p20110912.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=cca82773be8723e65d0c50aa15b8710f
diff --git a/metadata/md5-cache/sys-block/scsiadd-1.95 b/metadata/md5-cache/sys-block/scsiadd-1.95
index c366781341b8..f95d12232b31 100644
--- a/metadata/md5-cache/sys-block/scsiadd-1.95
+++ b/metadata/md5-cache/sys-block/scsiadd-1.95
@@ -6,5 +6,5 @@ KEYWORDS=~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://llg.cubic.org/tools/scsiadd-1.95.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=704ac66f5cf4e45ee1124c7084c10947
diff --git a/metadata/md5-cache/sys-block/scsiadd-1.97 b/metadata/md5-cache/sys-block/scsiadd-1.97
index f41f69f8522f..72506981b6cf 100644
--- a/metadata/md5-cache/sys-block/scsiadd-1.97
+++ b/metadata/md5-cache/sys-block/scsiadd-1.97
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://llg.cubic.org/tools/scsiadd-1.97.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ae47485af95643522391c2c91a4a566
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.19 b/metadata/md5-cache/sys-block/tgt-1.0.19
index 13862f1275a3..36c769a9571d 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.19
+++ b/metadata/md5-cache/sys-block/tgt-1.0.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/config-general infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) sys-apps/sg3_utils
 SLOT=0
 SRC_URI=http://stgt.sourceforge.net/releases/tgt-1.0.19.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01b3628cf045f0021d98c445ebabf067
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.22 b/metadata/md5-cache/sys-block/tgt-1.0.22
index 3d2223443aa9..1791f31a7399 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.22
+++ b/metadata/md5-cache/sys-block/tgt-1.0.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/config-general dev-libs/libxslt infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.22 -> tgt-1.0.22.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24cb7fb94bf8f30ab8b604bac7edba2c
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.24-r1 b/metadata/md5-cache/sys-block/tgt-1.0.24-r1
index a1aef20f6240..45d7311e2a13 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.24-r1
+++ b/metadata/md5-cache/sys-block/tgt-1.0.24-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/config-general dev-libs/libxslt infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) app-text/docbook-xsl-stylesheets sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.24 -> tgt-1.0.24.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7888ef124c757c2fea98d4a679e39423
diff --git a/metadata/md5-cache/sys-boot/cromwell-2.40-r3 b/metadata/md5-cache/sys-boot/cromwell-2.40-r3
index 5a67eea26945..89028ef39079 100644
--- a/metadata/md5-cache/sys-boot/cromwell-2.40-r3
+++ b/metadata/md5-cache/sys-boot/cromwell-2.40-r3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/cromwell-2.40.tar.bz2 mirror://gentoo/cromwell-2.40-r3-cvs-fixes.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6599e8f7c193be1cd3395d492c53e9dc
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-0.5.4 b/metadata/md5-cache/sys-boot/efibootmgr-0.5.4
index e981e0d76aa6..17f71c5f02e9 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-0.5.4
+++ b/metadata/md5-cache/sys-boot/efibootmgr-0.5.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0
 SRC_URI=http://linux.dell.com/efibootmgr/efibootmgr-0.5.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71ba0e421e58f7e5e6ecc99bc55777ef
diff --git a/metadata/md5-cache/sys-boot/grub-0.92-r1 b/metadata/md5-cache/sys-boot/grub-0.92-r1
index 0653fb9feb1a..c11830e0a707 100644
--- a/metadata/md5-cache/sys-boot/grub-0.92-r1
+++ b/metadata/md5-cache/sys-boot/grub-0.92-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gnu-alpha/grub/grub-0.92.tar.gz http://dev.gentoo.org/~seemant/distfiles/grub-0.92-gentoo-0.2.tar.bz2 http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.92-gentoo-0.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36d28e5322a167cdb702cd5403be39b1
diff --git a/metadata/md5-cache/sys-boot/grub-0.94-r1 b/metadata/md5-cache/sys-boot/grub-0.94-r1
index 705eb5f896f2..dfcb2c9de0fa 100644
--- a/metadata/md5-cache/sys-boot/grub-0.94-r1
+++ b/metadata/md5-cache/sys-boot/grub-0.94-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gnu-alpha/grub/grub-0.94.tar.gz http://dev.gentoo.org/~seemant/distfiles/grub-0.94-gentoo-0.1.tar.bz2 http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.94-gentoo-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d53ebb7a092934664783537bcc06e02
diff --git a/metadata/md5-cache/sys-boot/grub-0.96-r1 b/metadata/md5-cache/sys-boot/grub-0.96-r1
index 56b7724ad4b6..45e2c9725003 100644
--- a/metadata/md5-cache/sys-boot/grub-0.96-r1
+++ b/metadata/md5-cache/sys-boot/grub-0.96-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.96.tar.gz mirror://gnu-alpha/grub/grub-0.96.tar.gz http://dev.gentoo.org/~seemant/distfiles/grub-0.96-r1-gentoo-0.1.tar.bz2 http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.96-r1-gentoo-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c34d2d64f278772463a01d22d547709
diff --git a/metadata/md5-cache/sys-boot/grub-0.96-r2 b/metadata/md5-cache/sys-boot/grub-0.96-r2
index 48d284a5e531..d9979947982f 100644
--- a/metadata/md5-cache/sys-boot/grub-0.96-r2
+++ b/metadata/md5-cache/sys-boot/grub-0.96-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.96.tar.gz mirror://gnu-alpha/grub/grub-0.96.tar.gz http://dev.gentoo.org/~seemant/distfiles/grub-0.96-r2-gentoo-0.1.tar.bz2 http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.96-r2-gentoo-0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03d37516cc4b78c9e06a7d2862cab64e
diff --git a/metadata/md5-cache/sys-boot/grub-0.96-r3 b/metadata/md5-cache/sys-boot/grub-0.96-r3
index 5ae3c121625f..a0f08ef9eebe 100644
--- a/metadata/md5-cache/sys-boot/grub-0.96-r3
+++ b/metadata/md5-cache/sys-boot/grub-0.96-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.96.tar.gz mirror://gnu-alpha/grub/grub-0.96.tar.gz http://dev.gentoo.org/~seemant/distfiles/grub-0.96-patches-1.0.tar.bz2 http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.96-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83e86277a800accf2e30f94b06c20ef6
diff --git a/metadata/md5-cache/sys-boot/grub-0.97 b/metadata/md5-cache/sys-boot/grub-0.97
index 8904257f4ec8..662fa25d0d93 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97
+++ b/metadata/md5-cache/sys-boot/grub-0.97
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd5cbca85658da18986fc6a4b1578827
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r10 b/metadata/md5-cache/sys-boot/grub-0.97-r10
index 3bd3b449a15b..136177371440 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r10
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.12.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8da2c3dbab83d5a5f6afee0a111c1685
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r11 b/metadata/md5-cache/sys-boot/grub-0.97-r11
index 13dc7176c3f9..3df2d9b292e1 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r11
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4ae0644d8eccf0754eed45857a3d39c9
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r12 b/metadata/md5-cache/sys-boot/grub-0.97-r12
index fc4df3699f81..261d69db4580 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r12
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57599b755cc3cdc5f85ad87939fd9e77
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r2 b/metadata/md5-cache/sys-boot/grub-0.97-r2
index 678278f3e1d4..0baff8e5e261 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r2
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ac967dd75c899f303a49df4ba6bee38
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r3 b/metadata/md5-cache/sys-boot/grub-0.97-r3
index a212e3c5af18..f10ebd5ef982 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r3
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a02018573ddabda616c1345b4886ef3b
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r4 b/metadata/md5-cache/sys-boot/grub-0.97-r4
index 55e27816c87f..721d2ab09157 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r4
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81c022c52b4d5d7b0869076783de4e9d
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r5 b/metadata/md5-cache/sys-boot/grub-0.97-r5
index c274ed5378bb..bbf4d26a12b3 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r5
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a54ad3b12f9932026a60c3642901b6dc
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r6 b/metadata/md5-cache/sys-boot/grub-0.97-r6
index 267ba261d200..e9901a3d6d65 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r6
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89e6b111193d26fb312a13700917b8c9
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r8 b/metadata/md5-cache/sys-boot/grub-0.97-r8
index 58a6e78efdc4..85e7e99d9e88 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r8
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c41896252ba602903bab0923f38740c
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r9 b/metadata/md5-cache/sys-boot/grub-0.97-r9
index e617f47d8b72..c7767f8adf6f 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r9
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3e04b4392b0eabe876c8e31ca498cd1
diff --git a/metadata/md5-cache/sys-boot/grub-1.99-r2 b/metadata/md5-cache/sys-boot/grub-1.99-r2
index e84dd7240642..6c209dd8e2d8 100644
--- a/metadata/md5-cache/sys-boot/grub-1.99-r2
+++ b/metadata/md5-cache/sys-boot/grub-1.99-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 SLOT=2
 SRC_URI=mirror://gnu/grub/grub-1.99.tar.xz mirror://gentoo/grub-1.99.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3ef3ecfc376459a3d56031b7f44a1a57
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta0 b/metadata/md5-cache/sys-boot/grub-2.00_beta0
index cb46db5b98fc..cebf9e78d4ad 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta0
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta0.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=117ea50837b0eadb84f17d21d2f7832f
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta1 b/metadata/md5-cache/sys-boot/grub-2.00_beta1
index e261371a25ad..d52fbb2f8143 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta1
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08bdeadf3474c09091b24fb36b6b61f9
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta2 b/metadata/md5-cache/sys-boot/grub-2.00_beta2
index 8611a9d105a7..3b868ee71c29 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta2
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eeb2b8d8a9214e43e09969c75c1d9743
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta2-r1 b/metadata/md5-cache/sys-boot/grub-2.00_beta2-r1
index 0981253a1109..fa73d90d3154 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta2-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16f5e0cf7c46c8efc22057df92d5264d
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta3 b/metadata/md5-cache/sys-boot/grub-2.00_beta3
index 65081c26dd27..f26bfbe9ff6d 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta3
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7e88688da0fec6482deba3358c63ea3
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta3-r2 b/metadata/md5-cache/sys-boot/grub-2.00_beta3-r2
index be75b7b951c7..b4e62b7ae474 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta3-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7685d545b404fa5a3011ff39771520ed
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta5 b/metadata/md5-cache/sys-boot/grub-2.00_beta5
index 3ea704539604..8e6008a5cbbd 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta5
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/lzo >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta5.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=85ad301029c12ff8af5b6057f4f53e46
diff --git a/metadata/md5-cache/sys-boot/grub-2.00_beta6 b/metadata/md5-cache/sys-boot/grub-2.00_beta6
index fc589ce161ab..cec5aa7db846 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00_beta6
+++ b/metadata/md5-cache/sys-boot/grub-2.00_beta6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/lzo >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
 SRC_URI=mirror://gnu-alpha/grub/grub-2.00~beta6.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c1f36a7fc2603190b012d6e1fd37c9af
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 5562de8624e0..5caa62739e65 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -7,5 +7,5 @@ IUSE=custom-cflags debug device-mapper efiemu mount nls static sdl truetype libz
 LICENSE=GPL-3
 RDEPEND=dev-libs/lzo >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 SLOT=2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bzr	ec4306b727be7630f6d5abaf08c8b818	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	bzr	ec4306b727be7630f6d5abaf08c8b818	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a83d399df533d99b2d08df72a6bfa75f
diff --git a/metadata/md5-cache/sys-boot/lilo-22.8-r2 b/metadata/md5-cache/sys-boot/lilo-22.8-r2
index 16ccc2aa5089..4ca270e6ee99 100644
--- a/metadata/md5-cache/sys-boot/lilo-22.8-r2
+++ b/metadata/md5-cache/sys-boot/lilo-22.8-r2
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 RDEPEND=device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )
 SLOT=0
 SRC_URI=http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-22.8.src.tar.gz ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-22.8.src.tar.gz ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/lilo-22.8.src.tar.gz mirror://gentoo/dolilo-0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22f55898b8de266cadda95e144d9be7d
diff --git a/metadata/md5-cache/sys-boot/lilo-23.2-r1 b/metadata/md5-cache/sys-boot/lilo-23.2-r1
index 44bbb2b7d8b3..5905d3acad67 100644
--- a/metadata/md5-cache/sys-boot/lilo-23.2-r1
+++ b/metadata/md5-cache/sys-boot/lilo-23.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )
 SLOT=0
 SRC_URI=http://lilo.alioth.debian.org/ftp/sources/lilo-23.2.tar.gz mirror://gentoo/dolilo-0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d5cceba6aba6c54cef7961da12f2f18
diff --git a/metadata/md5-cache/sys-boot/lilo-23.2-r2 b/metadata/md5-cache/sys-boot/lilo-23.2-r2
index 187a72fe1f90..6aaa99ba001f 100644
--- a/metadata/md5-cache/sys-boot/lilo-23.2-r2
+++ b/metadata/md5-cache/sys-boot/lilo-23.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.02.12 ) )
 SLOT=0
 SRC_URI=http://lilo.alioth.debian.org/ftp/sources/lilo-23.2.tar.gz mirror://gentoo/dolilo-0.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa8afaf0f0dec7698c19cac3ccde6f40
diff --git a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1 b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1
index 277dce190ef9..9fd10679fab3 100644
--- a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1
+++ b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1
@@ -5,5 +5,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://aybabtu.com/mbr-gpt/mbr-gpt_0.0.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aff5bd9c520751659203405418049558
diff --git a/metadata/md5-cache/sys-boot/milo-2.4.18 b/metadata/md5-cache/sys-boot/milo-2.4.18
index 587cf3f47d58..88a56244f91e 100644
--- a/metadata/md5-cache/sys-boot/milo-2.4.18
+++ b/metadata/md5-cache/sys-boot/milo-2.4.18
@@ -7,5 +7,5 @@ LICENSE=MILO
 RDEPEND=sys-fs/mtools
 SLOT=0
 SRC_URI=http://www.suse.de/~stepan/source/milo-2.2-18.tar.bz2 mirror://kernel/linux/kernel/v2.2/linux-2.2.25.tar.bz2 http://dev.gentoo.org/~taviso/milo/ldmilo-patched-20010430 http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2 http://dev.gentoo.org/~taviso/milo/linload.exe http://www.ibiblio.org/pub/Linux/docs/HOWTO/MILO-HOWTO
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38de96fcb68e3cc77401c49ff25f8e2e
diff --git a/metadata/md5-cache/sys-boot/palo-1.18-r1 b/metadata/md5-cache/sys-boot/palo-1.18-r1
index f21b4b57cf72..ce96090c5c30 100644
--- a/metadata/md5-cache/sys-boot/palo-1.18-r1
+++ b/metadata/md5-cache/sys-boot/palo-1.18-r1
@@ -6,5 +6,5 @@ KEYWORDS=-* hppa
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/palo/palo_1.18.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e62f852ab67eba29924b5fcd47fbed1
diff --git a/metadata/md5-cache/sys-boot/silo-1.4.14_p20100228 b/metadata/md5-cache/sys-boot/silo-1.4.14_p20100228
index cde77c1ca747..4f290c66535d 100644
--- a/metadata/md5-cache/sys-boot/silo-1.4.14_p20100228
+++ b/metadata/md5-cache/sys-boot/silo-1.4.14_p20100228
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/e2fsprogs sys-apps/sparc-utils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/silo/silo_1.4.14+git20100228.orig.tar.gz mirror://debian/pool/main/s/silo/silo_1.4.14+git20100228-1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=298d1e782105defd529086e6943156a2
diff --git a/metadata/md5-cache/sys-cluster/charm-5.9 b/metadata/md5-cache/sys-cluster/charm-5.9
index d9a469998ec9..e25541d706be 100644
--- a/metadata/md5-cache/sys-cluster/charm-5.9
+++ b/metadata/md5-cache/sys-cluster/charm-5.9
@@ -9,5 +9,5 @@ RDEPEND=doc? ( app-text/poppler dev-tex/latex2html virtual/latex-base dev-texliv
 RESTRICT=fetch
 SLOT=0
 SRC_URI=charm-5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b85da39de3d7f1a07f699714da84beb3
diff --git a/metadata/md5-cache/sys-cluster/charm-6.1.2-r2 b/metadata/md5-cache/sys-cluster/charm-6.1.2-r2
index 94faa3ff40cd..6e9c83badfd7 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.1.2-r2
+++ b/metadata/md5-cache/sys-cluster/charm-6.1.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=charm
 SLOT=0
 SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.1.2_src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=25de36b5299cf44942e3b9cb1caf5748
diff --git a/metadata/md5-cache/sys-cluster/charm-6.2.0 b/metadata/md5-cache/sys-cluster/charm-6.2.0
index 79cdb69129ab..097a6250e75f 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.2.0
+++ b/metadata/md5-cache/sys-cluster/charm-6.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=charm
 SLOT=0
 SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.2.0_src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45e15419ee0d5f3710825d758bcf34e8
diff --git a/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4 b/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
index ccac81735e37..a411efce6b94 100644
--- a/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
+++ b/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/feedbackd/feedbackd-agent-0.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd48650510e6c1f82b700e58b3633ac2
diff --git a/metadata/md5-cache/sys-cluster/gearmand-0.33 b/metadata/md5-cache/sys-cluster/gearmand-0.33
index 672fdb811e14..cb950a567592 100644
--- a/metadata/md5-cache/sys-cluster/gearmand-0.33
+++ b/metadata/md5-cache/sys-cluster/gearmand-0.33
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bb62a9808b23751c930eadae72f7360
diff --git a/metadata/md5-cache/sys-cluster/lam-mpi-7.1.4-r1 b/metadata/md5-cache/sys-cluster/lam-mpi-7.1.4-r1
index f9280eb05176..868373ba2316 100644
--- a/metadata/md5-cache/sys-cluster/lam-mpi-7.1.4-r1
+++ b/metadata/md5-cache/sys-cluster/lam-mpi-7.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=lam-mpi
 RDEPEND=fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) !sys-cluster/mpich !sys-cluster/openmpi !sys-cluster/mpich2 !app-misc/wipe crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=6
 SRC_URI=http://www.lam-mpi.org/download/files/lam-7.1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3e677ee9f8a4c416cd6159459a430bb
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.2 b/metadata/md5-cache/sys-cluster/openmpi-1.4.2
index 7fb042ca0dd6..f705f4c5b847 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) vt? ( !dev-libs
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f8193931f2876338b314871f0a467c9
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.3 b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
index 6f75b040e208..691559def0f0 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) vt? ( !dev-libs
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70b98c79f15915dae17290420342e503
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.4 b/metadata/md5-cache/sys-cluster/openmpi-1.4.4
index a8ff8bb039c7..71ac194eb7a7 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) vt? ( !dev-libs
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23694e11839f9311eee757406a139561
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.5.4-r3 b/metadata/md5-cache/sys-cluster/openmpi-1.5.4-r3
index 691072aafef3..9cd13ffbe7b3 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.5.4-r3
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.5.4-r3
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( dev-libs/libexecinfo ) fortran? ( virtual/fortran ) inf
 REQUIRED_USE=slurm? ( !pbs ) pbs? ( !slurm ) psm? ( infiniband )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/vopenmpi-1.5/downloads/openmpi-1.5.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b4a957637bd46e934db733be16fbe42
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.5.5 b/metadata/md5-cache/sys-cluster/openmpi-1.5.5
index 95234db6c7db..a7124bcd01bb 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.5.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/lam-mpi !sys-cluster/mpich2 !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98e697cc58fcb636510d91f04d2a169f
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.6-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.6-r1
index 912095e7cc91..d78808cdaa06 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.6-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/lam-mpi !sys-cluster/mpich2 !sys-cluster
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eaf4daaea5dcec24d93510d11177805e
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.0.10 b/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
index b41538e1d2e0..b5b653b53dfa 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-1.0.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee88c3257255019a61a246b7244265a7
diff --git a/metadata/md5-cache/sys-cluster/slurm-2.3.4 b/metadata/md5-cache/sys-cluster/slurm-2.3.4
index 4e241c48a325..c9d60d6cfbc4 100644
--- a/metadata/md5-cache/sys-cluster/slurm-2.3.4
+++ b/metadata/md5-cache/sys-cluster/slurm-2.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=torque? ( perl )
 RESTRICT=primaryuri
 SLOT=0
 SRC_URI=http://www.schedmd.com/download/latest/slurm-2.3.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d70c53aa1b4e8620016e2c64fc9f452f
diff --git a/metadata/md5-cache/sys-cluster/torque-2.3.13 b/metadata/md5-cache/sys-cluster/torque-2.3.13
index 2456adfc2a79..291b6aa45a2c 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.3.13
+++ b/metadata/md5-cache/sys-cluster/torque-2.3.13
@@ -9,5 +9,5 @@ LICENSE=openpbs
 RDEPEND=sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.3.13.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5bdbabf858e11cbde72c844e66cb95d
diff --git a/metadata/md5-cache/sys-cluster/torque-2.4.16 b/metadata/md5-cache/sys-cluster/torque-2.4.16
index 6f4d9f11d1d2..5e0a0599f11f 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.4.16
+++ b/metadata/md5-cache/sys-cluster/torque-2.4.16
@@ -9,5 +9,5 @@ LICENSE=openpbs
 RDEPEND=sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.4.16.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=928b37c534cc5ed4117b6e1516a8dc45
diff --git a/metadata/md5-cache/sys-cluster/torque-2.5.9 b/metadata/md5-cache/sys-cluster/torque-2.5.9
index e10ee931ff96..5d87736d559e 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.5.9
+++ b/metadata/md5-cache/sys-cluster/torque-2.5.9
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ddfe593cbcac549ed10c6b7323a067a
diff --git a/metadata/md5-cache/sys-cluster/torque-3.0.3 b/metadata/md5-cache/sys-cluster/torque-3.0.3
index 4d76ac270ae2..f0fd17d8bcd8 100644
--- a/metadata/md5-cache/sys-cluster/torque-3.0.3
+++ b/metadata/md5-cache/sys-cluster/torque-3.0.3
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9312472c7624a25e583976bc3e7dde02
diff --git a/metadata/md5-cache/sys-cluster/torque-3.0.4 b/metadata/md5-cache/sys-cluster/torque-3.0.4
index f088570eeede..e60cd638b61a 100644
--- a/metadata/md5-cache/sys-cluster/torque-3.0.4
+++ b/metadata/md5-cache/sys-cluster/torque-3.0.4
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.4.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ee86dfaad55cef5ec233c5ff8153a49
diff --git a/metadata/md5-cache/sys-cluster/torque-3.0.5 b/metadata/md5-cache/sys-cluster/torque-3.0.5
index caea568dd9ba..543a2450d90d 100644
--- a/metadata/md5-cache/sys-cluster/torque-3.0.5
+++ b/metadata/md5-cache/sys-cluster/torque-3.0.5
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.5.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79b0697bed83693146f847b28cc8e21c
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-7 b/metadata/md5-cache/sys-devel/automake-wrapper-7
index 9b0d0e35e10d..5b308f9385a3 100644
--- a/metadata/md5-cache/sys-devel/automake-wrapper-7
+++ b/metadata/md5-cache/sys-devel/automake-wrapper-7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=wrapper for automake to manage multiple automake versions
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-_md5_=0ffd0ad5f3b3293ceb67587a10c5e71c
+_md5_=555c1633293718f62ca75dd4d3b71dbf
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95 b/metadata/md5-cache/sys-devel/bc-1.06.95
index caac3a6f13b4..3d6e36ffb3b8 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e81231e2a0f5d0bfa53491e29db93d7
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r1 b/metadata/md5-cache/sys-devel/bc-1.06.95-r1
index 9a952a575731..9f167e224349 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r1
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a95d57218fdd77205d70bf6eb307536a
diff --git a/metadata/md5-cache/sys-devel/binutils-2.16.1-r3 b/metadata/md5-cache/sys-devel/binutils-2.16.1-r3
index 62fde1cc24f8..4a1dc773ca6a 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.16.1-r3
+++ b/metadata/md5-cache/sys-devel/binutils-2.16.1-r3
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-devel/binutils-config-1.9
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.16.1.tar.bz2 mirror://gentoo/binutils-2.16.1-patches-1.11.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.16.1-patches-1.11.tar.bz2 mirror://gentoo/binutils-2.16.1-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.16.1-uclibc-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ecf9764d2ea5a295976c3f2cade21e25
diff --git a/metadata/md5-cache/sys-devel/binutils-2.16.91.0.6 b/metadata/md5-cache/sys-devel/binutils-2.16.91.0.6
index 06f63abc07d2..3387bbe5e4ae 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.16.91.0.6
+++ b/metadata/md5-cache/sys-devel/binutils-2.16.91.0.6
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-devel/binutils-config-1.9
 SLOT=0
 SRC_URI=mirror://kernel/linux/devel/binutils/binutils-2.16.91.0.6.tar.bz2 mirror://gentoo/binutils-2.16.91.0.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.16.91.0.6-patches-1.0.tar.bz2 mirror://gentoo/binutils-2.16.91.0.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.16.91.0.6-uclibc-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d8553254b8eb0ec70deb6117a3215f7
diff --git a/metadata/md5-cache/sys-devel/binutils-2.18-r3 b/metadata/md5-cache/sys-devel/binutils-2.18-r3
index 3304f0ef50c8..db91df0debc1 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.18-r3
+++ b/metadata/md5-cache/sys-devel/binutils-2.18-r3
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.18.tar.bz2 mirror://gentoo/binutils-2.18-patches-1.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.18-patches-1.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2b5fa7b7280c94188aa060d2549f8aa4
diff --git a/metadata/md5-cache/sys-devel/binutils-2.18-r4 b/metadata/md5-cache/sys-devel/binutils-2.18-r4
index d38458d220cb..fc8a281e27dc 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.18-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.18-r4
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.18.tar.bz2 mirror://gentoo/binutils-2.18-patches-1.10.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.18-patches-1.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9187a2df4a139c3d1bc49d81134f1072
diff --git a/metadata/md5-cache/sys-devel/binutils-2.19.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.19.1-r1
index ca41382f1705..b277c062e859 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.19.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.19.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.19.1.tar.bz2 mirror://gentoo/binutils-2.19.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.19.1-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=662332adf0a8bdf9638069c79ea54204
diff --git a/metadata/md5-cache/sys-devel/binutils-2.20.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.20.1-r1
index ba341bab2856..09d8a6fca305 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.20.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.20.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.20.1.tar.bz2 mirror://gentoo/binutils-2.20.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.20.1-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=294b620a3e65985d937c921a0285db33
diff --git a/metadata/md5-cache/sys-devel/binutils-2.21.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.21.1-r1
index f7e731cb2901..e5eefd856c57 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.21.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.21.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.21.1.tar.bz2 mirror://gentoo/binutils-2.21.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.21.1-patches-1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1191966ed906c5106aafaf153659026e
diff --git a/metadata/md5-cache/sys-devel/binutils-2.22-r1 b/metadata/md5-cache/sys-devel/binutils-2.22-r1
index b6a93d8ee0ad..05c6c561c0df 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.22-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.22-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.22.tar.bz2 mirror://gentoo/binutils-2.22-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22-patches-1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=34ebc231979520412faddc66db2793d2
diff --git a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.1 b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.1
index a80d920917ac..2c6b5b75d6a4 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.1
@@ -7,5 +7,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/devel/binutils/binutils-2.22.52.0.1.tar.xz mirror://gentoo/binutils-2.22.52.0.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22.52.0.1-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6ccc3b1fb94c97e53e3f686ef095793e
diff --git a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.2 b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.2
index ff8e8fe3286e..506e8acba6b1 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.2
+++ b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.2
@@ -7,5 +7,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/devel/binutils/binutils-2.22.52.0.2.tar.xz mirror://gentoo/binutils-2.22.52.0.2-patches-1.0.tar.xz http://dev.gentoo.org/~vapier/dist/binutils-2.22.52.0.2-patches-1.0.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7102e5e9e7ba3881455b88b553fcd9f5
diff --git a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.3 b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.3
index 834a391901ec..df5370b4ef73 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.22.52.0.3
+++ b/metadata/md5-cache/sys-devel/binutils-2.22.52.0.3
@@ -7,5 +7,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/devel/binutils/binutils-2.22.52.0.3.tar.xz mirror://gentoo/binutils-2.22.52.0.3-patches-1.0.tar.xz http://dev.gentoo.org/~vapier/dist/binutils-2.22.52.0.3-patches-1.0.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c779e09dd8b3da0e05f26e516e3a9f6
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 3ac26225adc5..27c2f3ce4c29 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -6,5 +6,5 @@ IUSE=cxx nls multitarget multislot static-libs test vanilla zlib
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0bce97c0ef865e145c20ff034e7d3423
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.1.2 b/metadata/md5-cache/sys-devel/binutils-apple-3.1.2
index be846d29e6bf..eca54fb55b71 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.1.2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gentoo.org/~grobian/distfiles/ld64-85.2.1.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-698.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0709c1c9f60c3bfb8931caa1420975ec
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2.6 b/metadata/md5-cache/sys-devel/binutils-apple-3.2.6
index 13f9cf60dd9d..acf70a344c2d 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2.6
+++ b/metadata/md5-cache/sys-devel/binutils-apple-3.2.6
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/per
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-97.17.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-795.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e7780153bf5e3f9b4887092fcd392285
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.2 b/metadata/md5-cache/sys-devel/binutils-apple-4.2
index e7e95ad1b87f..c937de793a4f 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-4.2
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/per
 RESTRICT=test
 SLOT=4
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-127.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-809.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.5.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7422150645890e9d68326f6cc8227b78
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.3 b/metadata/md5-cache/sys-devel/binutils-apple-4.3
index ca530417e09a..632e5cc48082 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.3
+++ b/metadata/md5-cache/sys-devel/binutils-apple-4.3
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/per
 RESTRICT=test
 SLOT=4
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-128.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-822.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.6.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47232f5a98f1dea49288a5585b6db27b
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.19.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.19.1
index 5ba13212b613..454bffe33629 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.19.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.19.1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.19.1.tar.bz2 mirror://gentoo/binutils-2.19.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.19.1-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=32a179d9560640cf9ac9e46e1ba49e43
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.20.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.20.1
index 4471a4143701..f62d09814489 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.20.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.20.1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.20.1.tar.bz2 mirror://gentoo/binutils-2.20.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.20.1-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3bc6ae66ae302292cb2ed3a1eb9d129
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.21.1-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.21.1-r1
index c9bd435fc284..03d9783b1f00 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.21.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.21.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.21.1.tar.bz2 mirror://gentoo/binutils-2.21.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.21.1-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ed288fb163337bba176460b85975e2a
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.22 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.22
index 50e353dd4632..7779c33c7ff9 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.22
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.22
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/patch-2.6.1 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.22.tar.bz2 mirror://gentoo/binutils-2.22-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-binutils	dafdfbb4afa2c07ab507ac33243fd403	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af474f28ca26ca8847ae586db6e27230
diff --git a/metadata/md5-cache/sys-devel/bison-1.875d b/metadata/md5-cache/sys-devel/bison-1.875d
index 9f914918f37f..ac41181cdf2f 100644
--- a/metadata/md5-cache/sys-devel/bison-1.875d
+++ b/metadata/md5-cache/sys-devel/bison-1.875d
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/m4 nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875d.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f26ff01c363be228b31e8a0dcef188b2
diff --git a/metadata/md5-cache/sys-devel/bison-2.4.2 b/metadata/md5-cache/sys-devel/bison-2.4.2
index 20cadaf3ddf8..0fa81807c1d6 100644
--- a/metadata/md5-cache/sys-devel/bison-2.4.2
+++ b/metadata/md5-cache/sys-devel/bison-2.4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0270d841678a995e290646ca420688e
diff --git a/metadata/md5-cache/sys-devel/bison-2.4.3 b/metadata/md5-cache/sys-devel/bison-2.4.3
index 8bae4481589b..1a0a01529b4a 100644
--- a/metadata/md5-cache/sys-devel/bison-2.4.3
+++ b/metadata/md5-cache/sys-devel/bison-2.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.4.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3e8fd2b3aa92e8400fbabc0f9016b4e
diff --git a/metadata/md5-cache/sys-devel/bison-2.5 b/metadata/md5-cache/sys-devel/bison-2.5
index f607b0ace8fa..6cbc8babed59 100644
--- a/metadata/md5-cache/sys-devel/bison-2.5
+++ b/metadata/md5-cache/sys-devel/bison-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47da450bccac94d452c44cfbf574b936
diff --git a/metadata/md5-cache/sys-devel/bison-2.5.1 b/metadata/md5-cache/sys-devel/bison-2.5.1
index d6735617eb02..52b74a08c65d 100644
--- a/metadata/md5-cache/sys-devel/bison-2.5.1
+++ b/metadata/md5-cache/sys-devel/bison-2.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-2.5.1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a42cf9c6a2ce63c55065e20382a9c6ec
diff --git a/metadata/md5-cache/sys-devel/distcc-2.18.3-r10 b/metadata/md5-cache/sys-devel/distcc-2.18.3-r10
index 5f90a4cee132..bd5970693490 100644
--- a/metadata/md5-cache/sys-devel/distcc-2.18.3-r10
+++ b/metadata/md5-cache/sys-devel/distcc-2.18.3-r10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnome? ( x11-libs/gtk+:2 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.0.0.0 gnome-base/libglade:2.0 x11-libs/pango >=gnome-base/gconf-2.0.0:2 ) gtk? ( x11-libs/gtk+:2 x11-libs/pango ) selinux? ( sec-policy/selinux-distcc )
 SLOT=0
 SRC_URI=http://distcc.samba.org/ftp/distcc/distcc-2.18.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f19385383a5a1833a43acd39fd0fc059
diff --git a/metadata/md5-cache/sys-devel/distcc-3.0-r4 b/metadata/md5-cache/sys-devel/distcc-3.0-r4
index 576bb2329a2c..fbc3eee3bd29 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.0-r4
+++ b/metadata/md5-cache/sys-devel/distcc-3.0-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.4 dev-libs/popt avahi? ( >=net-dns/avahi-0.6 ) gnome
 RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50ad0bd1e33bdfaf1a161965aae817a4
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r5 b/metadata/md5-cache/sys-devel/distcc-3.1-r5
index 0ac32b4a253f..ccba67a12163 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r5
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base
 RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17ce724eeb3e785473f73aa69c1edb88
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r6 b/metadata/md5-cache/sys-devel/distcc-3.1-r6
index c28a147c9675..3ffb93b2f72d 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r6
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base
 RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=683ab04080a911eda87efea4bc9f18e8
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1
index 00004767f1d1..4fe66d27c2f9 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base
 RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a02d87addf8212f5112f50cda55cb695
diff --git a/metadata/md5-cache/sys-devel/flex-2.5.35 b/metadata/md5-cache/sys-devel/flex-2.5.35
index 5a74e06df456..67d409d285bd 100644
--- a/metadata/md5-cache/sys-devel/flex-2.5.35
+++ b/metadata/md5-cache/sys-devel/flex-2.5.35
@@ -8,5 +8,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://sourceforge/flex/flex-2.5.35.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db0ab5eb3edae30fb54094409d0dc026
diff --git a/metadata/md5-cache/sys-devel/flex-2.5.35_p10 b/metadata/md5-cache/sys-devel/flex-2.5.35_p10
index 5952972aff1a..617fd98adc0b 100644
--- a/metadata/md5-cache/sys-devel/flex-2.5.35_p10
+++ b/metadata/md5-cache/sys-devel/flex-2.5.35_p10
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://sourceforge/flex/flex-2.5.35.tar.bz2 mirror://debian/pool/main/f/flex/flex_2.5.35-10.diff.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=212b0b62b5517807bb0144daf3a503cf
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index e80fef9d5fc4..131de2a73726 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) )
 RESTRICT=strip
 SLOT=2.95
 SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8cca7b73b7a347e77ea576091bd4e08
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r9 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r9
index 98140b9fa73f..8955909cf8fe 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r9
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r9
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 >=sys-apps/texinfo-4.2-r4 !build? ( >=sys-libs/ncurses-5.2-r2 )
 SLOT=2.95
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-2.95.3/gcc-2.95.3.tar.gz mirror://gentoo/gcc-2.95.3-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=040285d7a77f45fb9616899423e56fff
diff --git a/metadata/md5-cache/sys-devel/gcc-3.1.1-r2 b/metadata/md5-cache/sys-devel/gcc-3.1.1-r2
index d0f1a5dae20b..dee053aae6de 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.1.1-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.1.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-apps/texinfo-4.2-r4 !build? ( >=sys-libs/ncurses-5.2-r2 )
 SLOT=3.1
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.1.1/gcc-3.1.1.tar.bz2 http://www.ibiblio.org/gentoo/distfiles/gcc-3.1.1_final-patches-1.0.tbz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fd6b9e2068b1841cd5095fdd74fe929
diff --git a/metadata/md5-cache/sys-devel/gcc-3.2.2 b/metadata/md5-cache/sys-devel/gcc-3.2.2
index a5a643d6f66c..5e34d3eccf14 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.2.2
+++ b/metadata/md5-cache/sys-devel/gcc-3.2.2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.2
 SRC_URI=mirror://gnu/gcc/gcc-3.2.2/gcc-3.2.2.tar.bz2 mirror://gentoo/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.2.2-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b647f8b54d8ce42330452798fcad0c59
diff --git a/metadata/md5-cache/sys-devel/gcc-3.2.3-r4 b/metadata/md5-cache/sys-devel/gcc-3.2.3-r4
index e2297dbed36f..97af33334ee7 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.2.3-r4
+++ b/metadata/md5-cache/sys-devel/gcc-3.2.3-r4
@@ -9,5 +9,5 @@ PDEPEND=sys-devel/gcc-config
 RDEPEND=>=sys-libs/glibc-2.3.2-r3 >=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 >=sys-apps/texinfo-4.2-r4 !build? ( >=sys-libs/ncurses-5.2-r2 )
 SLOT=3.2
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.2.3/gcc-3.2.3.tar.bz2 mirror://gentoo/protector-3.2.2-10.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_2_2/protector-3.2.2-10.tar.gz mirror://gentoo/gcc-3.2.3-manpages.tar.bz2 mirror://gentoo/gcc-3.2.3-tls-update.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ddf6c7239d900aff094dd538046f254c
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index 256546202f62..a112ba1eceb7 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib !build? ( nls? ( sys-d
 RESTRICT=strip
 SLOT=3.3
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.7.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2b7344938a97f2de9d3067f73d29e675
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 8b3dcfb23e1b..fe5d9b2b6789 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.6.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7242f21650702aa2e286a687f3c84be
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index 19bc3a50388e..f74ea0cca9cd 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fo
 RESTRICT=strip
 SLOT=4.0
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed6706cfbff401c98f4bfdcb1ed3fb87
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index c49ec56ec255..d7a1fde73761 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fo
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.3.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8e877a318f9d5e841427da7e8dc0751
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index 318b8dcb9627..a7b76b23aa22 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fo
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e9066441dcf28e2575f1ba1e81bf389
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
index 64d323acb5dc..03e95d2f9013 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edbf428b89d60aca0847da65e329d34c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.4 b/metadata/md5-cache/sys-devel/gcc-4.3.4
index 4867c2701030..ae3f90676845 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2 mirror://gentoo/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9267e2d1fdef3b560c84997a4b5d3848
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.5 b/metadata/md5-cache/sys-devel/gcc-4.3.5
index 796e5b256f61..43ad1aaf7316 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3e4b9bd1796ce696486e7ebbaa869f1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index 151dc57357d3..21af97cdb58b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7f9e5bc3bbfc7d25cef5d5953ba5cb5
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.2 b/metadata/md5-cache/sys-devel/gcc-4.4.2
index 4b030122661e..83892ec9f46b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.2/gcc-4.4.2.tar.bz2 mirror://gentoo/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c6781fb8890474fcfb2b2a0fb0de742
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3 b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
index 26a3b3d30818..a3ba5e5019bb 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 mirror://gentoo/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-piepatches-v0.4.5.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.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c99790035f1ad3a25c8c57b959b0dc3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
index e45efa92b653..e8cc43193083 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-piepatches-v0.4.5.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.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf799d7e0e0d2588b81fdd4cf20dc988
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.5 b/metadata/md5-cache/sys-devel/gcc-4.4.5
index 8e2807a2c1a0..e68d6d438d6a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-piepatches-v0.4.5.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.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63df08c346a3ae313b9c16beb3b72f4c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
index b79dc317053e..aa22212b857d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-piepatches-v0.4.5.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.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dcb2d3c66fe1fc0dd5b0c13ad5b1bc11
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index baa1de4d287a..d7051ea94274 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-piepatches-v0.4.5.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.3.jar )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5900a96f9d517157766c6cb95bd7ec8
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
index 4cf7a3916cad..a3b15233f4b6 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.bz2 mirror://gentoo/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-piepatches-v0.4.5.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cc8b5601f97a33bf4123b42434986ea7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.2 b/metadata/md5-cache/sys-devel/gcc-4.5.2
index 25a9ddf8ca29..e55bb6088fe2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-piepatches-v0.4.5.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6f4edfa9d1c57cb5338b795653ee77a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
index 6ad2cdd1f879..7cbf18fe1a75 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-piepatches-v0.4.7.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=14c62ae80f2cf1ad0a5be98c97cd134c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.0 b/metadata/md5-cache/sys-devel/gcc-4.6.0
index 0da34bad0eb5..f628be51eb95 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.0/gcc-4.6.0.tar.bz2 mirror://gentoo/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-piepatches-v0.4.5.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=077f6880637d01c454874d2059114e92
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
index 5e4e2d23d991..19a92965274c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-piepatches-v0.4.5.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b373fdf531efc59bdee07c803157f6e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.2 b/metadata/md5-cache/sys-devel/gcc-4.6.2
index 7d31c3238e1c..a5d29d7d9808 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.5.0.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05b629ca246a6a20e235c631e557f1ba
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.3 b/metadata/md5-cache/sys-devel/gcc-4.6.3
index 467da451affd..af7a286b5991 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-piepatches-v0.5.2.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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=584a7d18635a52fe8223dd39684f3267
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index 22a5971a17ba..cf210719d8d2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8bcac59663fc2879302b18c25cf6716b
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.1 b/metadata/md5-cache/sys-devel/gcc-4.7.1
index 12f60d4a3496..01a730350a24 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2 mirror://gentoo/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-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	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b9dc56827defae6a7587a6d52b13711b
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
index 558b361a4a7b..aa636316f23b 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=40
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=695373bab736b1a123a59a4884511fad
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index 7274c9ecff5b..6b1040b9d33f 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5e5182e1ebf95a532a8ea011fcf95fc
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index e107a4e51e9f..120d09dde982 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bf52ae2cbf24b2891f95c393aac5e41
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.4.1-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.4.1-r1
index cf685ceddc64..013f5da60f8e 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.4.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.4.1-r1
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbs
 LICENSE=GPL-2
 RDEPEND=!app-admin/eselect-compiler
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ffa07611d5cf67363d1426027a20454
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.5-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.5-r1
index 777e5e3be44c..3ac94e5d043b 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.5-r1
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 RDEPEND=!app-admin/eselect-compiler
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41aa67c91560537730ddbc167da976e6
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.5-r2 b/metadata/md5-cache/sys-devel/gcc-config-1.5-r2
index 3ab217425e2d..442b09c6f71b 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.5-r2
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.5-r2
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 RDEPEND=!app-admin/eselect-compiler
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=750ff540c188eb74d550b7b518cfa7b6
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.5.1 b/metadata/md5-cache/sys-devel/gcc-config-1.5.1
index 68cde5faee5a..d0ea22919ab2 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.5.1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.5.1
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 RDEPEND=!app-admin/eselect-compiler
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4dd8d4f4345bf199034778373325a2f
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.5.1-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.5.1-r1
index c39adaf93f58..5137c84d9190 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.5.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.5.1-r1
@@ -5,5 +5,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 RDEPEND=!app-admin/eselect-compiler
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b91eac442a9129e4da6878d2ff0c40ed
diff --git a/metadata/md5-cache/sys-devel/gdb-6.6-r2 b/metadata/md5-cache/sys-devel/gdb-6.6-r2
index 653413392816..165156e1b6c6 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.6-r2
+++ b/metadata/md5-cache/sys-devel/gdb-6.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.6.tar.bz2 mirror://gentoo/gdb-6.6-patches-1.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b16e5c6f5a7ab7f568c3543230313247
diff --git a/metadata/md5-cache/sys-devel/gdb-6.7.1-r3 b/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
index 6fd9d1127355..98c62ac89170 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
+++ b/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-6.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.7.1.tar.bz2 mirror://gentoo/gdb-6.7.1-patches-1.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=318efe6224ae772cd2764d1c86670c3e
diff --git a/metadata/md5-cache/sys-devel/gdb-6.8-r1 b/metadata/md5-cache/sys-devel/gdb-6.8-r1
index c01cb509e622..f77349a24444 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.8-r1
+++ b/metadata/md5-cache/sys-devel/gdb-6.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.4.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=99c4ab604f111279889c9837b37cda0c
diff --git a/metadata/md5-cache/sys-devel/gdb-6.8-r2 b/metadata/md5-cache/sys-devel/gdb-6.8-r2
index 89549195f522..b1e24c6c5bdb 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.8-r2
+++ b/metadata/md5-cache/sys-devel/gdb-6.8-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.5.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7aa26b6d055ee23f61104b1b79ec028f
diff --git a/metadata/md5-cache/sys-devel/gdb-7.0.1 b/metadata/md5-cache/sys-devel/gdb-7.0.1
index 191e76571ef2..8c453372b8fc 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.0.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.0.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.1.tar.bz2 mirror://gentoo/gdb-7.0.1-patches-1.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5e3c52101866e693aa0bdcc59eeb1cd
diff --git a/metadata/md5-cache/sys-devel/gdb-7.1 b/metadata/md5-cache/sys-devel/gdb-7.1
index 9716ea5112f4..ca6456b43f81 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.1.tar.bz2 mirror://gentoo/gdb-7.1-patches-1.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0780895ab1eec7d8b318c221c664035
diff --git a/metadata/md5-cache/sys-devel/gdb-7.2 b/metadata/md5-cache/sys-devel/gdb-7.2
index fa906e7486fd..28ede1566bb0 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.2
+++ b/metadata/md5-cache/sys-devel/gdb-7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 mirror://gentoo/gdb-7.2-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=827c83b368ad45256513572d760dc73b
diff --git a/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15 b/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
index 52cf858b8c4b..275baf018559 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
+++ b/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://fedora/development/source/SRPMS/gdb-7.2.50.20101117-4.fc15.src.rpm
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef9ff85ef0f6995f41b204161515b3c3
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3 b/metadata/md5-cache/sys-devel/gdb-7.3
index 60341330ac20..1343060ab440 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3
+++ b/metadata/md5-cache/sys-devel/gdb-7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.3.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.tar.bz2 mirror://gentoo/gdb-7.3-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e81c143952c38abc186dc328f52e39d7
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3.1 b/metadata/md5-cache/sys-devel/gdb-7.3.1
index 7e64291d5620..d90572ffedcc 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f189e255bf62d88b88a56b5e514e60e6
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3.1-r1 b/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
index f98a04ad6da4..0b75817683cb 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
+++ b/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01ce444f208faa47da777d5ea3e91803
diff --git a/metadata/md5-cache/sys-devel/gdb-7.4 b/metadata/md5-cache/sys-devel/gdb-7.4
index 1c2b0201ddd0..cc3e4aa75d7a 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.4
+++ b/metadata/md5-cache/sys-devel/gdb-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fcf712cdc57dcf13c750e410d7603340
diff --git a/metadata/md5-cache/sys-devel/gdb-7.4.1 b/metadata/md5-cache/sys-devel/gdb-7.4.1
index a3a628254ab3..7ee11831e5c6 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.4.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-7.4.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.1.tar.bz2 mirror://gentoo/gdb-7.4.1-patches-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b77474b65fe2f651ff931a97aaeff464
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index 08a781ab3dbe..87cdc5e611d8 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -7,5 +7,5 @@ IUSE=+client expat multitarget nls +python +server test vanilla zlib
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc596a3caf769b3b9340be05ceeb1a87
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1344 b/metadata/md5-cache/sys-devel/gdb-apple-1344
index 3855c76a1d8e..975b45f0fa3e 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1344
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1344
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1344.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89a7d8e79c3f7d58f24db37a8999d420
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1346 b/metadata/md5-cache/sys-devel/gdb-apple-1346
index e632764c4bb9..8e09ddb96bbf 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1346
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1346
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1346.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b0d9a3344d4937c161c4b3bde14e4c3
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1461 b/metadata/md5-cache/sys-devel/gdb-apple-1461
index df9f116911f7..3f598467504a 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1461
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1461
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1461.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b175c5db69e44f2279ff3606945de3b
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1518 b/metadata/md5-cache/sys-devel/gdb-apple-1518
index 2ab7ae0aae17..39678d201ee3 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1518
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1518
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1518.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ab118cae86c5401e04d27f7b3437519
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1705 b/metadata/md5-cache/sys-devel/gdb-apple-1705
index d0cee90cf113..9082aa2ec9c1 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1705
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1705
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1705.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07950c34fc0276d79bdd2b6f066b7e8d
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1708 b/metadata/md5-cache/sys-devel/gdb-apple-1708
index 195f476030a0..db54e23d60c5 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1708
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1708
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1708.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1764e24c948927a2bf03917b0e4064f0
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1752 b/metadata/md5-cache/sys-devel/gdb-apple-1752
index de4e11a662fd..1a43c7dd7af5 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1752
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1752.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfaa6c9720f0117e819688f31c68448a
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-563 b/metadata/md5-cache/sys-devel/gdb-apple-563
index 442eb2eb3465..d50652f1732e 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-563
+++ b/metadata/md5-cache/sys-devel/gdb-apple-563
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-563.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5765dcc62df9b97c7f04643403559ad9
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-768-r1 b/metadata/md5-cache/sys-devel/gdb-apple-768-r1
index d870874f3876..de54ec436d34 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-768-r1
+++ b/metadata/md5-cache/sys-devel/gdb-apple-768-r1
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-768.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=677053e047002827028ed4e324445eb1
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-960 b/metadata/md5-cache/sys-devel/gdb-apple-960
index 5922ab304a3d..4ab0c60516a7 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-960
+++ b/metadata/md5-cache/sys-devel/gdb-apple-960
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-960.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6f2e292a9a32939bce71a449e520beb0
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-962 b/metadata/md5-cache/sys-devel/gdb-apple-962
index 79130c3cf083..c14674393506 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-962
+++ b/metadata/md5-cache/sys-devel/gdb-apple-962
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-962.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17142c39b41158c34bcda0635e2b682f
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-966 b/metadata/md5-cache/sys-devel/gdb-apple-966
index 028901f5de35..7a551a9c30f4 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-966
+++ b/metadata/md5-cache/sys-devel/gdb-apple-966
@@ -9,5 +9,5 @@ LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-966.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6dd4c5b314ee198205eaa091c50af89a
diff --git a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r1 b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r1
index 1675840c5e6b..a86749ed1308 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r1
+++ b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=virtual/libiconv dev-libs/libxml2 sys-libs/ncurses dev-libs/expat acl? ( virtual/acl ) git? ( dev-vcs/git )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.18.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7d7c05417991bd6e5862fcdd930150fa
diff --git a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r2 b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r2
index b6c2268d9434..73d0f0938208 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r2
+++ b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=virtual/libiconv dev-libs/libxml2 sys-libs/ncurses dev-libs/expat acl? ( virtual/acl ) java? ( >=virtual/jdk-1.4 ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.18.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64c837106d1f7b6b999df5939abc05c5
diff --git a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r3 b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r3
index 08d246cd45e1..7af5b1690dfa 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r3
+++ b/metadata/md5-cache/sys-devel/gettext-0.18.1.1-r3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=virtual/libiconv dev-libs/libxml2 sys-libs/ncurses dev-libs/expat acl? ( virtual/acl ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.18.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=105219902f6185402e155dc04c14a9de
diff --git a/metadata/md5-cache/sys-devel/kgcc64-3.4.6 b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
index 965fe8cfc2b2..7623153be089 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-3.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ba8b008080ade055be3ab2b62c3031f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 6b559d2ee016..58caffaafb5f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0249b3b056954c2b256a9cf62cbff17
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 4b438313db32..0a648526c04b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df3d428c8dac7f8e129cc7206ca85c06
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.3 b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
index c1637f1eba0a..1b58b2409d39 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2de426fa59648fd54334a636b3cfcc5
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 25ad64ce999e..38f1ed87ce4b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bedba76cd6aa7bf4da8d96d31f2fc79
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.4 b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
index 2836ea454bdf..92f2a1441748 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3f83bf8c79814f4aedf08148803fd93
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 571ffcb2422d..9c2fbe6b0c07 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5d3c437cc15acf27ec2f09bafbf4644
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 44a2db2ac241..f894380318f6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2342a48f750adc57110f6e655159b21
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.2 b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
index cd60db1d7229..81209d2b66cc 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b349d6b224eb5757004e94bed6e61f0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index f95bf3a66dbd..35d5b17a07a8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	cd94911551b28677a0d7a1fcacdd0887	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce13406a56b56dea19145d6bcf12c395
diff --git a/metadata/md5-cache/sys-devel/libperl-5.8.8-r2 b/metadata/md5-cache/sys-devel/libperl-5.8.8-r2
index e16535b5f107..2d6580fb800a 100644
--- a/metadata/md5-cache/sys-devel/libperl-5.8.8-r2
+++ b/metadata/md5-cache/sys-devel/libperl-5.8.8-r2
@@ -10,5 +10,5 @@ RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.0 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://cpan/src/perl-5.8.8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=654c193c4eb2c6d9fa3e8b204eb96351
diff --git a/metadata/md5-cache/sys-devel/llvm-2.9-r2 b/metadata/md5-cache/sys-devel/llvm-2.9-r2
index 9d18eb72609f..306036916e83 100644
--- a/metadata/md5-cache/sys-devel/llvm-2.9-r2
+++ b/metadata/md5-cache/sys-devel/llvm-2.9-r2
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://llvm.org/releases/2.9/llvm-2.9.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=135c03a5c72bb52863b6463f5d251b36
diff --git a/metadata/md5-cache/sys-devel/llvm-3.0-r2 b/metadata/md5-cache/sys-devel/llvm-3.0-r2
index 4a07524c038f..f983492ea4d5 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.0-r2
+++ b/metadata/md5-cache/sys-devel/llvm-3.0-r2
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.0/llvm-3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d773a1397c1eb553e19b21d3f250081
diff --git a/metadata/md5-cache/sys-devel/llvm-3.1 b/metadata/md5-cache/sys-devel/llvm-3.1
index 6ac08d88df25..1d285cb45e1e 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=577f41f2c4cdd07bb1ba8fbcccd33f51
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 471d1a830d40..d68ee47b8d8a 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -7,5 +7,5 @@ IUSE=debug gold +libffi multitarget ocaml test udis86 vim-syntax
 LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) =dev-lang/python-2*
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d47002d90d32f08f8840329e8a817ec2
diff --git a/metadata/md5-cache/sys-devel/make-3.80-r4 b/metadata/md5-cache/sys-devel/make-3.80-r4
index 0b176c763ff5..646bbe43d33a 100644
--- a/metadata/md5-cache/sys-devel/make-3.80-r4
+++ b/metadata/md5-cache/sys-devel/make-3.80-r4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/make/make-3.80.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad3be28ca7db523850d69945e505202c
diff --git a/metadata/md5-cache/sys-devel/make-3.81 b/metadata/md5-cache/sys-devel/make-3.81
index 8cf7aed5bf6f..81feb2edaf1c 100644
--- a/metadata/md5-cache/sys-devel/make-3.81
+++ b/metadata/md5-cache/sys-devel/make-3.81
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.81.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e0bbff0998273bbeb53ef63e5430514
diff --git a/metadata/md5-cache/sys-devel/make-3.81-r1 b/metadata/md5-cache/sys-devel/make-3.81-r1
index d6c708fd36fc..b9d71a58e1dc 100644
--- a/metadata/md5-cache/sys-devel/make-3.81-r1
+++ b/metadata/md5-cache/sys-devel/make-3.81-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.81.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d26d43ae59166c21ab43733ba6980447
diff --git a/metadata/md5-cache/sys-devel/make-3.81-r2 b/metadata/md5-cache/sys-devel/make-3.81-r2
index dc17fea73486..5391a2d6c352 100644
--- a/metadata/md5-cache/sys-devel/make-3.81-r2
+++ b/metadata/md5-cache/sys-devel/make-3.81-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.81.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e23eda5c7e87f439788c0ff4804673e
diff --git a/metadata/md5-cache/sys-devel/make-3.82 b/metadata/md5-cache/sys-devel/make-3.82
index c7a60acaccb0..aff709eb4efe 100644
--- a/metadata/md5-cache/sys-devel/make-3.82
+++ b/metadata/md5-cache/sys-devel/make-3.82
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9aa8a1cba431db144f45eea50cbf1af4
diff --git a/metadata/md5-cache/sys-devel/make-3.82-r1 b/metadata/md5-cache/sys-devel/make-3.82-r1
index a68008f48342..943903200d9c 100644
--- a/metadata/md5-cache/sys-devel/make-3.82-r1
+++ b/metadata/md5-cache/sys-devel/make-3.82-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45524355f40ba1174bf5fa9997bef5c5
diff --git a/metadata/md5-cache/sys-devel/make-3.82-r3 b/metadata/md5-cache/sys-devel/make-3.82-r3
index 1c009bf6c507..1d74fdf14fa3 100644
--- a/metadata/md5-cache/sys-devel/make-3.82-r3
+++ b/metadata/md5-cache/sys-devel/make-3.82-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8057aef2dfe37d84fe1bb717979295d7
diff --git a/metadata/md5-cache/sys-devel/make-3.82-r4 b/metadata/md5-cache/sys-devel/make-3.82-r4
index 435fcf39f5bf..25533ebf9a20 100644
--- a/metadata/md5-cache/sys-devel/make-3.82-r4
+++ b/metadata/md5-cache/sys-devel/make-3.82-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a49a57e276f16c399d6015537c178cef
diff --git a/metadata/md5-cache/sys-devel/patch-2.5.9 b/metadata/md5-cache/sys-devel/patch-2.5.9
index c3ad113c2713..0d22b5e956d5 100644
--- a/metadata/md5-cache/sys-devel/patch-2.5.9
+++ b/metadata/md5-cache/sys-devel/patch-2.5.9
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/patch-2.5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ff115dc2e56fbf64911df83f0257cc8
diff --git a/metadata/md5-cache/sys-devel/patch-2.5.9-r1 b/metadata/md5-cache/sys-devel/patch-2.5.9-r1
index a43578f682c4..5794609058c2 100644
--- a/metadata/md5-cache/sys-devel/patch-2.5.9-r1
+++ b/metadata/md5-cache/sys-devel/patch-2.5.9-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/patch-2.5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4992f567ceb60789f55812e9ad885456
diff --git a/metadata/md5-cache/sys-devel/patch-2.6.1 b/metadata/md5-cache/sys-devel/patch-2.6.1
index 03401e07393d..30b0ac7a0c83 100644
--- a/metadata/md5-cache/sys-devel/patch-2.6.1
+++ b/metadata/md5-cache/sys-devel/patch-2.6.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.6.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ad1815e5511a589b3168feb1a63f5631
diff --git a/metadata/md5-cache/sys-devel/prelink-20100106 b/metadata/md5-cache/sys-devel/prelink-20100106
index 72f9695d6d3a..370831796ecf 100644
--- a/metadata/md5-cache/sys-devel/prelink-20100106
+++ b/metadata/md5-cache/sys-devel/prelink-20100106
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.100 !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
 SLOT=0
 SRC_URI=http://people.redhat.com/jakub/prelink/prelink-20100106.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3391a15d76683443ab5aff1e3e10fbde
diff --git a/metadata/md5-cache/sys-devel/prelink-20110511 b/metadata/md5-cache/sys-devel/prelink-20110511
index e18f57db3672..8c10f44ce2f3 100644
--- a/metadata/md5-cache/sys-devel/prelink-20110511
+++ b/metadata/md5-cache/sys-devel/prelink-20110511
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.100 !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
 SLOT=0
 SRC_URI=mirror://gentoo/prelink-20110511.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a071a50a46ab279cb11379f3d8105fad
diff --git a/metadata/md5-cache/sys-devel/prelink-20111012 b/metadata/md5-cache/sys-devel/prelink-20111012
index 0994c5cd4ba9..ab13e740e636 100644
--- a/metadata/md5-cache/sys-devel/prelink-20111012
+++ b/metadata/md5-cache/sys-devel/prelink-20111012
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.100 !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
 SLOT=0
 SRC_URI=http://people.redhat.com/jakub/prelink/prelink-20111012.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cbef8cb00dbd06d9b30e3a1d54de5d3
diff --git a/metadata/md5-cache/sys-devel/sparse-0.4.2 b/metadata/md5-cache/sys-devel/sparse-0.4.2
index 6abc4b3cbbcd..0e0a35f0d73f 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.4.2
+++ b/metadata/md5-cache/sys-devel/sparse-0.4.2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=OSL-1.1
 SLOT=0
 SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.4.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17a38f187de313fa5991e2dd2b29ec25
diff --git a/metadata/md5-cache/sys-devel/sparse-0.4.3 b/metadata/md5-cache/sys-devel/sparse-0.4.3
index c9bf4f251678..a48603cbb576 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.4.3
+++ b/metadata/md5-cache/sys-devel/sparse-0.4.3
@@ -9,5 +9,5 @@ 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	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c531c3cd488d078d69563797abaf6857
diff --git a/metadata/md5-cache/sys-freebsd/boot0-7.2 b/metadata/md5-cache/sys-freebsd/boot0-7.2
index 5c26f7a06c0a..b163fecb10a6 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-7.2
+++ b/metadata/md5-cache/sys-freebsd/boot0-7.2
@@ -7,5 +7,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sys-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a143cbdaf4129b68486e30a7d3b048c2
diff --git a/metadata/md5-cache/sys-freebsd/boot0-8.0 b/metadata/md5-cache/sys-freebsd/boot0-8.0
index dd48fd177d28..dae68b85e07d 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-8.0
+++ b/metadata/md5-cache/sys-freebsd/boot0-8.0
@@ -8,5 +8,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sys-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38855794bb634539d513a0b00aef567b
diff --git a/metadata/md5-cache/sys-freebsd/boot0-8.2 b/metadata/md5-cache/sys-freebsd/boot0-8.2
index 1cc73bdb430d..cd739ed2a8a3 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-8.2
+++ b/metadata/md5-cache/sys-freebsd/boot0-8.2
@@ -8,5 +8,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sys-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5b2ba0967fdab2ecec4c007542404b1
diff --git a/metadata/md5-cache/sys-freebsd/boot0-9.0 b/metadata/md5-cache/sys-freebsd/boot0-9.0
index 9b357c8da59a..bb6c174ce843 100644
--- a/metadata/md5-cache/sys-freebsd/boot0-9.0
+++ b/metadata/md5-cache/sys-freebsd/boot0-9.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sys-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b35a3a5eb18a5929e5bdfdb16b91a376
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-bin-7.2
index aca8e4e430fd..80f8ce5e684f 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-7.2* dev-libs/libedit sys-libs/ncurses sys-apps/ed !app-misc/realpath
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-bin-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=034ece36bd3189ae8b8fcf6cf597de97
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-bin-8.0
index 914a2ed83f7d..51dc17d25809 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.0* dev-libs/libedit sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=773938a9fd56521605851a95cbf7ba59
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2
index a471810a203f..69fbb0eb8e4d 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2* dev-libs/libedit sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01f2ad8819dec7ddbcf71faf4fde1130
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-bin-9.0
index 355a43c19bba..30e0ca0ae9d1 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-bin-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-9.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.0* >=dev-libs/libedit-20120311.3.0-r1 sys-libs/ncurses sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e170898aaffbf5630abbb5dca7c0241
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-7.2
index 5d7be896211c..3469fda27143 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-7.2
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND==sys-freebsd/freebsd-lib-7.2* =sys-freebsd/freebsd-libexec-7.2* build? ( sys-apps/baselayout ) dev-libs/libedit dev-libs/libelf
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-cddl-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-sys-7.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-7.2.tar.bz2 mirror://gentoo/freebsd-include-7.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b019798e2b7585e3c49395e439655dd
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.0
index 202d7dca6636..1828d3994662 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.0
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND==sys-freebsd/freebsd-lib-8.0* =sys-freebsd/freebsd-libexec-8.0* build? ( sys-apps/baselayout ) dev-libs/libedit dev-libs/libelf
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-cddl-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-sys-8.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 mirror://gentoo/freebsd-include-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22f5e79d4e76579a9bfcb40d931e5c8d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2
index 72acd14014db..b361865ba4dc 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-8.2
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND==sys-freebsd/freebsd-lib-8.2* =sys-freebsd/freebsd-libexec-8.2* build? ( sys-apps/baselayout ) dev-libs/libedit dev-libs/libelf
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-cddl-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-sys-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0286554640a7d6068665beb840b654d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
index a21dba071c3b..a84ea6d36a7a 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND==sys-freebsd/freebsd-lib-9.0* =sys-freebsd/freebsd-libexec-9.0* build? ( sys-apps/baselayout ) dev-libs/libelf
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-cddl-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-sys-9.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=744eea00435e71164c409d9147fc6145
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-7.2
index 8d4366c24831..dd41a658c140 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-contrib-7.2
@@ -7,5 +7,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2 as-is
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-gnu-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78fca66588098f2aaf09c6a71e015ecd
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.0
index f73ef5ec9fc6..6c5a7dbfb157 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.0
@@ -7,5 +7,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2 as-is
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-gnu-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98d17cbb2db9a299da0d29f1969f0f7d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2
index 169e479fcc1c..8594d7fd86f6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-contrib-8.2
@@ -7,5 +7,5 @@ KEYWORDS=~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2 as-is
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78c1448138474da814d93f2ab4d98777
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.0
index 9f4f5acd7988..ff0cc4c75fbc 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-contrib-9.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2 as-is
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-gnu-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2d1899c83db51951ec50f79110fa2af
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-7.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-7.2-r1
index c60b9a3d16ce..68d148c33c29 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-7.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-7.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) !sys-freebsd/freebsd-headers dev-libs/libelf
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-crypto-7.2.tar.bz2 mirror://gentoo/freebsd-libexec-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2 mirror://gentoo/freebsd-include-7.2.tar.bz2 mirror://gentoo/freebsd-usbin-7.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-7.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=842307a15b169587ec4d2858ba0fe9eb
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-lib-8.0
index e6b12227b43b..795607f770d6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb !dev-libs/libusbx ) !sys-freebsd/freebsd-headers
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-crypto-8.0.tar.bz2 mirror://gentoo/freebsd-libexec-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 mirror://gentoo/freebsd-include-8.0.tar.bz2 mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-gnu-8.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a40d355b3eba4d2ef6ab6a8bc0d3b35
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1
index f3f682207463..d95fad1c3363 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb !dev-libs/libusbx ) >=dev-libs/expat-2.0.1 !sys-freebsd/freebsd-headers
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-crypto-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d058d48a00a194c42de104eec112071
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.0-r3 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.0-r3
index 458173981184..dc4b600bfcd6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.0-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) usb? ( !dev-libs/libusb !dev-libs/libusbx ) zfs? ( =sys-freebsd/freebsd-cddl-9.0* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter !sys-freebsd/freebsd-headers
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-crypto-9.0.tar.bz2 mirror://gentoo/freebsd-libexec-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-gnu-9.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f346aa8e6c841eb38606c9f62ff30e10
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-7.2-r2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-7.2-r2
index e989a2099d16..f610b91b9da9 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-7.2-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-7.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-7.2* >=sys-freebsd/freebsd-lib-7.2-r1 pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-7.2.tar.bz2 mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-bin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2 mirror://gentoo/freebsd-usbin-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12d8b9d968ce720c423c17ceca530007
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.0
index bf3dd82568b0..b6b5290e1deb 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.0* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-8.0.tar.bz2 mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 mirror://gentoo/freebsd-usbin-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a1dcc49501e6557ac5b71c2a56b6aac
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2
index c18aa0c2dd2e..be3c11178694 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d254e37eace875d1e379e967ee04bfe
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1
index c822a8bdf2d2..8f70f276c485 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04eda21ecc3985ceee5a7bf78caaaf51
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.0
index 02e1dd789caf..db0bc2e39e2e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.0* pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 mirror://gentoo/freebsd-usbin-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f475cb5a5c973f62e72556c0a393cd6b
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-7.2
index 73477a83fe56..4e5741e06128 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4502e49312afc112b26ac9b63d5bb852
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.0
index 6565c54fd709..05a09641a401 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=daba65dbc81e02a61a5724eeaade59ea
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
index ddc376c5ff03..6f9cdbad26b4 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5057cb6075e48bc27c4dd317a0cd0c61
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.0-r1
index ea426b1baaab..08eeae5ec948 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=898f21e6947cf2fdc7b4657ec00e4f8d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-7.2
index ba668bd98112..f95cdf5fe498 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=245c6a7e546d38a4b4600335f67fe7f8
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.0
index 04ff4fb3e31a..18292a1814b8 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee22fec86803292d639d50a45c224d0c
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2
index 1c6dce92df48..45e5dd11d57a 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=229a796977c11b355014a1bdda3ab881
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.0
index b927ea35e3a1..d11917534c1e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl virtual/krb5 )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ded3ef951760c289078c4cb6daf9a4d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-pf-7.2
index 06fe644d92fe..69e9d9a80479 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pf-7.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4679a364c80adc30cbc134322b6c4d35
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-pf-8.0
index 36dd3c9b8ba9..9e03ccf6fb57 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pf-8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85a3f06f21616bab07e759f30203a703
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2
index f36da9b81c44..6bd8703c512e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pf-8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd0aa7913fa95314e1398ee58c49dde8
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-pf-9.0
index 027941c46882..1c9e22798567 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-pf-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-pf-9.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99ca063d9d68368bc7ef6eb826f8695c
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-7.2
index e405434b6c46..d18f3e79c9f6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-rescue-7.2
@@ -8,5 +8,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-bin-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-usbin-7.2.tar.bz2 mirror://gentoo/freebsd-gnu-7.2.tar.bz2 mirror://gentoo/freebsd-sys-7.2.tar.bz2 mirror://gentoo/freebsd-libexec-7.2.tar.bz2 mirror://gentoo/freebsd-rescue-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10b0d1edb085e3e3f0956162b4d02769
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.0
index b1055ff2b633..519670bdc5ae 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.0
@@ -8,5 +8,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-gnu-8.0.tar.bz2 mirror://gentoo/freebsd-sys-8.0.tar.bz2 mirror://gentoo/freebsd-libexec-8.0.tar.bz2 mirror://gentoo/freebsd-rescue-8.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a65ff909857366235be761f38d04bde9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2
index 1698bf5b6f03..cd60c4922c86 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-rescue-8.2
@@ -8,5 +8,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-rescue-8.2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9d3c77b98295f95ce7dcd73112435b1
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-9.0
index 9bf74d9afa1e..e09e01673fda 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-rescue-9.0
@@ -8,5 +8,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=BSD zfs? ( CDDL )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-gnu-9.0.tar.bz2 mirror://gentoo/freebsd-sys-9.0.tar.bz2 mirror://gentoo/freebsd-libexec-9.0.tar.bz2 mirror://gentoo/freebsd-rescue-9.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d119229935a5e39ac584da2506e68b9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-7.2
index 8a0f6fe4d071..6d22727e4905 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-7.2*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-7.2* ssl? ( dev-libs/openssl ) dev-libs/libedit sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-libexec-7.2.tar.bz2 mirror://gentoo/freebsd-usbin-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-7.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11e3dc5d13704acd0f484bee6ba3b76c
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.0
index 3a79ddbd2cbf..02b0f5443474 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.0*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-8.0* ssl? ( dev-libs/openssl ) dev-libs/libedit sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-libexec-8.0.tar.bz2 mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48138c78fcaad04f7f9201fc747d3c39
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1
index a703f19debaa..2f33462e1277 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-8.2* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) dev-libs/libedit sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-libexec-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7bb973b5cd3760abbcf7e1e0044e9c6
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.0-r1
index fde97e032585..0fc4b4261f38 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-9.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.0*[ipv6?,atm?,netware?] =sys-freebsd/freebsd-libexec-9.0* >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl ) >=dev-libs/libedit-20120311.3.0-r1 sys-libs/readline sys-process/vixie-cron atm? ( net-analyzer/bsnmp )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-libexec-9.0.tar.bz2 mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31eebda0ff9a11b72f2938b61b85f8b7
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-7.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-share-7.2-r1
index f1fe410fdefc..82ea61883e68 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-7.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-7.2-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-gnu-7.2.tar.bz2 mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-usbin-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-bin-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5e732f2a13b225b9e6086bc8c2205af
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-share-8.0
index 9d568a0e879e..8781608f16bf 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-8.0
@@ -9,5 +9,5 @@ RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-gnu-8.0.tar.bz2 mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01336d54dadcd4b49a0758dc3f9c0dfa
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-share-8.2
index 29c3d8a4e8e5..f6d31a4d5971 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-8.2
@@ -9,5 +9,5 @@ RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b302bb30b10fb667ca00b8636193412
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-share-9.0
index fc3177fb38e9..9672c8afbae3 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-share-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-share-9.0
@@ -9,5 +9,5 @@ RDEPEND=sys-apps/miscfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-gnu-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa6e205e9c91df04bab2b232c75ac7ab
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-7.2-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-7.2-r3
index 7cefde7faabf..ec66fbef0b12 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-7.2-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-7.2-r3
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-7.0
 RESTRICT=strip binchecks
 SLOT=7.2-r3
 SRC_URI=mirror://gentoo/freebsd-sys-7.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b42374851a801fc69ea7c21e04934ab3
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-sources-8.0
index 316eb5888790..6bbe4eb6b492 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-8.0
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
 RESTRICT=strip binchecks
 SLOT=8.0
 SRC_URI=mirror://gentoo/freebsd-sys-8.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64009424791599ffb3a7ccb7193a020d
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r1
index 9d2253799098..da6f1fe2457a 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-8.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
 RESTRICT=strip binchecks
 SLOT=8.2-r1
 SRC_URI=mirror://gentoo/freebsd-sys-8.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85ff711575d7783e64bf8dfe76883fcb
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0
index 6d3a0de8c4b6..b9f302defc64 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
 RESTRICT=strip binchecks
 SLOT=9.0
 SRC_URI=mirror://gentoo/freebsd-sys-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bb5edd6ab3cd402e203db6488a1c8f1
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r1
index bb6b22702aa4..0b3e18c72235 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
 RESTRICT=strip binchecks
 SLOT=9.0-r1
 SRC_URI=mirror://gentoo/freebsd-sys-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5da940f30c67522a11139471b9bcd170
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3
index 88361a8e795e..0afb9c32d7a3 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3
@@ -9,5 +9,5 @@ RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
 RESTRICT=strip binchecks
 SLOT=9.0-r3
 SRC_URI=mirror://gentoo/freebsd-sys-9.0.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=461e0097f4bdd3a77c78e9f94c436722
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-7.2 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-7.2
index 9657fff31a51..3c12bd907a75 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-7.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-7.2*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) virtual/pam sys-libs/zlib !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2 mirror://gentoo/freebsd-bin-7.2.tar.bz2 mirror://gentoo/freebsd-include-7.2.tar.bz2 build? ( mirror://gentoo/freebsd-sys-7.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=502c493181cdf755791dbcc3835b75cd
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0
index 75800193705f..7d86b95f1750 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-8.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-include-8.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a6853cd1a1530cbcdc002f6b5df6b763
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0-r1
index 67014ed010a5..f07be3383e6f 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-8.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 mirror://gentoo/freebsd-bin-8.0.tar.bz2 mirror://gentoo/freebsd-include-8.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ed41e4cf45dbcc3cd10f052e5a9c270
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1
index 4a2455c3fca6..426be26569c5 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-bin-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-8.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf7079cfc645c1dc91738e8a9083d5ec
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0
index f9a6aebd30a8..68bef3fd46b6 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 >=dev-libs/libedit-20120311.3.0-r1 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eade1732e24407af544a74d1db6582d9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0-r1
index fdf75365f24d..dd7010f3daf1 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( app-arch/libarchive ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 mirror://gentoo/freebsd-bin-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf83edf48bcfd74ae2afc265169488d2
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-7.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-7.2-r1
index 6e224223525e..cd748989bf7b 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-7.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-7.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-7.2*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-7.2* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libedit net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-7.2.tar.bz2 mirror://gentoo/freebsd-contrib-7.2.tar.bz2 mirror://gentoo/freebsd-ubin-7.2.tar.bz2 mirror://gentoo/freebsd-lib-7.2.tar.bz2 mirror://gentoo/freebsd-sbin-7.2.tar.bz2 mirror://gentoo/freebsd-etc-7.2.tar.bz2 mirror://gentoo/freebsd-gnu-7.2.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-7.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-7.2.tar.bz2 mirror://gentoo/freebsd-include-7.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5dc596f6403c6bd8a94535971ae5e5a
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.0-r1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.0-r1
index fdbf3e69f486..d2209a2587fc 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.0-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.0*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-8.0* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libelf dev-libs/libedit net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-8.0.tar.bz2 mirror://gentoo/freebsd-contrib-8.0.tar.bz2 mirror://gentoo/freebsd-ubin-8.0.tar.bz2 mirror://gentoo/freebsd-lib-8.0.tar.bz2 mirror://gentoo/freebsd-sbin-8.0.tar.bz2 mirror://gentoo/freebsd-etc-8.0.tar.bz2 mirror://gentoo/freebsd-gnu-8.0.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-8.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.0.tar.bz2 mirror://gentoo/freebsd-include-8.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f4bacb6f751dc3c13a1a31dbaca88e5
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r1
index ab1f80f9f928..3e941b43cd1a 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-8.2* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libelf dev-libs/libedit net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-8.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=200343ce3ca7874b329285e7a7b63945
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2
index 7ae27b7514b9..42b373676423 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-8.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-8.2*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-8.2* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) dev-libs/libelf dev-libs/libedit net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-8.2.tar.bz2 mirror://gentoo/freebsd-contrib-8.2.tar.bz2 mirror://gentoo/freebsd-ubin-8.2.tar.bz2 mirror://gentoo/freebsd-lib-8.2.tar.bz2 mirror://gentoo/freebsd-sbin-8.2.tar.bz2 mirror://gentoo/freebsd-etc-8.2.tar.bz2 mirror://gentoo/freebsd-gnu-8.2.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-8.2.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-8.2.tar.bz2 mirror://gentoo/freebsd-include-8.2.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c7caaa18bfea6e454d64e03430b86df
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.0
index aec9b819f2f1..d9015fd74beb 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-9.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.0*[usb?,bluetooth?,netware?] =sys-freebsd/freebsd-libexec-9.0* =sys-freebsd/freebsd-contrib-9.0* acpi? ( sys-power/iasl ) build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog dev-libs/libelf >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-usbin-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-etc-9.0.tar.bz2 mirror://gentoo/freebsd-gnu-9.0.tar.bz2 nis? ( mirror://gentoo/freebsd-libexec-9.0.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 )
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53353b5ba464d2df49cd71b8beb609ce
diff --git a/metadata/md5-cache/sys-freebsd/virtio-kmod-0.228301-r1 b/metadata/md5-cache/sys-freebsd/virtio-kmod-0.228301-r1
index 1f2683de7b3c..d2b87445ef19 100644
--- a/metadata/md5-cache/sys-freebsd/virtio-kmod-0.228301-r1
+++ b/metadata/md5-cache/sys-freebsd/virtio-kmod-0.228301-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/ports/local-distfiles/kuriyama/virtio-0.228301.tar.gz
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a62117e9afbfd6c9c78e8e57af32aa96
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.0.6-r2 b/metadata/md5-cache/sys-fs/cryptsetup-1.0.6-r2
index ea418789e3bb..5eeb1add79ba 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.0.6-r2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.0.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.00.07-r1 ) >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks
 SLOT=0
 SRC_URI=http://luks.endorphin.org/source/cryptsetup-1.0.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=582fe04f75cf1e7b6f3a5d4b5ea39761
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.1.2 b/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
index 3e0d870ef08f..4749c5b1dde6 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks
 SLOT=0
 SRC_URI=http://cryptsetup.googlecode.com/files/cryptsetup-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d23aba9114cf0be06cca7923f5ab130a
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.10 b/metadata/md5-cache/sys-fs/dd-rescue-1.10
index d8df2c24df77..44423f0f63d1 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.10
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.10
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95eb563f19e53574beb608a6f9c06827
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.24 b/metadata/md5-cache/sys-fs/dd-rescue-1.24
index 7c07ec6f3719..b5b31e4bdeb6 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.24
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.24
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~arm ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.24.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3572b1c10398d229b6d11967ecbd64bc
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.25 b/metadata/md5-cache/sys-fs/dd-rescue-1.25
index 2710cdb658fc..190cdfe80398 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.25
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.25
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~arm ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.25.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1e02023c2380d48b8fc41c16f4cbb6e
diff --git a/metadata/md5-cache/sys-fs/devfsd-1.3.25-r9 b/metadata/md5-cache/sys-fs/devfsd-1.3.25-r9
index 01e67465eb9e..1def9080f43f 100644
--- a/metadata/md5-cache/sys-fs/devfsd-1.3.25-r9
+++ b/metadata/md5-cache/sys-fs/devfsd-1.3.25-r9
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.atnf.csiro.au/~rgooch/linux/
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v1.3.25.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f19974099aedcb868bedc7cfe94a9014
diff --git a/metadata/md5-cache/sys-fs/dfc-3.0.0 b/metadata/md5-cache/sys-fs/dfc-3.0.0
index 9705482903a5..509fb50df9f3 100644
--- a/metadata/md5-cache/sys-fs/dfc-3.0.0
+++ b/metadata/md5-cache/sys-fs/dfc-3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://projects.gw-computing.net/attachments/download/63/dfc-3.0.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=784fe0be1ec363f6b70a86c467a17ce9
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc14 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc14
index ed2d47673a1b..93e72dc70480 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc14
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) selinux? ( sys-libs/libselinux sys-libs/libsepol )
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc14.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66f9521faaab87d12245ed7c028d3f71
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc15 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc15
index d2630a3a41c1..efe41bda4d47 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc15
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) selinux? ( sys-libs/libselinux sys-libs/libsepol )
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc15.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=097d641922e3a6b736714c3055495b79
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r2 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r2
index 5184b8907ba0..1618e6985247 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r2
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) selinux? ( sys-libs/libselinux sys-libs/libsepol )
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6fb28a295f5007068603e8beb62dd47e
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
index d941041402ba..f9af5d67388b 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc )
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74dcb6c5aa3e8bd7f66df154f047095e
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.10 b/metadata/md5-cache/sys-fs/dosfstools-3.0.10
index f555931345ff..d8ed47b35b36 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.10
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.10
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=37ac97c55775e3d9d5aeb6d48c25388f
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.11 b/metadata/md5-cache/sys-fs/dosfstools-3.0.11
index 60c15481952b..3a0204eb5c64 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.11
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.11
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.11.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21a29fb0c97aa057dd217451240b26b1
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.12 b/metadata/md5-cache/sys-fs/dosfstools-3.0.12
index d3bca6e0de36..d5ba6f82a243 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.12
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.12
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.12.tar.bz2 -> dosfstools-3.0.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc57c0a0535b635dc1015996e1ca1fd1
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.9 b/metadata/md5-cache/sys-fs/dosfstools-3.0.9
index 93848192d02f..a76c1189e15e 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.9
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.9
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbf07eb5a86772025c09afda675c297b
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12 b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12
index 52ca81c5eaed..ad7f9f6cfd6c 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.41.12 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bec0f93ca38f9c80684ec3710b728bb8
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12-r1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12-r1
index fea25f6b73a0..cbdef63908b1 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12-r1
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.41.12 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.12.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28e18cad03d7cdd0df4cc0983fce9fe1
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.14 b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.14
index 50920411b6c6..5c21dadc728d 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.14
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.41.14 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=695420f85c2d478fb20b5db4ece38f09
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.7-r1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.7-r1
index d6872acf1dd5..c3a6fa69a77e 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.41.7-r1
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.41.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.41.7 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfda4a297d4fb5ad28f9f402160f33aa
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42
index ba98785f4ce1..c7ffb35d9542 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.42 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b91b37dfe78d9515643d6b7cf2aad37
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.1
index 1cdac1c245ea..70e7303fd022 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.1
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.42.1 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89a9779ae59427a363cc19a84fdf18b7
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.3 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.3
index bda8441b188c..662bc13c95cc 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.3
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.42.3 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9741d331346a98bb081d7d823d5e654a
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.4 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.4
index 8b5327b20af6..878f08c7d24c 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.4
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.42.4 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cc4388347d4a3aebfd9a216ff7fda565
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2 b/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2
index f01bc8285af4..442d719e268f 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
 SLOT=0
 SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.1_src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d77e394f6335c49aa63acdd930fdc4ea
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.2 b/metadata/md5-cache/sys-fs/e4rat-0.2.2
index b3361dc76885..d84b0901d43d 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.2
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
 SLOT=0
 SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.2_src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08e033c88c20406af3fa2da59b51e705
diff --git a/metadata/md5-cache/sys-fs/e4rat-0.2.3 b/metadata/md5-cache/sys-fs/e4rat-0.2.3
index a77acb2853f5..08eaf88e7414 100644
--- a/metadata/md5-cache/sys-fs/e4rat-0.2.3
+++ b/metadata/md5-cache/sys-fs/e4rat-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl >=dev-libs/boost-1.42 sys-fs/e2fsprogs sys-process/audit
 SLOT=0
 SRC_URI=mirror://sourceforge/e4rat/e4rat_0.2.3_src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=34e0116f72cd88bcdd31add51e773b6c
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-91 b/metadata/md5-cache/sys-fs/ecryptfs-utils-91
index e5ab9560dd3b..475f77040b6c 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-91
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-91
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/91/+download/ecryptfs-utils_91.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6358ecd91cc6e2303d8b598948cc68cd
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-92 b/metadata/md5-cache/sys-fs/ecryptfs-utils-92
index 96485cc2c514..bfe144c67ce2 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-92
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-92
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/92/+download/ecryptfs-utils_92.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0b9ec8c35edf5b3937b0d8478f859e7
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-93 b/metadata/md5-cache/sys-fs/ecryptfs-utils-93
index 7906bf977974..be109be0fa02 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-93
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-93
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/93/+download/ecryptfs-utils_93.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a64c1663fc44ae30dbbe6c00213441d8
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-95 b/metadata/md5-cache/sys-fs/ecryptfs-utils-95
index 0cec9d40b492..769fcf19bda9 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-95
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-95
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/95/+download/ecryptfs-utils_95.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=028499846bbd102262e6917f9095e608
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-96 b/metadata/md5-cache/sys-fs/ecryptfs-utils-96
index 1adfa0c82b89..524f26d2d720 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-96
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-96
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://launchpad.net/ecryptfs/trunk/96/+download/ecryptfs-utils_96.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce4a8d0db25ef753b0053b3728fea5d1
diff --git a/metadata/md5-cache/sys-fs/evms-2.5.5-r13 b/metadata/md5-cache/sys-fs/evms-2.5.5-r13
index 76ca083fd0fb..b314af937e2f 100644
--- a/metadata/md5-cache/sys-fs/evms-2.5.5-r13
+++ b/metadata/md5-cache/sys-fs/evms-2.5.5-r13
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux sys-libs/readline || ( sys-fs/device-mapper >=sys-fs
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/evms/evms-2.5.5.tar.gz mirror://gentoo/evms-patches-2.5.5-4.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=179a47d1bda96fcf4d1ab7302ea55cc3
diff --git a/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0 b/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
index 46f776fb7c25..27bef6ca5e4b 100644
--- a/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
+++ b/metadata/md5-cache/sys-fs/fuse4bsd-0.3.0
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=sys-fs/fuse
 SLOT=0
 SRC_URI=http://fuse4bsd.creo.hu/downloads/fuse4bsd-0.3.0.tar.gz mirror://gentoo/freebsd-sbin-6.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=44fa6f9e35aae54ad292461f0ad4c3dd
diff --git a/metadata/md5-cache/sys-fs/jfsutils-1.1.15 b/metadata/md5-cache/sys-fs/jfsutils-1.1.15
index 36fcdd576a57..17062cdd84ce 100644
--- a/metadata/md5-cache/sys-fs/jfsutils-1.1.15
+++ b/metadata/md5-cache/sys-fs/jfsutils-1.1.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libc
 SLOT=0
 SRC_URI=http://jfs.sourceforge.net/project/pub/jfsutils-1.1.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45ad1ce44c345b22d5a844162a610c73
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.1.4 b/metadata/md5-cache/sys-fs/mdadm-3.1.4
index f9bb48122952..080baf65ba15 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.1.4
+++ b/metadata/md5-cache/sys-fs/mdadm-3.1.4
@@ -8,5 +8,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f03f065eefc19fd75a5aaf8b32affd7
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.1.5 b/metadata/md5-cache/sys-fs/mdadm-3.1.5
index d755af78de71..8fcbbb5d16b9 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.1.5
+++ b/metadata/md5-cache/sys-fs/mdadm-3.1.5
@@ -8,5 +8,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64624f48ab43c8ef13a930e1e3f62311
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.2.3-r1 b/metadata/md5-cache/sys-fs/mdadm-3.2.3-r1
index 5deea4d4b692..0d2dc5d02477 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.2.3-r1
+++ b/metadata/md5-cache/sys-fs/mdadm-3.2.3-r1
@@ -9,5 +9,5 @@ RDEPEND=!<sys-apps/baselayout-2 >=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.2.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da340b9847a2cc89aa4ff9e3f4b81ad5
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.2.5 b/metadata/md5-cache/sys-fs/mdadm-3.2.5
index 925947620678..6e7d5edfcb4a 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.2.5
+++ b/metadata/md5-cache/sys-fs/mdadm-3.2.5
@@ -9,5 +9,5 @@ RDEPEND=!<sys-apps/baselayout-2 >=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.2.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=691228af02bf0d8420c953214c503908
diff --git a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8 b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
index e7190ffa63d6..ee300063648f 100644
--- a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
+++ b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://reiserfs.linux.kiev.ua/snapshots/progsreiserfs-0.3.1-rc8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9196bc0c051b9dfafb853f82f9f0603c
diff --git a/metadata/md5-cache/sys-fs/quota-3.14-r1 b/metadata/md5-cache/sys-fs/quota-3.14-r1
index 5848bbd6d531..6627fe85bf1c 100644
--- a/metadata/md5-cache/sys-fs/quota-3.14-r1
+++ b/metadata/md5-cache/sys-fs/quota-3.14-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( net-nds/openldap ) tcpd? ( sys-apps/tcp-wrappers ) rpc? ( net-nds/portmap )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-3.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32d5514bfbc18e475b7b5c5c69c06009
diff --git a/metadata/md5-cache/sys-fs/quota-3.15 b/metadata/md5-cache/sys-fs/quota-3.15
index 71c202e8144e..64639fde0947 100644
--- a/metadata/md5-cache/sys-fs/quota-3.15
+++ b/metadata/md5-cache/sys-fs/quota-3.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) tcpd? ( sys-apps/tcp-wrappers ) rpc? ( net-nds/portmap )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-3.15.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16db06cbf41107f975cc3389e3b2ae25
diff --git a/metadata/md5-cache/sys-fs/quota-3.16 b/metadata/md5-cache/sys-fs/quota-3.16
index 0eab45605446..336a6927c658 100644
--- a/metadata/md5-cache/sys-fs/quota-3.16
+++ b/metadata/md5-cache/sys-fs/quota-3.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) tcpd? ( sys-apps/tcp-wrappers ) rpc? ( net-nds/portmap )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-3.16.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=32c67503b61a417fc64faef830ca2b38
diff --git a/metadata/md5-cache/sys-fs/quota-3.17 b/metadata/md5-cache/sys-fs/quota-3.17
index 10f0a6588b6f..e84b0c7f9534 100644
--- a/metadata/md5-cache/sys-fs/quota-3.17
+++ b/metadata/md5-cache/sys-fs/quota-3.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) tcpd? ( sys-apps/tcp-wrappers ) rpc? ( || ( net-nds/portmap net-nds/rpcbind ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-3.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6de7a1e6188cdfead6d5c68c760f1ef5
diff --git a/metadata/md5-cache/sys-fs/quota-3.17-r1 b/metadata/md5-cache/sys-fs/quota-3.17-r1
index 3c48fb666122..c0197cbceca7 100644
--- a/metadata/md5-cache/sys-fs/quota-3.17-r1
+++ b/metadata/md5-cache/sys-fs/quota-3.17-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) tcpd? ( sys-apps/tcp-wrappers ) rpc? ( || ( net-nds/portmap net-nds/rpcbind ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-3.17.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b55f64d714c49246f93e8f93646a160
diff --git a/metadata/md5-cache/sys-fs/quota-4.00 b/metadata/md5-cache/sys-fs/quota-4.00
index 1808f5a41a2b..266c89b69254 100644
--- a/metadata/md5-cache/sys-fs/quota-4.00
+++ b/metadata/md5-cache/sys-fs/quota-4.00
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl:1.1 ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-4.00.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48e3a37539a998bd01f76239b863a660
diff --git a/metadata/md5-cache/sys-fs/scan-ffs-1.2 b/metadata/md5-cache/sys-fs/scan-ffs-1.2
index 2c33a9d6f2dc..e79d32f723c5 100644
--- a/metadata/md5-cache/sys-fs/scan-ffs-1.2
+++ b/metadata/md5-cache/sys-fs/scan-ffs-1.2
@@ -6,5 +6,5 @@ KEYWORDS=~x86-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.ranner.jawa.at/stuff/scan_ffs-1.2.tar.bz2
-_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb3f5ffc19fa2f40a4515b62a3528b07
diff --git a/metadata/md5-cache/sys-fs/shake-0.31 b/metadata/md5-cache/sys-fs/shake-0.31
index 81bcb5634c80..01a5fa848082 100644
--- a/metadata/md5-cache/sys-fs/shake-0.31
+++ b/metadata/md5-cache/sys-fs/shake-0.31
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/attr
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/shake/shake-0.31.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76e0ccdf954e6e7836fa863f0efd8302
diff --git a/metadata/md5-cache/sys-fs/shake-0.99 b/metadata/md5-cache/sys-fs/shake-0.99
index 47440ecb4949..99c3f4af283e 100644
--- a/metadata/md5-cache/sys-fs/shake-0.99
+++ b/metadata/md5-cache/sys-fs/shake-0.99
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/attr
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/shake/shake-0.99.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1948d9a9aa0a40e767462233966f6ba
diff --git a/metadata/md5-cache/sys-fs/shake-0.999 b/metadata/md5-cache/sys-fs/shake-0.999
index fe6415b40146..9680dfbb5d22 100644
--- a/metadata/md5-cache/sys-fs/shake-0.999
+++ b/metadata/md5-cache/sys-fs/shake-0.999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/attr
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/shake/shake-0.999.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7fb90f26770208979ec2827fccc57334
diff --git a/metadata/md5-cache/sys-fs/udev-114 b/metadata/md5-cache/sys-fs/udev-114
index 26ef2cba5584..5ca33b36123b 100644
--- a/metadata/md5-cache/sys-fs/udev-114
+++ b/metadata/md5-cache/sys-fs/udev-114
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-114.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f772f63fc8e6e4c462627616dbff2c9b
diff --git a/metadata/md5-cache/sys-fs/udev-115-r1 b/metadata/md5-cache/sys-fs/udev-115-r1
index 1ef63c67857a..3073e07b584d 100644
--- a/metadata/md5-cache/sys-fs/udev-115-r1
+++ b/metadata/md5-cache/sys-fs/udev-115-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-115.tar.bz2 mirror://gentoo/udev-115-update-20079804.diff.bz2 http://dev.gentoo.org/~zzam/distfiles/udev-115-update-20079804.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2abd3e1a2b3807e6ef7dced3c548724
diff --git a/metadata/md5-cache/sys-fs/udev-119 b/metadata/md5-cache/sys-fs/udev-119
index 17e30966c25a..845cca676f39 100644
--- a/metadata/md5-cache/sys-fs/udev-119
+++ b/metadata/md5-cache/sys-fs/udev-119
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-119.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e20cc5be07c9e1dc246a5df8016d492
diff --git a/metadata/md5-cache/sys-fs/udev-124-r1 b/metadata/md5-cache/sys-fs/udev-124-r1
index 353824703243..e4f42b544411 100644
--- a/metadata/md5-cache/sys-fs/udev-124-r1
+++ b/metadata/md5-cache/sys-fs/udev-124-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-124.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9e8dd776882ea4f43aff8c99a1a5ec1
diff --git a/metadata/md5-cache/sys-fs/udev-124-r2 b/metadata/md5-cache/sys-fs/udev-124-r2
index fbd20a4b07ef..d6339ab879be 100644
--- a/metadata/md5-cache/sys-fs/udev-124-r2
+++ b/metadata/md5-cache/sys-fs/udev-124-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-124.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e965ebef17e89c3462488f36a63a4a9a
diff --git a/metadata/md5-cache/sys-fs/udev-141 b/metadata/md5-cache/sys-fs/udev-141
index 86db0a85a924..dd54e89d9c8a 100644
--- a/metadata/md5-cache/sys-fs/udev-141
+++ b/metadata/md5-cache/sys-fs/udev-141
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-141.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bee5172f42578887a025e07bfe072bc2
diff --git a/metadata/md5-cache/sys-fs/udev-141-r1 b/metadata/md5-cache/sys-fs/udev-141-r1
index 1ff8588db82e..81eba9b87611 100644
--- a/metadata/md5-cache/sys-fs/udev-141-r1
+++ b/metadata/md5-cache/sys-fs/udev-141-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) !sys-apps/coldplug !<sys-fs/device-mapper-1.02.19-r1 >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-141.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2c5e0c15184bfc16f843f087f803d47
diff --git a/metadata/md5-cache/sys-fs/udev-146-r1 b/metadata/md5-cache/sys-fs/udev-146-r1
index f7a3113bbc11..34b6a589bacf 100644
--- a/metadata/md5-cache/sys-fs/udev-146-r1
+++ b/metadata/md5-cache/sys-fs/udev-146-r1
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbut
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-146.tar.bz2 mirror://gentoo/udev-146-gentoo-patchset-v1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=949fdc2c0bea8c7a1353191764c13239
diff --git a/metadata/md5-cache/sys-fs/udev-149 b/metadata/md5-cache/sys-fs/udev-149
index bd433ab760a7..f0ab889804ff 100644
--- a/metadata/md5-cache/sys-fs/udev-149
+++ b/metadata/md5-cache/sys-fs/udev-149
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbutils-0.82 virtual/libusb:0 sys-apps/pciutils dev-libs/glib:2 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.9 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-149.tar.bz2 test? ( mirror://gentoo/udev-149-testsys.tar.bz2 ) mirror://gentoo/udev-149-gentoo-patchset-v1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c999d6a094c43d29c06432f9cf6ef271
diff --git a/metadata/md5-cache/sys-fs/udev-151-r4 b/metadata/md5-cache/sys-fs/udev-151-r4
index c937355a6ec0..69f5bd6f6d88 100644
--- a/metadata/md5-cache/sys-fs/udev-151-r4
+++ b/metadata/md5-cache/sys-fs/udev-151-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbutils-0.82 virtual/libusb:0 sys-apps/pciutils dev-libs/glib:2 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.9 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-151.tar.bz2 test? ( mirror://gentoo/udev-151-testsys.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f8ec275b6bdd255b40d3e25e12b566a
diff --git a/metadata/md5-cache/sys-fs/udev-164-r2 b/metadata/md5-cache/sys-fs/udev-164-r2
index 62e5447c517c..5c1e39ae1b54 100644
--- a/metadata/md5-cache/sys-fs/udev-164-r2
+++ b/metadata/md5-cache/sys-fs/udev-164-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl >=sys-apps/usbutils-0.82 virtual/libusb:0 sys-apps/pciutils dev-libs/glib:2 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.9 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-164.tar.bz2 test? ( mirror://gentoo/udev-151-testsys.tar.bz2 ) mirror://gentoo/udev-gentoo-scripts-164-v2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1caa15d84fa3d1336fa413cd36472dd2
diff --git a/metadata/md5-cache/sys-fs/udev-171-r5 b/metadata/md5-cache/sys-fs/udev-171-r5
index c488cf802996..0d9fb7f8e496 100644
--- a/metadata/md5-cache/sys-fs/udev-171-r5
+++ b/metadata/md5-cache/sys-fs/udev-171-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( sys-apps/acl dev-libs/glib:2 dev-libs/gobject-introspection virtual/libusb:0 ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 || ( ( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 ) >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] ) ) extras? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gentoo/udev-171-testsys.tar.bz2 ) mirror://gentoo/udev-171-gentoo-patchset-v1.tar.bz2 mirror://gentoo/udev-gentoo-scripts-7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cc96c3decf1ae6df78017ae0426f43be
diff --git a/metadata/md5-cache/sys-fs/udev-171-r6 b/metadata/md5-cache/sys-fs/udev-171-r6
index 2fc8b452ed3f..5585455473f8 100644
--- a/metadata/md5-cache/sys-fs/udev-171-r6
+++ b/metadata/md5-cache/sys-fs/udev-171-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( dev-libs/glib:2 dev-libs/gobject-introspection virtual/libusb:0 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 || ( ( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 ) >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] ) ) extras? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gentoo/udev-171-testsys.tar.bz2 ) mirror://gentoo/udev-171-gentoo-patchset-v1.tar.bz2 mirror://gentoo/udev-gentoo-scripts-7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16c7fcd87f9db2f62cd55df192c55ed5
diff --git a/metadata/md5-cache/sys-fs/udev-182-r2 b/metadata/md5-cache/sys-fs/udev-182-r2
index 5c70028b9809..f462bdcfd48b 100644
--- a/metadata/md5-cache/sys-fs/udev-182-r2
+++ b/metadata/md5-cache/sys-fs/udev-182-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 || ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] ) ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-10 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-182.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69ea9da7f992f8d76e907f2375e08e9a
diff --git a/metadata/md5-cache/sys-fs/udev-182-r3 b/metadata/md5-cache/sys-fs/udev-182-r3
index 12c59e599615..5bf467b4a5fa 100644
--- a/metadata/md5-cache/sys-fs/udev-182-r3
+++ b/metadata/md5-cache/sys-fs/udev-182-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.10 hwdb? ( sys-apps/hwids ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-10 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-182.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=405f12dccad0efa4f7b48cadaacdab89
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 9344fa764aa8..e36139143c9e 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.10 hwdb? ( sys-apps/hwids ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-10 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25
 RESTRICT=test? ( userpriv )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ab8b62d58dceb486a6d33b1e0d62fdc
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9
index 89147821a165..0e6de379e23f 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2
 RDEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a8711588d7a2adafb3c8f39de70d3b9
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index f9c18630a7ee..fe663edb98ed 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -7,5 +7,5 @@ IUSE=custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
 LICENSE=CDDL GPL-2
 RDEPEND==sys-kernel/spl-9999* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=168830b20655bc000e5988c9b17e1a66
diff --git a/metadata/md5-cache/sys-kernel/cell-sources-2.6.18-r6 b/metadata/md5-cache/sys-kernel/cell-sources-2.6.18-r6
index 83e582c65974..4d86fb89edee 100644
--- a/metadata/md5-cache/sys-kernel/cell-sources-2.6.18-r6
+++ b/metadata/md5-cache/sys-kernel/cell-sources-2.6.18-r6
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.18-r6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.18-arnd6/2.6.18-arnd6.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d15645c3f3df8a1484879b982c8c4cdd
diff --git a/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc5-r1 b/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc5-r1
index e24fb82f72c9..00f6559b53cd 100644
--- a/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc5-r1
+++ b/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc5-r1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.19_rc5-r1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/testing/patch-2.6.19-rc5.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.19-rc5-arnd1/2.6.19-rc5-arnd1.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5a74b065c485d22f306b29df6ad8d20
diff --git a/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc6-r1 b/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc6-r1
index 07efaaf702c2..eb8a639dcf0a 100644
--- a/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc6-r1
+++ b/metadata/md5-cache/sys-kernel/cell-sources-2.6.19_rc6-r1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.19_rc6-r1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.18.tar.bz2 http://kernel.org/pub/linux/kernel/people/arnd/patches/2.6.19-rc6-arnd1/2.6.19-rc6-arnd1.diff.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f0cbcfd9cd4207787d7cc7c188f8b99
diff --git a/metadata/md5-cache/sys-kernel/cell-sources-2.6.24-r1 b/metadata/md5-cache/sys-kernel/cell-sources-2.6.24-r1
index 56b5346daa88..13b629594342 100644
--- a/metadata/md5-cache/sys-kernel/cell-sources-2.6.24-r1
+++ b/metadata/md5-cache/sys-kernel/cell-sources-2.6.24-r1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~ppc ~ppc64
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.24-r1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.24.tar.bz2 mirror://kernel/linux/kernel/people/geoff/cell/ps3-linux/patch-ps3-linux-2.6.24-stable.1.bz2 mirror://gentoo/genpatches-2.6.24-4.base.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ef61597e08bbab9d5d609c58e371d87
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3 b/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
index 8481d3e439af..e9b0e084315b 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
+++ b/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.38-r3
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 mirror://gentoo/deblob-check-2.6.38 ) mirror://gentoo/genpatches-2.6.38-8.base.tar.bz2 mirror://gentoo/genpatches-2.6.38-8.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/2.6/2.6.38/2.6.38-ck3/patch-2.6.38-ck3.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=400c5b32215e3eeb4bbc373ea576abfa
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-2.6.39-r2 b/metadata/md5-cache/sys-kernel/ck-sources-2.6.39-r2
index b403ad0af2c6..1c14f7fedb51 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-2.6.39-r2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-2.6.39-r2
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.39-r2
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 mirror://gentoo/genpatches-2.6.39-4.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-4.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/2.6/2.6.39/2.6.39-ck2/patch-2.6.39-ck2.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec19dc334ff6757e8ae97df709d04a12
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.0.4 b/metadata/md5-cache/sys-kernel/ck-sources-3.0.4
index f9bcedbaf8c3..1d167541c25b 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.0.4
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.0.4
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-5.base.tar.bz2 mirror://gentoo/genpatches-3.0-5.extras.tar.bz2 mirror://kernel/linux/kernel/people/ck/patches/3.0/3.0.0-ck1/patch-3.0.0-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e6e25223c1aed3ca095a25575706b35
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.1.4 b/metadata/md5-cache/sys-kernel/ck-sources-3.1.4
index 22fb4dda35d4..1613f7622273 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.1.4
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.1.4
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 mirror://gentoo/genpatches-3.1-7.base.tar.bz2 mirror://gentoo/genpatches-3.1-7.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.1/3.1.0-ck2/patch-3.1.0-ck2.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7bd502eb8e474b561b1f0c9ba28d575
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.2.1 b/metadata/md5-cache/sys-kernel/ck-sources-3.2.1
index 1b41d8ab08b4..2301f2e025e7 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.2.1
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.2.1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fc7e7ca348e838c75e4f6c25ac74fcc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.2.5 b/metadata/md5-cache/sys-kernel/ck-sources-3.2.5
index cab4cd06542c..2046c8c0447f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.2.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.2.5
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-8.base.tar.bz2 mirror://gentoo/genpatches-3.2-8.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8388ee776664c4d9ba0ca562202629e9
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.2.6 b/metadata/md5-cache/sys-kernel/ck-sources-3.2.6
index a62f0e6402a7..d37dc6d91469 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.2.6
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.2.6
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-9.base.tar.bz2 mirror://gentoo/genpatches-3.2-9.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.2/3.2-ck1/patch-3.2-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=876eb69482b8c34a91a20b6e06683858
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.3.1 b/metadata/md5-cache/sys-kernel/ck-sources-3.3.1
index a3dd489d98fd..a6d61bbda05f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.3.1
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.3.1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 mirror://gentoo/genpatches-3.3-2.base.tar.bz2 mirror://gentoo/genpatches-3.3-2.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.3/3.3-ck1/patch-3.3-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0cd35c821d231cd290db1376794fa31
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.3.4 b/metadata/md5-cache/sys-kernel/ck-sources-3.3.4
index c7e9f4e6bb6c..0efb8b636d66 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.3.4
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.3.4
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2 http://ck.kolivas.org/patches/3.0/3.3/3.3-ck1/patch-3.3-ck1.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=853b765ae9ecea89148d837ab522db89
diff --git a/metadata/md5-cache/sys-kernel/cluster-sources-2.6.39 b/metadata/md5-cache/sys-kernel/cluster-sources-2.6.39
index af413c253ff7..54104dccf4fe 100644
--- a/metadata/md5-cache/sys-kernel/cluster-sources-2.6.39
+++ b/metadata/md5-cache/sys-kernel/cluster-sources-2.6.39
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.39
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 mirror://gentoo/genpatches-2.6.39-2.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-2.extras.tar.bz2 http://dev.gentoo.org/~alexxy/cluster/clusterpathches-2.6.39-2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78db7425b8c9dcf8f8fefd77fdd55214
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.17-r2 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.17-r2
index 05dffaeb98d4..6a380b6ed9da 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.17-r2
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.17-r2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.17-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-18.base.tar.bz2 mirror://gentoo/genpatches-3.0-18.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19f703cd2c3a5b616ea6d56e7b3e05ea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.33 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.33
index b10325c4bb01..cf35d2a9d292 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.33
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.33
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.33
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-25.base.tar.bz2 mirror://gentoo/genpatches-3.0-25.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=605c0923a3ee0d270f0222394dbb22f8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.35 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.35
index c624fd8bd4b0..201e54c090f1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.35
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.35
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.35
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-26.base.tar.bz2 mirror://gentoo/genpatches-3.0-26.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2d78e2299b2a2f83de1e9c1eba9ffb1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.36 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.36
new file mode 100644
index 000000000000..7ae82399195e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.36
@@ -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=Full sources including the Gentoo patchset for the 3.0 kernel tree
+EAPI=2
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.0.36
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-27.base.tar.bz2 mirror://gentoo/genpatches-3.0-27.extras.tar.bz2
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ba85f4703a70ff12a8b65e71237edcbe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.1.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.1.10-r1
index d8b9a9a1bfca..4a0a1eb4af26 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.1.10-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.1.10-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.10-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-14.base.tar.bz2 mirror://gentoo/genpatches-3.1-14.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=864f5fe2887e2d060878a6656f54a034
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.1-r2 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.1-r2
index 3535974e20d7..87393534d0ea 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.1-r2
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.1-r2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.1-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=788e2e7448c49606f0e4409df8970aa8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.12
index 1a044880ba67..5b57656eceb1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.12
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-12.base.tar.bz2 mirror://gentoo/genpatches-3.2-12.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b00240e1b65218f7ff9e41875dda0c6f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.14
index 1d09d90bd83c..79d170a226a3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.14
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.14
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-13.base.tar.bz2 mirror://gentoo/genpatches-3.2-13.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b14527b1c0a7be632d0eb573b5574a6e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.16
index bfcbc668e8ef..3911a5c56019 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.16
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.16
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a183bf2ceb5168c48d0fa95f3c39e9a9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.21 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.21
index eb9d6811b474..c21ff901a006 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.21
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.21
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.21
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-16.base.tar.bz2 mirror://gentoo/genpatches-3.2-16.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d835500d4adddb7f83be8778d5e9513
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.7
index 5e45c11eea6f..93c398e2e7a0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.7
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-8.base.tar.bz2 mirror://gentoo/genpatches-3.3-8.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e201c70f38b52f45bf2686dc43a3159
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8
index 4ebb05bb9a43..5e9b6dd66690 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e155b564e8877c90c2bdc3fe9648103
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8-r1
index 9c84e197303e..94076d137134 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.3.8-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.8-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) mirror://gentoo/genpatches-3.3-10.base.tar.bz2 mirror://gentoo/genpatches-3.3-10.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91ebe35876355805f5101761fc0a9185
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.0
index dfc4cccb4162..dd17e42f32cf 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.0
@@ -7,9 +7,9 @@ IUSE=deblob symlink build
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e50f7bdc302bd02ba1b7929abce18e5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2
index 82e781532aa8..19addc8b7f54 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05ad6ec2b8dbe1c22d23929eecaea0f9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2-r1
index 097bc3ea1a1d..d1a46271b0f8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.2-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-3.base.tar.bz2 mirror://gentoo/genpatches-3.4-3.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5803585e9f7f7f75803a7aa1a5b4dc5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.3
index a9e52bf07725..e56df4c7fcb4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.3
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-4.base.tar.bz2 mirror://gentoo/genpatches-3.4-4.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=50bd354ddd29eb6dfb6dcc89b66619b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.4
new file mode 100644
index 000000000000..170c657d8c1f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.4
@@ -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=Full sources including the Gentoo patchset for the 3.4 kernel tree
+EAPI=3
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.4
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-5.base.tar.bz2 mirror://gentoo/genpatches-3.4-5.extras.tar.bz2
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d7a4518ed8f9574596a30b73093e7694
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1 b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1
index b50e430bf934..333857a919c3 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1
@@ -7,9 +7,9 @@ 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 )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 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	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2666303516644f07c41dca2a304f735a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc2 b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc2
index b9a8e5d8df3a..723e48bb680b 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc2
@@ -7,9 +7,9 @@ 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 )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.5_rc2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d029395c3ba24688c3b68e4fcab70e7e
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc3 b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc3
index 1ad1c0559fd4..141068374be5 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc3
@@ -7,9 +7,9 @@ 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 )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.5_rc3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d1a08edd00800ab14a8f22d7bc95dbfa
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r108 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r108
index 73fa4df3effb..57559461f0b4 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r108
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r108
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r108
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-110.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc38ad8d6cf877c7d1010681a170bfcf
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r109 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r109
index e1a0dada7003..69d4f9a1ed25 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r109
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r109
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r109
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-111.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7bafbf97ba8d670672273f4b43e2d4b
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110
index 25c67cd16f6c..da776acb90b4 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r110
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-112.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30be45e3c0c6c62e292d5e9c30d372e9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r111 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r111
index 996017e0d392..442628bdf255 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r111
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r111
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r111
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-113.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ee10bd7db230d431fa191de75b05a70
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r112 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r112
index 1dda367dd929..6985a2b7e6c2 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r112
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r112
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r112
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-114.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8841fe5d1954b5c3241ad4243f957c45
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r42 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r42
index 96d0adb17a40..b284ac97731f 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r42
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r42
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=ppc64
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r42
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-45.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-34.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-34.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7438f0fbd7fa041ed72447c05f23cfe9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r90 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r90
index f9f0b643d70f..1859ac692a83 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r90
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r90
@@ -7,9 +7,9 @@ IUSE=deblob -xtpax symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r90
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-92.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1179e16cf73fc740dfdd1f7ca385f3c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r95 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r95
index a0e8cc4755bf..f26d1e5dbd16 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r95
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r95
@@ -7,9 +7,9 @@ IUSE=deblob -xtpax symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r95
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-97.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f8be1d99f9150637481927e563ca5c9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.11 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.11
index 5cd91ebd3f67..0df87da9aeee 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.11
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.11
@@ -7,9 +7,9 @@ IUSE=deblob -xtpax symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.11
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.11-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-11.base.tar.bz2 mirror://gentoo/genpatches-3.2-11.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c52a0a4b5d3473d312a756af689bfdb2
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19
index 67df875bb23b..545c27008e87 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.19
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.19-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87578ccc584ac9cf80766cbaf174a979
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19-r1
index 8b0081a55569..3d2814cba987 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.19-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.19-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.19-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf31bb3682998f7fd27b7b0c449375b5
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.2-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.2-r1
index d6192e7d5d66..c4bf820762a6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.2-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.2-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.2-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.2-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-5.base.tar.bz2 mirror://gentoo/genpatches-3.2-5.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce85670870bc14afe78d3562f72fa05d
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20
index 38bf48869737..af0ef289b45a 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.20
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0a44e0222557dfd926821a23e6e821c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20-r1
index 499e1ebf8ec0..06361409ffd7 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.20-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aeea904d38bf56b0d84456d06bae5a51
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.21 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.21
index 6f260b957ac0..20b8eeb35394 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.21
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.21
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.21
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.21-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.bz2 mirror://gentoo/genpatches-3.2-16.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5282ed00940845a6ea5da71da413c60
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.8 b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.8
index eb61d3b33e38..97e8bd56150d 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.8
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.8
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6771e0dd29872ed849bddac60a42abef
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.1
index 7a4dd830c01d..a6823c72b76a 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e0946168fa14458226316522d6856bf
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2
index 42135b45140e..10c88d302eba 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f6162f0b64646d927453189980a49b0
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3
index b7ac0a552f45..a1efaec6dd9c 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.3-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df7921a1dbf07b966ce3aa2fd4af8df6
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3-r1
index 19cdb4910747..56be61865322 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.3-r1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.3-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.3-2.extras.tar.bz2 mirror://gentoo/genpatches-3.4-4.base.tar.bz2 mirror://gentoo/genpatches-3.4-4.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=001a184ace7ebef6de8e026d8ae70809
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
index bec2bd2c2de3..e9ac01807874 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/patch-2.4.33.3.bz2 mirror://kernel/linux/kernel/v2.4/linux-2.4.33.tar.bz2 mirror://gentoo/gentoo-headers-2.4.33-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5870854d7bdb4d430a7c4a2a27a48551
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
index ef7cfdc020fa..50432bb0b0b6 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/linux-2.4.36.tar.bz2 mirror://gentoo/gentoo-headers-2.4.36-1.tar.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=39ea1d15cf30c70a801e709b470d9ed8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.1 b/metadata/md5-cache/sys-kernel/linux-headers-3.1
index d204b0c7ac42..68dac9124cc8 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.1.tar.xz mirror://gentoo/gentoo-headers-3.1-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eff2bb73a854ba6b3f76bb9cf65ecd34
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
index 861f67ca1ea2..9c2414628f5f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.2.tar.xz mirror://gentoo/gentoo-headers-3.2-3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb83a8f51725ac56939d03217f92e8d2
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.3 b/metadata/md5-cache/sys-kernel/linux-headers-3.3
index f78ff20e86bf..3ccc90162cb4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.3.tar.xz mirror://gentoo/gentoo-headers-3.3-2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eab5bb6562e27a177982f8d6ea4d5d56
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4 b/metadata/md5-cache/sys-kernel/linux-headers-3.4
index 61929d668eb5..7139c2af45d5 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e6d7ce2571d74f109b5b21d2447f25b
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1 b/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
index def0a94927f7..ba80213965f8 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
+++ b/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
@@ -6,9 +6,9 @@ IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug symlink build deblob
 KEYWORDS=-* ~mips
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.29
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.29.1.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.29.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.29.N/deblob-2.6.29 mirror://gentoo/deblob-check-2.6.29 ) mirror://gentoo/mipsgit-2.6.29-20090324.diff.bz2 mirror://gentoo/mips-sources-2.6.29-patches-v3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=14d4de22415af2bf1f20c1842dacd087
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1 b/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1
index a0bc9491c494..23aecf679367 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1
@@ -7,9 +7,9 @@ IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/mipsgit-3.0.0-20110821.diff.xz mirror://gentoo/mips-sources-3.0.0-patches-v3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1015bce8b828ccb9d3ca08e1627cd853
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.1.6 b/metadata/md5-cache/sys-kernel/mips-sources-3.1.6
index a0ac32ff256b..c46b7a67d573 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.1.6
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.1.6
@@ -7,9 +7,9 @@ IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.1.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 mirror://gentoo/mipsgit-3.1.0-20111216.diff.xz mirror://gentoo/mips-sources-3.1.0-patches-v2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aca1c5c22ee972e0636929240f856dc4
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.18.028.099.3 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.18.028.099.3
index 81e0335a58f5..090d2e29b82f 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.18.028.099.3
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.18.028.099.3
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.18.028.099.3
 SRC_URI=mirror://kernel/linux/kernel/v./linux-2.6.18.tar.bz2 http://download.openvz.org/kernel/branches/rhel5-2.6.18/028stab099.3/patches/patch-308.el5.028stab099.3-combined.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24d3311648de8caba6842afdbb59192a
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.11.1 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.11.1
index d7b0e5d5716a..53fe02e853a4 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.11.1
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.11.1
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=amd64 ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32-feoktistov.1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/2.6.32/2.6.32-feoktistov.1/patches/patch-feoktistov.1-combined.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1efcecb67273b7c0aee16c1958b92bc9
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.49.6 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.49.6
index a1d470a668b4..50014b64438d 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.49.6
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.49.6
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=amd64 ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32.49.6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab049.6/patches/patch-042stab049.6-combined.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c568fa5cc5162a7754df3d976be26bb1
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.53.5 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.53.5
index eb6f339afaca..e893529910d7 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.53.5
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.53.5
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32.53.5
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab053.5/patches/patch-042stab053.5-combined.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2a568dfb49c758382ca3705faaa7390
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
index 5d16e7a14fbc..84e9f1b78f68 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.31_p9
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-2.6.31 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-check -> deblob-check-2.6.31 ) http://pf.natalenko.name/sources/2.6.31/patch-2.6.31-pf9.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd331a7d324618929cd38ea0d01dab62
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
index c0e5e8751498..5e7ff4b8c22f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32_p16
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://pf.natalenko.name/sources/2.6.32/patch-2.6.32-pf16.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b06dad5dd74deec41cc7d3f01c2b7484
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
index e8e826e8a1d7..4bb5c4d6d77a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.33_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-2.6.33 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-check -> deblob-check-2.6.33 ) http://pf.natalenko.name/sources/2.6.33/patch-2.6.33-pf4.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9fc64d0b66eb375ec0e7c36d9cf5ec1b
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
index 402a533520cd..b213a71b404c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.34_p7
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-check -> deblob-check-2.6.34 ) http://pf.natalenko.name/sources/2.6.34/patch-2.6.34-pf7.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3b72d6d240aba9876e97cf7c0f2be51
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
index 568cd8603389..ac64ce0e0209 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.35_p11
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) http://pf.natalenko.name/sources/2.6.35/patch-2.6.35-pf11.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21dc30de791a3f5e5dd53b594af2e619
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
index 3da189b10307..97190151d1ed 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
@@ -7,9 +7,9 @@ IUSE=experimental symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.36_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://pf.natalenko.name/sources/2.6.36/patch-2.6.36-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8bb54c49790e515d799bf06a2a4eb2db
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
index b57d4f57900f..49db5e4e72c6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
@@ -7,9 +7,9 @@ IUSE=experimental symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.37_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-2.6.37 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-check -> deblob-check-2.6.37 ) http://pf.natalenko.name/sources/2.6.37/patch-2.6.37-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=216ee2afa4fa2b58e6c2242447d303ff
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
index 99e857033b7a..5cce7a8504cd 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.38_p8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) http://pf.natalenko.name/sources/2.6.38/patch-2.6.38-pf8.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16b05a921a44d0f2763e1191f84c44f4
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
index f38a22b2f876..ba0c1c7f2eb5 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.39_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 http://pf.natalenko.name/sources/2.6.39/patch-2.6.39-pf4.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=81983e8c67fff603b98bb3ff2dbc38fa
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
index 0b92a4bad770..727455a65a19 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.7-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dc6e5c83c99873f71997691374a4d35f
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
index 2626feaf61a6..bbbb0903ce7a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.6-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=662493a02968941b797d2bd135c01374
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7 b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
index 95f82207f732..dcd7ee6ef607 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://pf.natalenko.name/sources/3.2/patch-3.2.7-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b8c064a1b10639574a7b5bd243cc82ca
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
index 7f1e19ad9cc7..b02453a7adb5 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://pf.natalenko.name/sources/3.3/patch-3.3.6-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9acef6892495fe23032806232de2cca
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.1 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.1
index cf86e4fd14d8..835a834aa5d1 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.4.1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.1
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.1-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82a87a99ee5602ed3f43d03ec25cdcf6
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.2 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.2
index 0f9dbbf78587..d8dc2a817165 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.4.2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.2
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.2-pf.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0a0587b7567db987537166d909d3c160
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.1.5 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.1.5
index 9dfdfb2a6183..f9a1d6a4a6ca 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.1.5
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.1.5
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.1.5-1.extras.tar.bz2 mirror://gentoo/genpatches-3.1-8.base.tar.bz2 mirror://gentoo/genpatches-3.1-8.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0aeb2665ed4caa0fbe9da6d843117f00
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.2.19 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.2.19
index 7ec48237aa08..07153e086c71 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.2.19
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.2.19
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.19
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.2.19-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5462b62f346b5935b2c9913cc0fffe8
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.3.8 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.3.8
index f9bd1070eb91..ba623d7b0dc4 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.3.8
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.3.8
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.3.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0614112ba210200c419d2a3ec4652ecd
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.4.1 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.4.1
index a1a00794b3bb..23070dc30c02 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.4.1
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.4.1
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/rsbac-patches-3.4.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-1.base.tar.bz2 mirror://gentoo/genpatches-3.4-1.extras.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0c01bc527ffe9e28fb0c49ce86ff662
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31 b/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31
index 7bc47bf54589..240e36e2a3ce 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.0.14_p31
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.14_p31
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://kernel/linux/kernel/projects/rt/3.0/patch-3.0.14-rt31.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e75e9a1c9ce70706235de5a8257d5852
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.0.27_p46 b/metadata/md5-cache/sys-kernel/rt-sources-3.0.27_p46
index 817f98839b39..8ed30fcd6ac6 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.0.27_p46
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.0.27_p46
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.27_p46
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.27.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://kernel/linux/kernel/projects/rt/3.0/patch-3.0.27-rt46.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25609fffdced695122ac5aa0f8c93000
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.2.14_p24 b/metadata/md5-cache/sys-kernel/rt-sources-3.2.14_p24
index 547bf7ecf983..870d6614ea4f 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.2.14_p24
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.2.14_p24
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.14_p24
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://kernel/linux/kernel/projects/rt/3.2/patch-3.2.14-rt24.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52b6418ac0a3f34ed837c15222d0eac6
diff --git a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc9 b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc9
index 88e8ad67bf08..1e43be010bfd 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.6.0_rc9
+++ b/metadata/md5-cache/sys-kernel/spl-0.6.0_rc9
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de9a96e5297661d045bb9a5bb6f1a7b0
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index 3e8df6e80894..3e4a53f588be 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -7,5 +7,5 @@ IUSE=custom-cflags debug kernel_linux
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=!sys-devel/spl kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea7de26e85ccf7c7b0437144bca33882
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1
index cb8bc3cb952d..5f2184d79294 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.17-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-18.base.tar.bz2 mirror://gentoo/genpatches-3.0-18.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e86108f946589bacdc5ebc7d1e55fba6
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.33 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.33
index 298165953ac8..2c6da3af237c 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.33
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.33
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.33
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-25.base.tar.bz2 mirror://gentoo/genpatches-3.0-25.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f06142861ff21c1238a206af614a3fc
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.35 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.35
index fd8483d3546a..b6cffcfbd679 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.35
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.35
@@ -7,9 +7,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.35
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-26.base.tar.bz2 mirror://gentoo/genpatches-3.0-26.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5f41ff967c9e6e8bee059fd8f15cb36
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.16.62 b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.16.62
index 17307e9e789b..c4fc1360b366 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.16.62
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.16.62
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=alpha ~amd64 arm ia64 ppc ppc64 s390 sparc x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.16.62
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.62.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5c246430532ebf7edb8e7a8fbba85657
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.58 b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.58
index fb321b3e55df..2485343e269f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.58
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.58
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32.58
 SRC_URI=mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/patch-2.6.32.58.bz2 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d03616467c5f2ef9e54a9fe1aa6c8b7
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.59 b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.59
index 2b3b8fa2a907..f2fb076f78de 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.59
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.32.59
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32.59
 SRC_URI=mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/patch-2.6.32.59.bz2 mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c54379d35415f3578940ec7f5b490ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.7
index 3427b8d0f8fa..30cf5d642694 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.7
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.7
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.38.7
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.38.7.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d5b67c97da75e4d716cccd19226a494
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.8
index c12002b05ce0..f72731448e4d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-2.6.38.8
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.38.8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.38.8.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ffbd6afa4147486f523a3e872e773a36
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.34 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.34
index db0854a6bb04..466028efb91c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.34
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.34
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.34
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.34.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c900014eddd8369d6a0566947d921b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.35 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.35
index 21e65ff97a61..0f729d8d327c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.35
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.35
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.35
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.35.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d63905107f31668ce1b562ffd591ca1b
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.36 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.36
index fabe3a7e4647..d9bc68e4bcf3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.36
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.36
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.0.36
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.36.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4922e71bc3f80bf7c324ec73d08f34e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.10 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.10
index cf886dc8af2a..f9960d32892b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.10
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.10
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.10
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.1.10.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fb1f88db6afb9240ac4cbe72f557446
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.6
index 8448331e9c78..a00d4fa62593 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.6
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.1.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4c4e982a30a34e48eb9ba407a5d15d2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.9 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.9
index dc2d27f1a5c3..0025d3c0a626 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.9
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.1.9
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.1.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.1.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f48262d37eb62e48adb90d5df53a1b7
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.12
index 7e8d2a3f9d0a..1ef8628f3f25 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.12
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.12.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f9a4f43066facf65dbba5dcb6086093
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.19
index d989c0524915..f5d956ead751 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.19
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.19
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.19.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31f21cea89694529fbb2c952e076f16f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.2
index 23c7bbac9553..0c6469400402 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=685370b4dee51ba2fbf62a0ce970f8b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.20 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.20
index 535429733e29..439f8929e670 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.20
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.20
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.20
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.20.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2925064db381f5e4aa504949ca65dac2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.21 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.21
index 17bf92de9feb..b1b7c91e521e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.21
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.21
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.2.21
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.21.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=742c5be285b17d47a0c07b43cd6049b5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.0
index 9087dd8342a5..0462b94bf9df 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.0
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a417ebc7c5b4c3654c9086a2f13e1d95
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.5 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.5
index 7fb6cd71b7ac..be348fa99adb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.5
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.5.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e52c9435c15baf49a55649a1a078e9b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.6
index 35143d00dbbb..9435cc94dfcc 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.6
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e866221447bafbba08421ed6fac27bc2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.8
index 8a47d5327510..da8c119dacf3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.3.8
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.3.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.8.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16e2cc68e6480772017a2491c92f43bb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.0
index 1a0a594c6c9e..d5ab37d46d1c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.0
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9fae8882ea00f19dfe19de743ef2db9e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.1 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.1
index eda6b32f424e..2f4b3bee9a31 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.1
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a06cf184c9e46777524962cbfaa7acfe
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.2
index ef93784c6a3a..66abe8cda314 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.2
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e5c9cc40311680bff0cd0c500f13e8f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.3
index 8e1c60cf222f..82cbc4367a69 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.3
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=996bd87381d2c3b7bf872d0fd18dcb95
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.4
index 331333939698..06f36bd5a2ef 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.4
@@ -7,9 +7,9 @@ IUSE=deblob symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.4.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.4.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9c5871514f2ca427d5eddf3487bb677
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
index 7e45191125ba..8aa51d80796b 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.0.36.32
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 mirror://gentoo/deblob-check-2.6.35 ) mirror://gentoo/genpatches-2.6.35-9.base.tar.bz2 mirror://gentoo/genpatches-2.6.35-9.extras.tar.bz2 http://dev.gentoo.org/~hollow/distfiles/vserver-patches-2.6.35_2.3.0.36.32.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8364d444ded1c64209dc59237493179
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
index dcd3330b7ee0..8558cecb3a4c 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.2.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.11.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.2.11-vs2.3.2.8.diff
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4189c8d94b47bfcfd482ed073953c3d2
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
index 5e37bd7feb0b..c35d183ca9e9 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.3.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.3.1-vs2.3.3.2.diff
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9b7c64a56d11fbef6159bebe5764ed1
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
index faf1e97bbbeb..4c515c7948f2 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.3.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.5.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.3.5-vs2.3.3.3.diff
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef35f820c1e39c805fa0f1ba6e17577a
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
index 77339f97deb6..cc0d9d5b3dee 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.3.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.4-vs2.3.3.4.diff
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d67090ab510aae28800ddf70f0d6540
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
index 60988240741a..ac1fd16fa1c9 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.3.3.4-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.4.1-vs2.3.3.4.diff
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c24852139a421aff4ebdc6b59a76d703
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 16df02821a24..0cce90d9736b 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -6,9 +6,9 @@ IUSE=symlink build
 KEYWORDS=~x86 -*
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.bz2 mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18a8adf76a66c31fda2e07e86b9ec420
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.30_p11 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.30_p11
index 7fcd2fc8dd67..4a873370f0dd 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.30_p11
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.30_p11
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.30_p11
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.30.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.30.N/deblob-2.6.30 mirror://gentoo/deblob-check-2.6.30 ) http://downloads.zen-kernel.org/2.6.30/2.6.30-zen11.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eeb776cf862070c4822a6bea9e281eaf
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.31_p12 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.31_p12
index d98ff329e920..5d0dfc560a14 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.31_p12
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.31_p12
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.31_p12
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-2.6.31 mirror://gentoo/deblob-check-2.6.31 ) http://downloads.zen-kernel.org/2.6.31/2.6.31-zen12.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b6d06cf56e1dd75c49b73ef8340a563
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.32_p7-r1 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.32_p7-r1
index 6af4c425358f..724f244ae2db 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.32_p7-r1
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.32_p7-r1
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.32_p7-r1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 mirror://gentoo/deblob-check-2.6.32 ) http://downloads.zen-kernel.org/2.6.32/2.6.32-zen7.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb9753851a6695982c101eb8f63ca385
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.33_p3 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.33_p3
index 2dad83b991c5..d690da21a733 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.33_p3
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.33_p3
@@ -6,9 +6,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.33_p3
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-2.6.33 mirror://gentoo/deblob-check-2.6.33 ) http://downloads.zen-kernel.org/2.6.33/2.6.33-zen3.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=95250518fc091ec8b7dd13a45d0255a4
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.34_p1-r2 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.34_p1-r2
index d146722b7749..36c6b2b13098 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.34_p1-r2
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.34_p1-r2
@@ -7,9 +7,9 @@ IUSE=bfq symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.34_p1-r2
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-check -> deblob-check-2.6.34 ) http://downloads.zen-kernel.org/2.6.34/2.6.34-zen1.patch.lzma bfq? ( http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch -> 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f06b5730ce20513fcbad41fbe6236b0
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.35_p2 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.35_p2
index 2796015e3e30..6dfb283258e6 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.35_p2
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.35_p2
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.35_p2
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) http://downloads.zen-kernel.org/2.6.35/2.6.35-zen2.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f754fe4be0cceff2efab9b51bbd42254
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p1 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p1
index 6a9e70fc3a87..86a1e524a357 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p1
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p1
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.36_p1
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://downloads.zen-kernel.org/2.6.36/2.6.36-zen1.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1257fc07738ab0a743c338434ecb346
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p2 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p2
index e04c7be9aab5..c47570a988e9 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p2
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.36_p2
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.36_p2
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://downloads.zen-kernel.org/2.6.36/2.6.36-zen2.patch.lzma
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a32369916252c5c869bbc4e10ae7db42
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.37_p20110325 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.37_p20110325
index a9d9fdb15dd5..2ec8941437ea 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.37_p20110325
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.37_p20110325
@@ -7,9 +7,9 @@ IUSE=symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.37_p20110325
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-2.6.37 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-check -> deblob-check-2.6.37 ) http://dev.gentoo.org/~hwoarang/distfiles/zen-patch-2.6.37_p20110325.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1fd5089642f1d584050ae5b68950510
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-2.6.38_p20110510 b/metadata/md5-cache/sys-kernel/zen-sources-2.6.38_p20110510
index e6e778c46c04..c994fe2e9dfe 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-2.6.38_p20110510
+++ b/metadata/md5-cache/sys-kernel/zen-sources-2.6.38_p20110510
@@ -7,9 +7,9 @@ IUSE=tuxonice symlink build deblob
 KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=2.6.38_p20110510
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) http://dev.gentoo.org/~hwoarang/distfiles/zen-patch-2.6.38_p20110510.diff.gz tuxonice? ( http://tuxonice.net/files/tuxonice-3.2-for-2.6.38.patch.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9474ada25fdcefcc0d7d41fec9145db9
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-9999 b/metadata/md5-cache/sys-kernel/zen-sources-9999
index 70247a2e7cc0..969a3aa414a3 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-9999
@@ -6,8 +6,8 @@ HOMEPAGE=http://zen-kernel.org
 IUSE=+minimal symlink build
 LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=9999
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	git-2	15733ab6a6feb34af9837b41623c2bad	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	git-2	15733ab6a6feb34af9837b41623c2bad	kernel-2	dd451098928ff900df7c254820871c00	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bce4ccb9c1433f465f53ca7733580a1
diff --git a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1 b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
index 0cc3870adaa1..666b78f75193 100644
--- a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
+++ b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
@@ -8,5 +8,5 @@ LICENSE=DB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=702636425faa984f19a29d449bb38a35
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1
index b9965f954baf..0b22ad1cbcd8 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1
@@ -8,5 +8,5 @@ LICENSE=DB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f70ec780df395d462c700cc5b3f69d8c
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
index 380dab69e454..96a4f5c90d47 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
@@ -8,5 +8,5 @@ LICENSE=DB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69800239f614418733f5ef94353cb00a
diff --git a/metadata/md5-cache/sys-libs/db-4.4.20_p4 b/metadata/md5-cache/sys-libs/db-4.4.20_p4
index 9b8811f06920..f3aeaa857035 100644
--- a/metadata/md5-cache/sys-libs/db-4.4.20_p4
+++ b/metadata/md5-cache/sys-libs/db-4.4.20_p4
@@ -8,5 +8,5 @@ LICENSE=OracleDB BSD
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.4
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.4.20.tar.gz mirror://gentoo/db-4.4.20-20060110-rpc_server-java.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.4
-_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e31f9e4d71fbeced8adf0f01138da09
diff --git a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1 b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
index 4ade1376a733..4977c3d807c7 100644
--- a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
+++ b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
@@ -8,5 +8,5 @@ LICENSE=OracleDB BSD
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.4
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.4.20.tar.gz mirror://gentoo/db-4.4.20-20060110-rpc_server-java.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.4
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cc4afc33cd6f2b4c8257da865c12c467
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2 b/metadata/md5-cache/sys-libs/db-4.5.20_p2
index 0fc4b7c9b646..28bdc8e31a57 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
-_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea3c71f20c3083bea1d301ba04a5fc1f
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1 b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
index 5f20afcbbc6d..8b089db2bc6d 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e497c8f5000f5e2a607a68e2804acdc
diff --git a/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/metadata/md5-cache/sys-libs/db-4.6.21_p4
index 27b94f9b1948..c38daba7eb94 100644
--- a/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91514cc446f62a20ec6b79f9c8dbc6f6
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p3 b/metadata/md5-cache/sys-libs/db-4.7.25_p3
index 6334141e3b2f..ef8185cc8003 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p3
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p3
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af87b77bd94f6825b0fbe58b8f3f9dc6
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p4 b/metadata/md5-cache/sys-libs/db-4.7.25_p4
index 82690349a21f..26fb713b1f57 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p4
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p4
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f30d04f03f4e96b5f0b5a278b0e08381
diff --git a/metadata/md5-cache/sys-libs/db-4.8.24 b/metadata/md5-cache/sys-libs/db-4.8.24
index e68ec2df0cd3..9f2ae257bf87 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.24
+++ b/metadata/md5-cache/sys-libs/db-4.8.24
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.24.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3968479764a6462100a694c6fc13b6a
diff --git a/metadata/md5-cache/sys-libs/db-4.8.26 b/metadata/md5-cache/sys-libs/db-4.8.26
index 30e530caa577..ae9f6bf809f4 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.26
+++ b/metadata/md5-cache/sys-libs/db-4.8.26
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=508f6749016b22a77e928e1f312fb09d
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30 b/metadata/md5-cache/sys-libs/db-4.8.30
index 0e7d3637bbc0..e1e37166e658 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30
+++ b/metadata/md5-cache/sys-libs/db-4.8.30
@@ -8,5 +8,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb3652d781e30d1c2105e870cc4bd0dc
diff --git a/metadata/md5-cache/sys-libs/db-5.0.21-r1 b/metadata/md5-cache/sys-libs/db-5.0.21-r1
index 4679d9fa3ae7..c80ce509b150 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.21-r1
+++ b/metadata/md5-cache/sys-libs/db-5.0.21-r1
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.21.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc40cfd4ad32295cab2f88b9e8de971f
diff --git a/metadata/md5-cache/sys-libs/db-5.0.26 b/metadata/md5-cache/sys-libs/db-5.0.26
index 6a9b699c74d5..a98b7b9faada 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.26
+++ b/metadata/md5-cache/sys-libs/db-5.0.26
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.26.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bae9dcf5cbdd20afef74a85b703f7ac5
diff --git a/metadata/md5-cache/sys-libs/db-5.0.32 b/metadata/md5-cache/sys-libs/db-5.0.32
index 2b882d0a3f5f..26070763594f 100644
--- a/metadata/md5-cache/sys-libs/db-5.0.32
+++ b/metadata/md5-cache/sys-libs/db-5.0.32
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.0.32.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f29877585105926a768248fbfa5a1e8
diff --git a/metadata/md5-cache/sys-libs/db-5.1.19-r2 b/metadata/md5-cache/sys-libs/db-5.1.19-r2
index cccc7c6fccb0..534af3a5d899 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.19-r2
+++ b/metadata/md5-cache/sys-libs/db-5.1.19-r2
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.19.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=65974e895cf3dd6ffbc01443c35f0eab
diff --git a/metadata/md5-cache/sys-libs/db-5.1.25 b/metadata/md5-cache/sys-libs/db-5.1.25
index b70fee309cc3..344219ea9995 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.25
+++ b/metadata/md5-cache/sys-libs/db-5.1.25
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.25.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0963f4b6ecd321ab0649a5f8e8a16194
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29 b/metadata/md5-cache/sys-libs/db-5.1.29
index 158d72af2251..c97b06e3793d 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29
+++ b/metadata/md5-cache/sys-libs/db-5.1.29
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=80174b9e8bb4dd88dfc77d90a7cbc8d3
diff --git a/metadata/md5-cache/sys-libs/db-5.2.28 b/metadata/md5-cache/sys-libs/db-5.2.28
index 5b1e72bdbb1b..b0d966da0a2a 100644
--- a/metadata/md5-cache/sys-libs/db-5.2.28
+++ b/metadata/md5-cache/sys-libs/db-5.2.28
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.2.28.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b533897b37c668a197879cb4348b92ce
diff --git a/metadata/md5-cache/sys-libs/db-5.2.36 b/metadata/md5-cache/sys-libs/db-5.2.36
index 74f871c0ec2c..535cff0eca70 100644
--- a/metadata/md5-cache/sys-libs/db-5.2.36
+++ b/metadata/md5-cache/sys-libs/db-5.2.36
@@ -9,5 +9,5 @@ LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.2.36.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	db	c1077ca6f281773041d05de908dff93c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4a204d09ef3cac2947fd0253711d9c7e
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.41.7 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.41.7
index 3f824a83a45e..9a35b43fe855 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.41.7
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.41.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.41.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7087b86007d2fdc2633ac1ff69b78524
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.8.3-r4 b/metadata/md5-cache/sys-libs/gdbm-1.8.3-r4
index 78e43d84288b..030164ae6531 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.8.3-r4
+++ b/metadata/md5-cache/sys-libs/gdbm-1.8.3-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=berkdb? ( sys-libs/db )
 SLOT=0
 SRC_URI=mirror://gnu/gdbm/gdbm-1.8.3.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1848287ea8437406fc300f596a5445f
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2 b/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2
index 2d54d58cc657..09a7f6bbef16 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2
+++ b/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gdbm/gdbm-1.9.1.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4c98f44a1f5d47abe547b576b744757
diff --git a/metadata/md5-cache/sys-libs/glibc-2.10.1-r1 b/metadata/md5-cache/sys-libs/glibc-2.10.1-r1
index 7351e2ec7584..386ac1911778 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.10.1-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.10.1-r1
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) sys-libs/timezo
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.10.1.tar.bz2 mirror://gentoo/glibc-2.10.1.tar.bz2 mirror://gnu/glibc/glibc-libidn-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-libidn-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-libidn-2.10.1.tar.bz2 mirror://gentoo/glibc-libidn-2.10.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.10.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.10.1.tar.bz2 mirror://gentoo/glibc-ports-2.10.1.tar.bz2 mirror://gentoo/glibc-2.10.1-patches-7.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.10.1-patches-7.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.10.1-patches-7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=324b979e3ee0a9d9fe274c96fad497a7
diff --git a/metadata/md5-cache/sys-libs/glibc-2.11.3 b/metadata/md5-cache/sys-libs/glibc-2.11.3
index d0390b0e4cbf..4030bad50834 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.11.3
+++ b/metadata/md5-cache/sys-libs/glibc-2.11.3
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.11.3.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.11.3.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.11.3.tar.bz2 mirror://gentoo/glibc-2.11.3.tar.bz2 mirror://gnu/glibc/glibc-ports-2.11.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.11.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.11.tar.bz2 mirror://gentoo/glibc-ports-2.11.tar.bz2 mirror://gentoo/glibc-2.11.3-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.11.3-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.11.3-patches-3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3e7b1faa0aa0a26501020105390c9af
diff --git a/metadata/md5-cache/sys-libs/glibc-2.12.1-r3 b/metadata/md5-cache/sys-libs/glibc-2.12.1-r3
index d163f526858f..207d579af3c8 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.12.1-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.12.1-r3
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.1-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.12.1-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.12.1-patches-8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=032692fce0d338c8b73b595b6a5ea04b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.12.2 b/metadata/md5-cache/sys-libs/glibc-2.12.2
index 3d1856a1eb61..28e1c09298c1 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.12.2
+++ b/metadata/md5-cache/sys-libs/glibc-2.12.2
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.12.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.12.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.12.2.tar.bz2 mirror://gentoo/glibc-2.12.2.tar.bz2 mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.12.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-ports-2.12.1.tar.bz2 mirror://gentoo/glibc-2.12.2-patches-4.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.12.2-patches-4.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.12.2-patches-4.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7161a99c38216b69ba725e23a378b7e3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.13-r2 b/metadata/md5-cache/sys-libs/glibc-2.13-r2
index b2601a407d1a..50e7eb5062ac 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.13-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.13-r2
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.13.tar.bz2 mirror://gentoo/glibc-2.13.tar.bz2 mirror://gnu/glibc/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-2.13-patches-6.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.13-patches-6.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.13-patches-6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fbfb7166509328406990fe565a8e99e6
diff --git a/metadata/md5-cache/sys-libs/glibc-2.13-r4 b/metadata/md5-cache/sys-libs/glibc-2.13-r4
index b88168044e4e..c38144aa1281 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.13-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.13-r4
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.13.tar.bz2 mirror://gentoo/glibc-2.13.tar.bz2 mirror://gnu/glibc/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.13.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-ports-2.13.tar.bz2 mirror://gentoo/glibc-2.13-patches-11.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.13-patches-11.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.13-patches-11.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b438938eef43833be9c30480081fe217
diff --git a/metadata/md5-cache/sys-libs/glibc-2.14 b/metadata/md5-cache/sys-libs/glibc-2.14
index 9c10850c3f5a..7f922b632e04 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.14
+++ b/metadata/md5-cache/sys-libs/glibc-2.14
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.tar.bz2 mirror://gentoo/glibc-2.14.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.tar.bz2 mirror://gentoo/glibc-ports-2.14.tar.bz2 mirror://gentoo/glibc-2.14-patches-7.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14-patches-7.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14-patches-7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd9bd61b97e80333687382b21c08c1ee
diff --git a/metadata/md5-cache/sys-libs/glibc-2.14.1-r2 b/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
index 47e38367b32c..4d90c4b73ab2 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.14.1-r2
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-5.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-5.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66e7a8318b5f0e5d15d3976680de76ca
diff --git a/metadata/md5-cache/sys-libs/glibc-2.14.1-r3 b/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
index 184b5826da52..a32673cbded0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.14.1-r3
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1.tar.bz2 mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.14.1.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-ports-2.14.1.tar.bz2 mirror://gentoo/glibc-2.14.1-patches-10.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.14.1-patches-10.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.14.1-patches-10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e834ab160cac588f0c5474039af5a77
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r1 b/metadata/md5-cache/sys-libs/glibc-2.15-r1
index 699f5013eeb9..04459bd96303 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r1
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-d
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-13.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-13.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-13.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb88d5d03c23bf3aa3df7a103f2b20d5
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r2 b/metadata/md5-cache/sys-libs/glibc-2.15-r2
index 7eced317b98a..6ee07e85ddfd 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r2
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-d
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-18.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-18.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-18.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=921f6cb0d0807be4bf4c3e63609a9411
diff --git a/metadata/md5-cache/sys-libs/glibc-2.9_p20081201-r3 b/metadata/md5-cache/sys-libs/glibc-2.9_p20081201-r3
index 4e2dad3ddf17..62339bf589ee 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.9_p20081201-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.9_p20081201-r3
@@ -9,5 +9,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) sys-libs/timezo
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.9-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.9-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.9-20081201.tar.bz2 mirror://gentoo/glibc-2.9-20081201.tar.bz2 mirror://gnu/glibc/glibc-2.9-ports-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/glibc-2.9-ports-20081201.tar.bz2 ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.9-ports-20081201.tar.bz2 mirror://gentoo/glibc-2.9-ports-20081201.tar.bz2 mirror://gentoo/glibc-2.9-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.9-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.9-patches-8.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2ac241cd34c66f75bbbc9fd5f6e481c
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index b573f7631809..53d6502d09f0 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=953bbd4e1ce8b5e3a7765cd7b1de3a8d
diff --git a/metadata/md5-cache/sys-libs/libcap-2.17 b/metadata/md5-cache/sys-libs/libcap-2.17
index 299c4a96ef6c..a9313db41cbf 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.17
+++ b/metadata/md5-cache/sys-libs/libcap-2.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.17.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e04973604ff0c40dfbeaa8680d3912e
diff --git a/metadata/md5-cache/sys-libs/libcap-2.19 b/metadata/md5-cache/sys-libs/libcap-2.19
index c618f883b093..0e3643b0eaa8 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.19
+++ b/metadata/md5-cache/sys-libs/libcap-2.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.19.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e147d380f95e0042bf828f33d5244fe3
diff --git a/metadata/md5-cache/sys-libs/libcap-2.20 b/metadata/md5-cache/sys-libs/libcap-2.20
index 3ea75c554d1d..532eb31d1ec5 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.20
+++ b/metadata/md5-cache/sys-libs/libcap-2.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.20.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=289ae3ccdaf35376f7bc26c26edeb5d8
diff --git a/metadata/md5-cache/sys-libs/libcap-2.21 b/metadata/md5-cache/sys-libs/libcap-2.21
index 925d55f8f68f..3a9dab8dbc5a 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.21
+++ b/metadata/md5-cache/sys-libs/libcap-2.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.21.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf89d8691b8945b51197c856e1b4e6eb
diff --git a/metadata/md5-cache/sys-libs/libcap-2.22 b/metadata/md5-cache/sys-libs/libcap-2.22
index a3af05b0368a..0ca07df7ec64 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.22
+++ b/metadata/md5-cache/sys-libs/libcap-2.22
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD )
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.22.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=252d26c01ff664c8bcd23c3a40feb731
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.6.6 b/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
index 46f51cc37e7c..9f5f8ebd8ffd 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.6.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/attr python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.6.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a0d1571b8788fbf10b2745de30cc13c3
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
index 03e5d96b106f..a25beba144c0 100644
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
+++ b/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=sys-libs/libcxxrt
 SLOT=0
 SRC_URI=mirror://gentoo/libcxx-0.0_p20120528.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a02f444037a03ef0b25accb9c82db0da
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index b7973a750771..db85e12c6ac4 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://libcxx.llvm.org/
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=sys-libs/libcxxrt
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59301ff309f602fef6a4035daa8b67e1
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528
index faa9b2767656..6ea489c6e365 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=mirror://gentoo/libcxxrt-0.0_p20120528.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e52d56180a1c62e6f4a6452dd9b675f2
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
index 0fcad91313a2..7c9cf439d9f3 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-9999
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/libunwind-1.0.1-r1
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=faadc4b89fbbb54f3b54dc3db0ce02dd
diff --git a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1 b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
index af89deaab5b2..98a7a69330fe 100644
--- a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
+++ b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt zlib? ( sys-libs/zlib ) >=sys-apps/pciutils-2.2.4 sys-apps/hwdata-gentoo !sys-apps/kudzu
 SLOT=0
 SRC_URI=mirror://gentoo/kudzu-1.2.57.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a30fd01fd72bb91f16ca517180d2322
diff --git a/metadata/md5-cache/sys-libs/libsafe-2.0_p16-r2 b/metadata/md5-cache/sys-libs/libsafe-2.0_p16-r2
index c53771370abc..8df6dd6caa7e 100644
--- a/metadata/md5-cache/sys-libs/libsafe-2.0_p16-r2
+++ b/metadata/md5-cache/sys-libs/libsafe-2.0_p16-r2
@@ -5,5 +5,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.research.avayalabs.com/project/libsafe/src/libsafe-2.0-16.tgz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c97c5c249ccec9f1a7b44cdb9154c23
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.2.19 b/metadata/md5-cache/sys-libs/libsmbios-2.2.19
index 6be90aa8dd14..df4642686ba1 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.2.19
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.2.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( >=dev-lang/python-2.3 )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.19/libsmbios-2.2.19.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6300bb3585161166d4be4d8f5ffe3b98
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.2.26 b/metadata/md5-cache/sys-libs/libsmbios-2.2.26
index 889dc26750c3..131786dc1a1f 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.2.26
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.2.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.26/libsmbios-2.2.26.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=004373a67f513239839c46e4901912f4
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.2.28 b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
index 2162e01bfaf9..0c190b585ab7 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.2.28
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.28/libsmbios-2.2.28.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67fa181956f6bc4e7f428e14f33a2561
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6
index 0913a0779a98..037573d9781f 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ~mips ppc -ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.6.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a90440e0e11a30ff287c9025fa039b0b
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
index 9014b8e50da1..c1a5fabaa6fb 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc -ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 SLOT=5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.7.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bcd00b1834f9ea4b568b85a3a9ea136
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.5 b/metadata/md5-cache/sys-libs/libutempter-1.1.5
index 9451ef6161c6..16295adb4cc3 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.5
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.5
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=225b0d96fb9683d9768c1c1037bbb46d
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.5-r1 b/metadata/md5-cache/sys-libs/libutempter-1.1.5-r1
index 1452645fe131..c63ec316c534 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.5-r1
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.5.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8cb37a117dccc4a5890cf84daa31721
diff --git a/metadata/md5-cache/sys-libs/mtdev-1.1.2 b/metadata/md5-cache/sys-libs/mtdev-1.1.2
index 77dc2c8f365f..d0a3a461fd15 100644
--- a/metadata/md5-cache/sys-libs/mtdev-1.1.2
+++ b/metadata/md5-cache/sys-libs/mtdev-1.1.2
@@ -3,9 +3,9 @@ DESCRIPTION=Multitouch Protocol Translation Library
 EAPI=4
 HOMEPAGE=http://bitmath.org/code/mtdev/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-kernel/linux-headers-2.6
 SLOT=0
 SRC_URI=http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2
-_md5_=d0db81d19ba9888a76be4c7276439f50
+_md5_=05cbc5afe92f8814dad07b2bf8ceb669
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.7-r7 b/metadata/md5-cache/sys-libs/ncurses-5.7-r7
index 7bab7ec532a7..dd3854e89732 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.7-r7
+++ b/metadata/md5-cache/sys-libs/ncurses-5.7-r7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-terms/rxvt-unicode-9.06-r3
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.7.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf4016904bf33aabb63a13bbb7a2a2cf
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4744d5e0dd3a6085c2534d2357b63852
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9 b/metadata/md5-cache/sys-libs/ncurses-5.9
index a140bf83ea79..22581a5ce3e6 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-terms/rxvt-unicode-9.06-r3
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ad4b17f79bf1428fa7a8b5f26d54546
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cd428fd8b68137aa5f202991e0768c63
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9-r1 b/metadata/md5-cache/sys-libs/ncurses-5.9-r1
index 371a5d07eefb..68e018d64e30 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9-r1
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-terms/rxvt-unicode-9.06-r3
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3b655d5906cedaffb7443179c6198c85
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=adb5e5c19abf84400ce2082b79a49c94
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9-r2 b/metadata/md5-cache/sys-libs/ncurses-5.9-r2
index 93ef51758931..395c80e349f0 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9-r2
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm ) !<x11-terms/rxvt-unicode-9.06-r3
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1195142d4db05792cb3f0fe242139688
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6dc0dea3908ba84f18429553b24573c8
diff --git a/metadata/md5-cache/sys-libs/newlib-1.18.0 b/metadata/md5-cache/sys-libs/newlib-1.18.0
index 8208f5f9d926..382849ec1d45 100644
--- a/metadata/md5-cache/sys-libs/newlib-1.18.0
+++ b/metadata/md5-cache/sys-libs/newlib-1.18.0
@@ -7,5 +7,5 @@ LICENSE=NEWLIB LIBGLOSS GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/newlib/newlib-1.18.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ec447b6105e1612c9345437c411792e
diff --git a/metadata/md5-cache/sys-libs/newlib-1.19.0 b/metadata/md5-cache/sys-libs/newlib-1.19.0
index 12f3fd85b0f4..3aebdf13be44 100644
--- a/metadata/md5-cache/sys-libs/newlib-1.19.0
+++ b/metadata/md5-cache/sys-libs/newlib-1.19.0
@@ -7,5 +7,5 @@ LICENSE=NEWLIB LIBGLOSS GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/newlib/newlib-1.19.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a8cc74365a6d2df841c6a73ed953654
diff --git a/metadata/md5-cache/sys-libs/newlib-1.20.0 b/metadata/md5-cache/sys-libs/newlib-1.20.0
index 85151e28ba3c..d5d323c06e5c 100644
--- a/metadata/md5-cache/sys-libs/newlib-1.20.0
+++ b/metadata/md5-cache/sys-libs/newlib-1.20.0
@@ -8,5 +8,5 @@ LICENSE=NEWLIB LIBGLOSS GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/newlib/newlib-1.20.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70e16886a58c3359471dcaea5034ab97
diff --git a/metadata/md5-cache/sys-libs/openhpi-2.0.3 b/metadata/md5-cache/sys-libs/openhpi-2.0.3
index a0e6e8e5a432..84c0b12a406c 100644
--- a/metadata/md5-cache/sys-libs/openhpi-2.0.3
+++ b/metadata/md5-cache/sys-libs/openhpi-2.0.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-fs/sysfsutils-1.0 >=sys-libs/openipmi-0.26 <sys-libs/openipmi-1.4 snmp? ( >=net-analyzer/net-snmp-5.07 )
 SLOT=0
 SRC_URI=mirror://sourceforge/openhpi/openhpi-2.0.3-1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22dfd13c75d56dadb679e971fee26c3c
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.3 b/metadata/md5-cache/sys-libs/pam-1.1.3
index 764a36727d4b..0a68da5a4693 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.3
+++ b/metadata/md5-cache/sys-libs/pam-1.1.3
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 ) !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.3.tar.bz2 mirror://kernel/linux/libs/pam/documentation/Linux-PAM-1.1.3-docs.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26d161005dae45daaf9f593a125001f3
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.5 b/metadata/md5-cache/sys-libs/pam-1.1.5
index e6fb18d3f5f5..937621499627 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.5
+++ b/metadata/md5-cache/sys-libs/pam-1.1.5
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.5.tar.bz2 https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.5-docs.tar.bz2
-_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57d1b1d4b7a439ecbeab8c41c5523870
diff --git a/metadata/md5-cache/sys-libs/pwdb-0.62 b/metadata/md5-cache/sys-libs/pwdb-0.62
index 03fa4b434fc1..72acec617da6 100644
--- a/metadata/md5-cache/sys-libs/pwdb-0.62
+++ b/metadata/md5-cache/sys-libs/pwdb-0.62
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) net-libs/libtirpc
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pwdb-0.62.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8588687921dec08870280e6525fdc502
diff --git a/metadata/md5-cache/sys-libs/readline-4.3_p5 b/metadata/md5-cache/sys-libs/readline-4.3_p5
index 05b55ab89f84..235c2f34385a 100644
--- a/metadata/md5-cache/sys-libs/readline-4.3_p5
+++ b/metadata/md5-cache/sys-libs/readline-4.3_p5
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=4
 SRC_URI=mirror://gnu/readline/readline-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005 mirror://gnu/readline/readline-4.3-patches/readline43-001 mirror://gnu/readline/readline-4.3-patches/readline43-002 mirror://gnu/readline/readline-4.3-patches/readline43-003 mirror://gnu/readline/readline-4.3-patches/readline43-004 mirror://gnu/readline/readline-4.3-patches/readline43-005
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ffd12e120de58eef91c8c514a491ff9
diff --git a/metadata/md5-cache/sys-libs/readline-5.2_p14 b/metadata/md5-cache/sys-libs/readline-5.2_p14
index 495950fdab03..2d01e440be50 100644
--- a/metadata/md5-cache/sys-libs/readline-5.2_p14
+++ b/metadata/md5-cache/sys-libs/readline-5.2_p14
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=5
 SRC_URI=mirror://gnu/readline/readline-5.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-001 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-002 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-003 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-004 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-005 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-006 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-007 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-008 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-009 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-010 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-011 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-012 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-013 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-014 mirror://gnu/readline/readline-5.2-patches/readline52-001 mirror://gnu/readline/readline-5.2-patches/readline52-002 mirror://gnu/readline/readline-5.2-patches/readline52-003 mirror://gnu/readline/readline-5.2-patches/readline52-004 mirror://gnu/readline/readline-5.2-patches/readline52-005 mirror://gnu/readline/readline-5.2-patches/readline52-006 mirror://gnu/readline/readline-5.2-patches/readline52-007 mirror://gnu/readline/readline-5.2-patches/readline52-008 mirror://gnu/readline/readline-5.2-patches/readline52-009 mirror://gnu/readline/readline-5.2-patches/readline52-010 mirror://gnu/readline/readline-5.2-patches/readline52-011 mirror://gnu/readline/readline-5.2-patches/readline52-012 mirror://gnu/readline/readline-5.2-patches/readline52-013 mirror://gnu/readline/readline-5.2-patches/readline52-014
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=390d33220af644a97c7ff37bab9e5820
diff --git a/metadata/md5-cache/sys-libs/readline-6.1 b/metadata/md5-cache/sys-libs/readline-6.1
index 9e3ef8ffc869..b49f8bdbcda4 100644
--- a/metadata/md5-cache/sys-libs/readline-6.1
+++ b/metadata/md5-cache/sys-libs/readline-6.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02b7b82a0d48ec46b5e8b9b82706e250
diff --git a/metadata/md5-cache/sys-libs/readline-6.1_p2 b/metadata/md5-cache/sys-libs/readline-6.1_p2
index 86ef764eb869..56558e97d0ea 100644
--- a/metadata/md5-cache/sys-libs/readline-6.1_p2
+++ b/metadata/md5-cache/sys-libs/readline-6.1_p2
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.1-patches/readline61-001 ftp://ftp.cwru.edu/pub/bash/readline-6.1-patches/readline61-002 mirror://gnu/readline/readline-6.1-patches/readline61-001 mirror://gnu/readline/readline-6.1-patches/readline61-002
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10000d202e16e80825d7125fdc1a7274
diff --git a/metadata/md5-cache/sys-libs/readline-6.2 b/metadata/md5-cache/sys-libs/readline-6.2
index b0096bef6460..1d715f82448a 100644
--- a/metadata/md5-cache/sys-libs/readline-6.2
+++ b/metadata/md5-cache/sys-libs/readline-6.2
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e8e4aadd1f6ada3677e3bb406756e44
diff --git a/metadata/md5-cache/sys-libs/readline-6.2_p1 b/metadata/md5-cache/sys-libs/readline-6.2_p1
index eaef3e6b84d7..e8720af5ef59 100644
--- a/metadata/md5-cache/sys-libs/readline-6.2_p1
+++ b/metadata/md5-cache/sys-libs/readline-6.2_p1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-001
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8d2a9c8bd547cceb0ad680315bdc470
diff --git a/metadata/md5-cache/sys-libs/readline-6.2_p1-r1 b/metadata/md5-cache/sys-libs/readline-6.2_p1-r1
index a38909ab1200..7484a9f61b6b 100644
--- a/metadata/md5-cache/sys-libs/readline-6.2_p1-r1
+++ b/metadata/md5-cache/sys-libs/readline-6.2_p1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-001
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=941adc62212087ed1ef797a6590f8b63
diff --git a/metadata/md5-cache/sys-libs/suacomp-0.6.13 b/metadata/md5-cache/sys-libs/suacomp-0.6.13
index 3876a1abc6f7..d343875daf76 100644
--- a/metadata/md5-cache/sys-libs/suacomp-0.6.13
+++ b/metadata/md5-cache/sys-libs/suacomp-0.6.13
@@ -7,5 +7,5 @@ KEYWORDS=-* ~x86-interix
 LICENSE=BEER-WARE
 SLOT=0
 SRC_URI=mirror://sourceforge/suacomp/suacomp-0.6.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0897bef42fb0fa25682cfbc4c78ec2c0
diff --git a/metadata/md5-cache/sys-libs/suacomp-0.6.14 b/metadata/md5-cache/sys-libs/suacomp-0.6.14
index 9d9b169b7be6..d927b05e4f60 100644
--- a/metadata/md5-cache/sys-libs/suacomp-0.6.14
+++ b/metadata/md5-cache/sys-libs/suacomp-0.6.14
@@ -7,5 +7,5 @@ KEYWORDS=-* ~x86-interix
 LICENSE=BEER-WARE
 SLOT=0
 SRC_URI=mirror://sourceforge/suacomp/suacomp-0.6.14.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6b3599b11f9a0c9125dffbea4cd6524
diff --git a/metadata/md5-cache/sys-libs/suacomp-9999 b/metadata/md5-cache/sys-libs/suacomp-9999
index cfcb826ce171..e4fcbaa79c4e 100644
--- a/metadata/md5-cache/sys-libs/suacomp-9999
+++ b/metadata/md5-cache/sys-libs/suacomp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://suacomp.sf.net
 IUSE=debug
 LICENSE=BEER-WARE
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=035d83302ba61a76584e6bb5d9913dc0
diff --git a/metadata/md5-cache/sys-libs/system-config-base-1-r1 b/metadata/md5-cache/sys-libs/system-config-base-1-r1
index 8986727734d4..8b62a34e2431 100644
--- a/metadata/md5-cache/sys-libs/system-config-base-1-r1
+++ b/metadata/md5-cache/sys-libs/system-config-base-1-r1
@@ -5,5 +5,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/pam
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce0f5bf1eff06afcd5bd02176af5a6ac
diff --git a/metadata/md5-cache/sys-libs/tdb-1.2.7-r1 b/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
index 6f9bebedcec9..056b12ca5056 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
+++ b/metadata/md5-cache/sys-libs/tdb-1.2.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.2.7.tar.gz mirror://gentoo/tdb-1.2.7-patches.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e00f86b9533c20184e59c22cee6a847a
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2011n b/metadata/md5-cache/sys-libs/timezone-data-2011n
index 5c4eede3ad0d..586b1ce2e188 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2011n
+++ b/metadata/md5-cache/sys-libs/timezone-data-2011n
@@ -7,5 +7,5 @@ LICENSE=BSD public-domain
 RDEPEND=!<sys-libs/glibc-2.3.5
 SLOT=0
 SRC_URI=ftp://munnari.oz.au/pub/tzdata2011n.tar.gz ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0fba2137d5b64bcf2aa6d2bd4df69c0b
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2012a b/metadata/md5-cache/sys-libs/timezone-data-2012a
index 194e2363a166..04d2d52e75c6 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2012a
+++ b/metadata/md5-cache/sys-libs/timezone-data-2012a
@@ -7,5 +7,5 @@ LICENSE=BSD public-domain
 RDEPEND=!<sys-libs/glibc-2.3.5
 SLOT=0
 SRC_URI=ftp://munnari.oz.au/pub/tzdata2012a.tar.gz ftp://munnari.oz.au/pub/tzcode2012a.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf938cbef9bb08215e7842fde8bdd8ac
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2012b b/metadata/md5-cache/sys-libs/timezone-data-2012b
index 636d77fbac6f..b923068559fc 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2012b
+++ b/metadata/md5-cache/sys-libs/timezone-data-2012b
@@ -7,5 +7,5 @@ LICENSE=BSD public-domain
 RDEPEND=!<sys-libs/glibc-2.3.5
 SLOT=0
 SRC_URI=ftp://munnari.oz.au/pub/tzdata2012b.tar.gz ftp://munnari.oz.au/pub/tzcode2012b.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f35ca3e095d5150a1dbdd73ff52b9573
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2012c b/metadata/md5-cache/sys-libs/timezone-data-2012c
index d38db0ad1847..2dc6eb180d07 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2012c
+++ b/metadata/md5-cache/sys-libs/timezone-data-2012c
@@ -7,5 +7,5 @@ LICENSE=BSD public-domain
 RDEPEND=!<sys-libs/glibc-2.3.5
 SLOT=0
 SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2012c.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2012b.tar.gz ftp://munnari.oz.au/pub/tzdata2012c.tar.gz ftp://munnari.oz.au/pub/tzcode2012b.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9508a4e2ea23f7b721084a6f9e1bd02d
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.28.3-r8 b/metadata/md5-cache/sys-libs/uclibc-0.9.28.3-r8
index ea8adf4369f8..30cbe6291cb3 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.28.3-r8
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.28.3-r8
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=x86_64-pc-linux-uclibc
 SRC_URI=mirror://kernel/linux/libs/uclibc/uClibc-0.9.28.3.tar.bz2 http://uclibc.org/downloads/uClibc-0.9.28.3.tar.bz2 nls? ( !userlocales? ( pregen? ( x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz ) ) ) ) mirror://gentoo/uClibc-0.9.28.3-patches-1.9.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06985a259fd5fba4ad340d11acb8ce42
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.30 b/metadata/md5-cache/sys-libs/uclibc-0.9.30
index 2c3e3718e33a..02d4d0240705 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.30
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.30
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=x86_64-pc-linux-uclibc
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.30.tar.bz2 iconv? ( !userlocales? ( pregen? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz ) ) ) mirror://gentoo/uClibc-0.9.30-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=497a56a8740cacdc06a79799df80523a
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.30.1 b/metadata/md5-cache/sys-libs/uclibc-0.9.30.1
index 748d6e93c18c..3767a6c60c54 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.30.1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.30.1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=x86_64-pc-linux-uclibc
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b794f93e9881b92565b092a8c78e8e3
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.30.1-r1 b/metadata/md5-cache/sys-libs/uclibc-0.9.30.1-r1
index 54921dd29234..d8b255b92aca 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.30.1-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.30.1-r1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=x86_64-pc-linux-uclibc
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2 mirror://gentoo/uClibc-0.9.30.1-patches-1.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=faebc8911b0c6448dc10fb60c896cfd9
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
index c241e15a6dd9..6fa1bd38ed38 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.1.tar.bz2 mirror://gentoo/uClibc-0.9.33.1-patches-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a1da78bc9eded59d788ddff48f5d563
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
index 0b9025752dd6..4ebcac7e8c23 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.1-r1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.1.tar.bz2 mirror://gentoo/uClibc-0.9.33.1-patches-2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9049e7d1722d326cdc07f4ce64b4859f
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
index 0e2204b2b16e..4fe28c7d512c 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2
@@ -7,5 +7,5 @@ LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2 mirror://gentoo/uClibc-0.9.33.2-patches-1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0935653a7f9c63c547c4bfb70fe01e94
diff --git a/metadata/md5-cache/sys-libs/uclibc-9999 b/metadata/md5-cache/sys-libs/uclibc-9999
index ee868afc771b..a7bc5de92ccb 100644
--- a/metadata/md5-cache/sys-libs/uclibc-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-9999
@@ -6,5 +6,5 @@ IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_o
 LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=862e563c203a3baf038c5f3de60557c4
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.3-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.3-r1
index 998d5ebab80f..1a50b6a63574 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.3-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.3-r1
@@ -5,5 +5,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2 http://www.zlib.net/zlib-1.2.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0414b1b26225c9a3eaa4c5b19ee0aa53
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.10-r1 b/metadata/md5-cache/sys-power/apcupsd-3.14.10-r1
index cb614b237a09..c0f3cfab8b17 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.10-r1
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( net-analyzer/net-snmp ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.10.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de3e1b44ed6a3a3c9df0505fe9d3a8f3
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.8-r1 b/metadata/md5-cache/sys-power/apcupsd-3.14.8-r1
index bc36736bcc62..b21a57fa4f50 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.8-r1
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( net-analyzer/net-snmp ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=583944fb5f9214a96a72bccbfcad0752
diff --git a/metadata/md5-cache/sys-power/iasl-20080514 b/metadata/md5-cache/sys-power/iasl-20080514
index c7affcf38e06..9296fa02d018 100644
--- a/metadata/md5-cache/sys-power/iasl-20080514
+++ b/metadata/md5-cache/sys-power/iasl-20080514
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20080514.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20080514.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e352c9dd34961f100d8033972ff3e1ad
diff --git a/metadata/md5-cache/sys-power/iasl-20080701 b/metadata/md5-cache/sys-power/iasl-20080701
index 4779271c99cf..7df2686d41c0 100644
--- a/metadata/md5-cache/sys-power/iasl-20080701
+++ b/metadata/md5-cache/sys-power/iasl-20080701
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20080701.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20080701.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7d9632bb1fb211f838cf25229e6eee0
diff --git a/metadata/md5-cache/sys-power/iasl-20090123 b/metadata/md5-cache/sys-power/iasl-20090123
index 53ab13a4b40e..3eaa79daab70 100644
--- a/metadata/md5-cache/sys-power/iasl-20090123
+++ b/metadata/md5-cache/sys-power/iasl-20090123
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20090123.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20090123.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f057c896bc00ffe88908cd23497f5b62
diff --git a/metadata/md5-cache/sys-power/iasl-20090521 b/metadata/md5-cache/sys-power/iasl-20090521
index 24bece561d99..5e3735657efb 100644
--- a/metadata/md5-cache/sys-power/iasl-20090521
+++ b/metadata/md5-cache/sys-power/iasl-20090521
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20090521.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20090521.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=740a1a1f1ad2a95b6cc9acc451043f23
diff --git a/metadata/md5-cache/sys-power/iasl-20090903 b/metadata/md5-cache/sys-power/iasl-20090903
index 1609d2f0872a..10d5ae51c365 100644
--- a/metadata/md5-cache/sys-power/iasl-20090903
+++ b/metadata/md5-cache/sys-power/iasl-20090903
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20090903.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20090903.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c8db8d763d94ccf1ebcc2434ea528da
diff --git a/metadata/md5-cache/sys-power/iasl-20091013 b/metadata/md5-cache/sys-power/iasl-20091013
index e0bc53f9b224..aa1bdfff9b46 100644
--- a/metadata/md5-cache/sys-power/iasl-20091013
+++ b/metadata/md5-cache/sys-power/iasl-20091013
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20091013.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20091013.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0e91d4719c4ba919ec62ee0cef667045
diff --git a/metadata/md5-cache/sys-power/iasl-20100428 b/metadata/md5-cache/sys-power/iasl-20100428
index 1b3ea1059a2e..6fef7bb37749 100644
--- a/metadata/md5-cache/sys-power/iasl-20100428
+++ b/metadata/md5-cache/sys-power/iasl-20100428
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20100428.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20100428.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed30a290ed317094bbce042ac4e5ae9b
diff --git a/metadata/md5-cache/sys-power/iasl-20100528 b/metadata/md5-cache/sys-power/iasl-20100528
index 6825159241d0..c975d643ed93 100644
--- a/metadata/md5-cache/sys-power/iasl-20100528
+++ b/metadata/md5-cache/sys-power/iasl-20100528
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20100528.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20100528.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2cb3f281cc7ca66fc3862f6cf426f19c
diff --git a/metadata/md5-cache/sys-power/iasl-20110922 b/metadata/md5-cache/sys-power/iasl-20110922
index ed0d64e5c43e..97997c4d8a4a 100644
--- a/metadata/md5-cache/sys-power/iasl-20110922
+++ b/metadata/md5-cache/sys-power/iasl-20110922
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20110922.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20110922.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98cb40ac25750c75f2c667eeffe345a6
diff --git a/metadata/md5-cache/sys-power/iasl-20111123 b/metadata/md5-cache/sys-power/iasl-20111123
index be8b73dd9374..0d808936746a 100644
--- a/metadata/md5-cache/sys-power/iasl-20111123
+++ b/metadata/md5-cache/sys-power/iasl-20111123
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20111123.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20111123.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64872757088b9bf3a7aee0b889868be3
diff --git a/metadata/md5-cache/sys-power/ncpufreqd-2.4 b/metadata/md5-cache/sys-power/ncpufreqd-2.4
index 04915d680c77..86ddc9a8736f 100644
--- a/metadata/md5-cache/sys-power/ncpufreqd-2.4
+++ b/metadata/md5-cache/sys-power/ncpufreqd-2.4
@@ -7,5 +7,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=http://projects.simpledesigns.com.pl/get/ncpufreqd-2.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b46d20c28b2d033e104cf9ff0c8f112d
diff --git a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1 b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
index f0d836c823b3..7a7785e44163 100644
--- a/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
+++ b/metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 SRC_URI=mirror://gentoo/nvclock-0.8_p20110102.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f3ca50cc815a6d4734a853544fd2ca9
diff --git a/metadata/md5-cache/sys-power/nvram-wakeup-0.97_p863 b/metadata/md5-cache/sys-power/nvram-wakeup-0.97_p863
index c76143f62283..fdf44f5a2cbd 100644
--- a/metadata/md5-cache/sys-power/nvram-wakeup-0.97_p863
+++ b/metadata/md5-cache/sys-power/nvram-wakeup-0.97_p863
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/nvram-wakeup/nvram-wakeup-0.97.tar.bz2 http://nvram-wakeup.svn.sourceforge.net/viewvc/*checkout*/nvram-wakeup/trunk/nvram-wakeup/nvram-wakeup-mb.c?revision=863
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba6050e636288c63072678f61ece4b98
diff --git a/metadata/md5-cache/sys-power/nvram-wakeup-0.99b b/metadata/md5-cache/sys-power/nvram-wakeup-0.99b
index 4d5cfbf48606..78e68b580778 100644
--- a/metadata/md5-cache/sys-power/nvram-wakeup-0.99b
+++ b/metadata/md5-cache/sys-power/nvram-wakeup-0.99b
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nvram-wakeup/nvram-wakup-0.99b.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31fe7c8d26a9b87392fda881828c07dc
diff --git a/metadata/md5-cache/sys-power/nvram-wakeup-1.0 b/metadata/md5-cache/sys-power/nvram-wakeup-1.0
index ae570c326a76..8be798b04fc3 100644
--- a/metadata/md5-cache/sys-power/nvram-wakeup-1.0
+++ b/metadata/md5-cache/sys-power/nvram-wakeup-1.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nvram-wakeup/nvram-wakup-1.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b202534b2f0d47ea328902ef82f667ee
diff --git a/metadata/md5-cache/sys-power/pmtools-20071116 b/metadata/md5-cache/sys-power/pmtools-20071116
index 54b800c35f1b..7331fbde2293 100644
--- a/metadata/md5-cache/sys-power/pmtools-20071116
+++ b/metadata/md5-cache/sys-power/pmtools-20071116
@@ -6,5 +6,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-power/iasl-20060512
 SLOT=0
 SRC_URI=http://www.lesswatts.org/patches/linux_acpi/pmtools-20071116.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40507208e889c4bdfd9de9e2ac46c22e
diff --git a/metadata/md5-cache/sys-power/pmtools-20110323 b/metadata/md5-cache/sys-power/pmtools-20110323
index bdab00f32ce4..c88f7e0a5f63 100644
--- a/metadata/md5-cache/sys-power/pmtools-20110323
+++ b/metadata/md5-cache/sys-power/pmtools-20110323
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-power/iasl-20090521
 SLOT=0
 SRC_URI=http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools-20110323.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2462df17180151461680ce672d3facf8
diff --git a/metadata/md5-cache/sys-process/at-3.1.10.2-r1 b/metadata/md5-cache/sys-process/at-3.1.10.2-r1
index b17cfc0c2688..f3552a2f02c8 100644
--- a/metadata/md5-cache/sys-process/at-3.1.10.2-r1
+++ b/metadata/md5-cache/sys-process/at-3.1.10.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.10.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2333e5d954a93acaf2d15d1b16c9bf6
diff --git a/metadata/md5-cache/sys-process/at-3.1.10.2-r2 b/metadata/md5-cache/sys-process/at-3.1.10.2-r2
index d7846c36b8f0..d632fda73a5e 100644
--- a/metadata/md5-cache/sys-process/at-3.1.10.2-r2
+++ b/metadata/md5-cache/sys-process/at-3.1.10.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.10.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f78d0396e8fb930704126d1f05f918d5
diff --git a/metadata/md5-cache/sys-process/at-3.1.13 b/metadata/md5-cache/sys-process/at-3.1.13
index dfa0c1b87301..0fa59ac9929e 100644
--- a/metadata/md5-cache/sys-process/at-3.1.13
+++ b/metadata/md5-cache/sys-process/at-3.1.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d909cd8abe6979f950ba8442b837e14
diff --git a/metadata/md5-cache/sys-process/at-3.1.13-r1 b/metadata/md5-cache/sys-process/at-3.1.13-r1
index 0c0b26cec1a6..d453fc67d941 100644
--- a/metadata/md5-cache/sys-process/at-3.1.13-r1
+++ b/metadata/md5-cache/sys-process/at-3.1.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1543a18ec86cff01a39f3f6c11ee370f
diff --git a/metadata/md5-cache/sys-process/bcron-0.09 b/metadata/md5-cache/sys-process/bcron-0.09
index 2b0221e5564f..cf09edaea758 100644
--- a/metadata/md5-cache/sys-process/bcron-0.09
+++ b/metadata/md5-cache/sys-process/bcron-0.09
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-process/cronbase-0.3.2 virtual/mta sys-apps/ucspi-unix virtual/daemontools virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=http://untroubled.org/bcron/archive/bcron-0.09.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a54ea722953bce0c87183d01efb9b68
diff --git a/metadata/md5-cache/sys-process/bcron-0.09-r2 b/metadata/md5-cache/sys-process/bcron-0.09-r2
index ed86d015a1a8..8e5c0a7a11ae 100644
--- a/metadata/md5-cache/sys-process/bcron-0.09-r2
+++ b/metadata/md5-cache/sys-process/bcron-0.09-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-process/cronbase-0.3.2 virtual/mta sys-apps/ucspi-unix virtual/daemontools virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=http://untroubled.org/bcron/archive/bcron-0.09.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=762c161fdc4056a69ea8afd3dba582a3
diff --git a/metadata/md5-cache/sys-process/cronie-1.4.8 b/metadata/md5-cache/sys-process/cronie-1.4.8
index 6efb356a4b8c..8037052a50f3 100644
--- a/metadata/md5-cache/sys-process/cronie-1.4.8
+++ b/metadata/md5-cache/sys-process/cronie-1.4.8
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2
 RDEPEND=pam? ( virtual/pam ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/r/cronie/cronie-1.4.8.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c17faa0049de698ada25e5fb368f3517
diff --git a/metadata/md5-cache/sys-process/cronie-1.4.8-r1 b/metadata/md5-cache/sys-process/cronie-1.4.8-r1
index 5d4746f364e8..46480af226e2 100644
--- a/metadata/md5-cache/sys-process/cronie-1.4.8-r1
+++ b/metadata/md5-cache/sys-process/cronie-1.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=ISC BSD BSD-2
 RDEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/r/cronie/cronie-1.4.8.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfe1e3cc6f117ac2240b506c2777c488
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r7 b/metadata/md5-cache/sys-process/daemontools-0.76-r7
index b06471029453..f31eb66942fa 100644
--- a/metadata/md5-cache/sys-process/daemontools-0.76-r7
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r7
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd81c4cbecee0694f7f8038e9031443c
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.05 b/metadata/md5-cache/sys-process/daemontools-encore-1.05
index abbf2abce4e0..cbd23b1bef7e 100644
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.05
+++ b/metadata/md5-cache/sys-process/daemontools-encore-1.05
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://untroubled.org/daemontools-encore//daemontools-encore-1.05.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qmail	4769a115633d2afbfcd65d8ee0ed76d8	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9612fd543840d0bf80f96d3485bab5f1
diff --git a/metadata/md5-cache/sys-process/dcron-3.2-r1 b/metadata/md5-cache/sys-process/dcron-3.2-r1
index e6b77033504d..9e344f326e70 100644
--- a/metadata/md5-cache/sys-process/dcron-3.2-r1
+++ b/metadata/md5-cache/sys-process/dcron-3.2-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/fcron
 SLOT=0
 SRC_URI=http://apollo.backplane.com/FreeSrc/dcron32.tgz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7377827fbe043f5fad8abd628a964c8d
diff --git a/metadata/md5-cache/sys-process/dcron-4.4 b/metadata/md5-cache/sys-process/dcron-4.4
index 41fc98eb146a..3096a80e614b 100644
--- a/metadata/md5-cache/sys-process/dcron-4.4
+++ b/metadata/md5-cache/sys-process/dcron-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/fcron
 SLOT=0
 SRC_URI=http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1379e1e0ecb75cac87af73bc2abd382
diff --git a/metadata/md5-cache/sys-process/dcron-4.5 b/metadata/md5-cache/sys-process/dcron-4.5
index 012db62fa78a..ea497ff6461e 100644
--- a/metadata/md5-cache/sys-process/dcron-4.5
+++ b/metadata/md5-cache/sys-process/dcron-4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/fcron
 SLOT=0
 SRC_URI=http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=43aa519f8dedf7a07a29bddc6f5b7f3c
diff --git a/metadata/md5-cache/sys-process/fcron-3.0.5-r2 b/metadata/md5-cache/sys-process/fcron-3.0.5-r2
index e84c9ab09672..64546858203a 100644
--- a/metadata/md5-cache/sys-process/fcron-3.0.5-r2
+++ b/metadata/md5-cache/sys-process/fcron-3.0.5-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) app-shells/bash >=app-misc/editor-wrapper-3 pam? ( >=sys-auth/pambase-20100310 ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.0.5.src.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09095d1100e49c83a707f702842dbcb7
diff --git a/metadata/md5-cache/sys-process/fcron-3.0.6-r1 b/metadata/md5-cache/sys-process/fcron-3.0.6-r1
index 6674570114f8..7259fcbd761b 100644
--- a/metadata/md5-cache/sys-process/fcron-3.0.6-r1
+++ b/metadata/md5-cache/sys-process/fcron-3.0.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) app-shells/bash >=app-misc/editor-wrapper-3 pam? ( >=sys-auth/pambase-20100310 ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.0.6.src.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce0c680e39fcff411bde4ec7761d4ed7
diff --git a/metadata/md5-cache/sys-process/fcron-3.0.6-r2 b/metadata/md5-cache/sys-process/fcron-3.0.6-r2
index f068be6bf67a..5621a383954b 100644
--- a/metadata/md5-cache/sys-process/fcron-3.0.6-r2
+++ b/metadata/md5-cache/sys-process/fcron-3.0.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) app-shells/bash >=app-misc/editor-wrapper-3 pam? ( >=sys-auth/pambase-20100310 ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.0.6.src.tar.gz
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f5ccc5434ae7a75c5026f21d1785df84
diff --git a/metadata/md5-cache/sys-process/fuser-bsd-1142334561 b/metadata/md5-cache/sys-process/fuser-bsd-1142334561
index 951c95c67bc1..969219df50bc 100644
--- a/metadata/md5-cache/sys-process/fuser-bsd-1142334561
+++ b/metadata/md5-cache/sys-process/fuser-bsd-1142334561
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libc !sys-process/psmisc
 SLOT=0
 SRC_URI=http://mbsd.msk.ru/dist/fuser-1142334561.tar.bz2 mirror://gentoo/fuser-bsd-patches-1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca1c1e4d3b2d844d41500a9811581a9e
diff --git a/metadata/md5-cache/sys-process/htop-0.9-r2 b/metadata/md5-cache/sys-process/htop-0.9-r2
index e4055336139b..e37f93d3db11 100644
--- a/metadata/md5-cache/sys-process/htop-0.9-r2
+++ b/metadata/md5-cache/sys-process/htop-0.9-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=mirror://sourceforge/htop/htop-0.9.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8b91a3ae73aa39183267d9d77c3e09dc
diff --git a/metadata/md5-cache/sys-process/lsof-4.82 b/metadata/md5-cache/sys-process/lsof-4.82
index 10433c9a3e2f..6fd5b9d7685c 100644
--- a/metadata/md5-cache/sys-process/lsof-4.82
+++ b/metadata/md5-cache/sys-process/lsof-4.82
@@ -8,5 +8,5 @@ LICENSE=lsof
 RDEPEND=selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.82.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.82.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=171b4de60541a684168b65c4c11a5153
diff --git a/metadata/md5-cache/sys-process/lsof-4.83 b/metadata/md5-cache/sys-process/lsof-4.83
index 23c22a7a12a7..e32861bb0ae1 100644
--- a/metadata/md5-cache/sys-process/lsof-4.83
+++ b/metadata/md5-cache/sys-process/lsof-4.83
@@ -8,5 +8,5 @@ LICENSE=lsof
 RDEPEND=selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.83.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2307685c64690764d9cfc91a66c978c
diff --git a/metadata/md5-cache/sys-process/lsof-4.84 b/metadata/md5-cache/sys-process/lsof-4.84
index 066a4945d0f4..3772156e592b 100644
--- a/metadata/md5-cache/sys-process/lsof-4.84
+++ b/metadata/md5-cache/sys-process/lsof-4.84
@@ -8,5 +8,5 @@ LICENSE=lsof
 RDEPEND=selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.84.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0541fddbc5a08d752252d87dfd629bd
diff --git a/metadata/md5-cache/sys-process/lsof-4.84-r1 b/metadata/md5-cache/sys-process/lsof-4.84-r1
index ff027e5cb32a..c03261ee65e8 100644
--- a/metadata/md5-cache/sys-process/lsof-4.84-r1
+++ b/metadata/md5-cache/sys-process/lsof-4.84-r1
@@ -9,5 +9,5 @@ LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.84.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c654731a668ab7d6b49a6238855d02d
diff --git a/metadata/md5-cache/sys-process/lsof-4.85 b/metadata/md5-cache/sys-process/lsof-4.85
index 031b7b2bd574..6ecc0effcb7e 100644
--- a/metadata/md5-cache/sys-process/lsof-4.85
+++ b/metadata/md5-cache/sys-process/lsof-4.85
@@ -9,5 +9,5 @@ LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.85.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d035cfb141b060c3af68d6cbf358a94e
diff --git a/metadata/md5-cache/sys-process/lsof-4.85-r1 b/metadata/md5-cache/sys-process/lsof-4.85-r1
index c0dff35c52b1..636195d44348 100644
--- a/metadata/md5-cache/sys-process/lsof-4.85-r1
+++ b/metadata/md5-cache/sys-process/lsof-4.85-r1
@@ -9,5 +9,5 @@ LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.85.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10b2d4787f836feaa435a10513c74849
diff --git a/metadata/md5-cache/sys-process/lsof-4.85-r2 b/metadata/md5-cache/sys-process/lsof-4.85-r2
index 186317547665..05f71beca63f 100644
--- a/metadata/md5-cache/sys-process/lsof-4.85-r2
+++ b/metadata/md5-cache/sys-process/lsof-4.85-r2
@@ -9,5 +9,5 @@ LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.85.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2294d602b338bfb6cec4f0f287424c61
diff --git a/metadata/md5-cache/sys-process/nmon-14f b/metadata/md5-cache/sys-process/nmon-14f
index 1a90d9b4cccd..4f79c00a282d 100644
--- a/metadata/md5-cache/sys-process/nmon-14f
+++ b/metadata/md5-cache/sys-process/nmon-14f
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon14f.c
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=233f062b187694bf4417ab0601bfb9c1
diff --git a/metadata/md5-cache/sys-process/nmon-14g b/metadata/md5-cache/sys-process/nmon-14g
index 5b4c4a9dd12e..fedd6730b0c8 100644
--- a/metadata/md5-cache/sys-process/nmon-14g
+++ b/metadata/md5-cache/sys-process/nmon-14g
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon14g.c
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=009df4322f1ef47389c7516b75c60eab
diff --git a/metadata/md5-cache/sys-process/parallel-20120522 b/metadata/md5-cache/sys-process/parallel-20120522
index 7e88f0833a87..3d3d5436bfde 100644
--- a/metadata/md5-cache/sys-process/parallel-20120522
+++ b/metadata/md5-cache/sys-process/parallel-20120522
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-F
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20120522.tar.bz2
-_md5_=5535cf03fc3b3360677f2032c6f4f316
+_md5_=88ca023b34d166dfb792035e743d2c64
diff --git a/metadata/md5-cache/sys-process/parallel-20120622 b/metadata/md5-cache/sys-process/parallel-20120622
new file mode 100644
index 000000000000..a89bade3b1ff
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20120622
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO !<sys-apps/moreutils-0.45-r1 !<sci-geosciences/grass-6.4.1-r1
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/parallel/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20120622.tar.bz2
+_md5_=be46dba9207725c2b846d0b37dcbe67c
diff --git a/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4 b/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
index 6062a935ed44..548965f5e6cd 100644
--- a/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
+++ b/metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=!sys-process/psmisc
 SLOT=0
 SRC_URI=mirror://gentoo/pidof-bsd-20050501.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5fa742e1e7a089e513b2281d055ee98
diff --git a/metadata/md5-cache/sys-process/procps-3.2.8 b/metadata/md5-cache/sys-process/procps-3.2.8
index 1c7b35b0d1e1..bace9216b54b 100644
--- a/metadata/md5-cache/sys-process/procps-3.2.8
+++ b/metadata/md5-cache/sys-process/procps-3.2.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=http://procps.sourceforge.net/procps-3.2.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccdaf0587cf5597b2748c876986cad80
diff --git a/metadata/md5-cache/sys-process/procps-3.2.8-r1 b/metadata/md5-cache/sys-process/procps-3.2.8-r1
index 241bfee829db..2536eb44296b 100644
--- a/metadata/md5-cache/sys-process/procps-3.2.8-r1
+++ b/metadata/md5-cache/sys-process/procps-3.2.8-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=http://procps.sourceforge.net/procps-3.2.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff8e303267acbad9991e2ae2a0e5ef89
diff --git a/metadata/md5-cache/sys-process/procps-3.2.8-r2 b/metadata/md5-cache/sys-process/procps-3.2.8-r2
index 355bb8c5468c..78c7a7e9d699 100644
--- a/metadata/md5-cache/sys-process/procps-3.2.8-r2
+++ b/metadata/md5-cache/sys-process/procps-3.2.8-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
 SRC_URI=http://procps.sourceforge.net/procps-3.2.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b572cc5d01e3aabac91cb443d7a1da1
diff --git a/metadata/md5-cache/sys-process/procps-3.2.8_p10-r1 b/metadata/md5-cache/sys-process/procps-3.2.8_p10-r1
index 724239749718..5625edd23bdf 100644
--- a/metadata/md5-cache/sys-process/procps-3.2.8_p10-r1
+++ b/metadata/md5-cache/sys-process/procps-3.2.8_p10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2[unicode?]
 SLOT=0
 SRC_URI=http://procps.sourceforge.net/procps-3.2.8.tar.gz mirror://debian/pool/main/p/procps/procps_3.2.8-10.debian.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0610e3dc7d9e59bd6090cfe9ec0ac230
diff --git a/metadata/md5-cache/sys-process/procps-3.2.8_p11 b/metadata/md5-cache/sys-process/procps-3.2.8_p11
index 42eb2f50a668..21780ed2faac 100644
--- a/metadata/md5-cache/sys-process/procps-3.2.8_p11
+++ b/metadata/md5-cache/sys-process/procps-3.2.8_p11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2[unicode?]
 SLOT=0
 SRC_URI=http://procps.sourceforge.net/procps-3.2.8.tar.gz mirror://debian/pool/main/p/procps/procps_3.2.8-11.debian.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07b0e79bd5c0c7c3aa04f436d29b3135
diff --git a/metadata/md5-cache/sys-process/runit-1.7.0 b/metadata/md5-cache/sys-process/runit-1.7.0
index 395b77c949ac..f8719d00eec7 100644
--- a/metadata/md5-cache/sys-process/runit-1.7.0
+++ b/metadata/md5-cache/sys-process/runit-1.7.0
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/runit/runit-1.7.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7aad4ef69fc586a06354e40ff0066de
diff --git a/metadata/md5-cache/sys-process/runit-2.0.0 b/metadata/md5-cache/sys-process/runit-2.0.0
index 864a54f535f4..21fed5a2f6ca 100644
--- a/metadata/md5-cache/sys-process/runit-2.0.0
+++ b/metadata/md5-cache/sys-process/runit-2.0.0
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/runit/runit-2.0.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=978a9a209a6fffdb78c16192eb0d1060
diff --git a/metadata/md5-cache/sys-process/runit-2.1.1 b/metadata/md5-cache/sys-process/runit-2.1.1
index e8330c42d381..0bffbae94cdf 100644
--- a/metadata/md5-cache/sys-process/runit-2.1.1
+++ b/metadata/md5-cache/sys-process/runit-2.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/runit/runit-2.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5654648a2bcb1f8a131d5bc6709ca827
diff --git a/metadata/md5-cache/sys-process/runit-2.1.1-r1 b/metadata/md5-cache/sys-process/runit-2.1.1-r1
index 2d60f03d2de4..53fdf151a3f5 100644
--- a/metadata/md5-cache/sys-process/runit-2.1.1-r1
+++ b/metadata/md5-cache/sys-process/runit-2.1.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/runit/runit-2.1.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d3022c860c60d42ba724a1f0a75afa8
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r10 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r10
index c40b70ca9a8c..5e42ad49d55c 100644
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r10
+++ b/metadata/md5-cache/sys-process/vixie-cron-4.1-r10
@@ -8,5 +8,5 @@ LICENSE=ISC BSD-2 BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3661f20be75ef00db6853f9867382857
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r12 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r12
index c24fa315a7e6..0cf27a69cd7c 100644
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r12
+++ b/metadata/md5-cache/sys-process/vixie-cron-4.1-r12
@@ -8,5 +8,5 @@ LICENSE=ISC BSD-2 BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
-_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e24fed7179e073aaf51fe318abff7f9b
diff --git a/metadata/md5-cache/virtual/perl-Text-ParseWords-3.270.0 b/metadata/md5-cache/virtual/perl-Text-ParseWords-3.270.0
new file mode 100644
index 000000000000..1365160ca462
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Text-ParseWords-3.270.0
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Text-ParseWords
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* =dev-lang/perl-5.12* ~perl-core/Text-ParseWords-3.270.0 )
+SLOT=0
+_md5_=aae35274cd0813afe5cf33a2e0e765a1
diff --git a/metadata/md5-cache/www-apache/anyterm-1.1.29 b/metadata/md5-cache/www-apache/anyterm-1.1.29
index 5ec4592bb188..f33d6827bf83 100644
--- a/metadata/md5-cache/www-apache/anyterm-1.1.29
+++ b/metadata/md5-cache/www-apache/anyterm-1.1.29
@@ -8,5 +8,5 @@ LICENSE=GPL-2 Boost-1.0
 RDEPEND=virtual/ssh
 SLOT=0
 SRC_URI=http://anyterm.org/download/anyterm-1.1.29.tbz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b7e8d968b91989d668f4630471a30dd1
diff --git a/metadata/md5-cache/www-apache/mod_security-2.7.0_rc2 b/metadata/md5-cache/www-apache/mod_security-2.7.0_rc2
new file mode 100644
index 000000000000..ff40c678d8c8
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_security-2.7.0_rc2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/libxml2-2.7.8 dev-libs/libpcre[jit?] lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2*
+DESCRIPTION=Web application firewall and Intrusion Detection System for Apache.
+EAPI=4
+HOMEPAGE=http://www.modsecurity.org/
+IUSE=geoip curl lua jit
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+PDEPEND=>=www-apache/modsecurity-crs-2.2.5
+RDEPEND=>=dev-libs/libxml2-2.7.8 dev-libs/libpcre[jit?] lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/project/mod-security/modsecurity-apache/2.7.0-rc2/modsecurity-apache_2.7.0-rc2.tar.gz
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=febe2ec0f98d199ed7819493802450e9
diff --git a/metadata/md5-cache/www-apache/passenger-2.2.15 b/metadata/md5-cache/www-apache/passenger-2.2.15
index a823a68b32fc..318cc44cb5ed 100644
--- a/metadata/md5-cache/www-apache/passenger-2.2.15
+++ b/metadata/md5-cache/www-apache/passenger-2.2.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ruby-1.8.5 >=dev-ruby/rubygems-0.9.0 >=dev-ruby/rake-0.8.1 >=dev-ruby/fastthread-1.0.1 >=dev-ruby/rack-1.0.0 =www-servers/apache-2.2* =dev-lang/ruby-1.8*
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-2.2.15.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f0c5c82e6b524b38dff62c558c498a57
diff --git a/metadata/md5-cache/www-apache/passenger-2.2.15-r1 b/metadata/md5-cache/www-apache/passenger-2.2.15-r1
index 3ddd87155171..c224351050f5 100644
--- a/metadata/md5-cache/www-apache/passenger-2.2.15-r1
+++ b/metadata/md5-cache/www-apache/passenger-2.2.15-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ruby-1.8.5 >=dev-ruby/rubygems-0.9.0 >=dev-ruby/rake-0.8.1 >=dev-ruby/fastthread-1.0.1 >=dev-ruby/rack-1.0.0 =www-servers/apache-2.2* =dev-lang/ruby-1.8*
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-2.2.15.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b67a587c5a7abf73bcfe4a40a793cb92
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.11 b/metadata/md5-cache/www-apache/passenger-3.0.11
index b3a458652686..3707fe5937b4 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.11
+++ b/metadata/md5-cache/www-apache/passenger-3.0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby18] >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2.2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.11.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=072adf5ae8b618530e12539f18791b12
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.11-r1 b/metadata/md5-cache/www-apache/passenger-3.0.11-r1
index d68f503bbedd..e7d97952e3e3 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.11-r1
+++ b/metadata/md5-cache/www-apache/passenger-3.0.11-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_r
 REQUIRED_USE=ruby_targets_ruby18? ( !ruby_targets_ruby19 ) ruby_targets_ruby19? ( !ruby_targets_ruby18 ) || ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.11.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=714ded4addf9c593abf2380baf55c4cf
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.12 b/metadata/md5-cache/www-apache/passenger-3.0.12
index 26334b4265f0..63cd21030ec5 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.12
+++ b/metadata/md5-cache/www-apache/passenger-3.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_r
 REQUIRED_USE=ruby_targets_ruby18? ( !ruby_targets_ruby19 ) ruby_targets_ruby19? ( !ruby_targets_ruby18 ) || ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.12.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5945d75ba5537ea70063ab87b3a12fd9
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.13 b/metadata/md5-cache/www-apache/passenger-3.0.13
index bff3f3867377..5349ea0e0df6 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.13
+++ b/metadata/md5-cache/www-apache/passenger-3.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_r
 REQUIRED_USE=ruby_targets_ruby18? ( !ruby_targets_ruby19 ) ruby_targets_ruby19? ( !ruby_targets_ruby18 ) || ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.13.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebebd186893c4bf74dd527aac8745bc8
diff --git a/metadata/md5-cache/www-apache/passenger-3.0.7 b/metadata/md5-cache/www-apache/passenger-3.0.7
index 4a33bc97e3d2..85ffa7ef6031 100644
--- a/metadata/md5-cache/www-apache/passenger-3.0.7
+++ b/metadata/md5-cache/www-apache/passenger-3.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby18] >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2.2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 SLOT=0
 SRC_URI=mirror://rubyforge/passenger/passenger-3.0.7.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=279d52172c34aae7477170ebc45d0806
diff --git a/metadata/md5-cache/www-apache/pwauth-2.3.2 b/metadata/md5-cache/www-apache/pwauth-2.3.2
index ebe7bc101318..081ebd58b293 100644
--- a/metadata/md5-cache/www-apache/pwauth-2.3.2
+++ b/metadata/md5-cache/www-apache/pwauth-2.3.2
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://www.unixpapa.com/software/pwauth-2.3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dba13958f9265e2567067081710c6031
diff --git a/metadata/md5-cache/www-apache/pwauth-2.3.5 b/metadata/md5-cache/www-apache/pwauth-2.3.5
index 74b6fe533176..22c617ed620a 100644
--- a/metadata/md5-cache/www-apache/pwauth-2.3.5
+++ b/metadata/md5-cache/www-apache/pwauth-2.3.5
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://www.unixpapa.com/software/pwauth-2.3.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=992ac386264fb068de4e20aa54ce2af9
diff --git a/metadata/md5-cache/www-apps/gnopaste-0.5.5 b/metadata/md5-cache/www-apps/gnopaste-0.5.5
index 4a23464ace88..84e059cff73b 100644
--- a/metadata/md5-cache/www-apps/gnopaste-0.5.5
+++ b/metadata/md5-cache/www-apps/gnopaste-0.5.5
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=gnopaste is a nopaste script based on PHP with MySQL
+EAPI=4
 HOMEPAGE=http://gnopaste.sf.net/
 IUSE=vhosts
 KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
-RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
+RDEPEND=virtual/httpd-php dev-lang/php[mysql] >=app-admin/webapp-config-1.50.15
 SLOT=0.5.5
 SRC_URI=mirror://sourceforge/gnopaste/gnopaste-0.5.5.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=b05b111306521df2693d26b5f35845cf
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=30b9fd167e508dd05e3cac52b1e3821c
diff --git a/metadata/md5-cache/www-apps/groupoffice-2.15 b/metadata/md5-cache/www-apps/groupoffice-2.15
deleted file mode 100644
index f2a4768c4a45..000000000000
--- a/metadata/md5-cache/www-apps/groupoffice-2.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Group-Office is a powerful modular Intranet application framework
-HOMEPAGE=http://group-office.sourceforge.net/
-IUSE=vhosts
-KEYWORDS=alpha amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
-SLOT=2.15
-SRC_URI=mirror://sourceforge/group-office/groupoffice-com-2.15.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=1ca6addbe231a010a8126b50b92026b2
diff --git a/metadata/md5-cache/www-apps/groupoffice-2.16.8 b/metadata/md5-cache/www-apps/groupoffice-2.16.8
deleted file mode 100644
index 63c31b14a7dd..000000000000
--- a/metadata/md5-cache/www-apps/groupoffice-2.16.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Group-Office is a powerful modular Intranet application framework
-HOMEPAGE=http://group-office.sourceforge.net/
-IUSE=vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
-SLOT=2.16.8
-SRC_URI=mirror://sourceforge/group-office/groupoffice-com-2.16-8.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=feff6f0c21b1216f806eb1f83e2c7c57
diff --git a/metadata/md5-cache/www-apps/groupoffice-3.7.52 b/metadata/md5-cache/www-apps/groupoffice-3.7.52
new file mode 100644
index 000000000000..bea6c6e1536c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/groupoffice-3.7.52
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Group-Office is a powerful modular Intranet application framework
+EAPI=4
+HOMEPAGE=http://group-office.sourceforge.net/
+IUSE=vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=app-arch/zip app-arch/unzip virtual/httpd-cgi dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib] >=app-admin/webapp-config-1.50.15
+SLOT=3.7.52
+SRC_URI=mirror://sourceforge/group-office/groupoffice-com-3.7.52.tar.gz
+_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=bef5b6c75b763488579995ef11358a9a
diff --git a/metadata/md5-cache/www-apps/groupoffice-4.0.47 b/metadata/md5-cache/www-apps/groupoffice-4.0.47
new file mode 100644
index 000000000000..753c4a2b5bcf
--- /dev/null
+++ b/metadata/md5-cache/www-apps/groupoffice-4.0.47
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Group-Office is a powerful modular Intranet application framework
+EAPI=4
+HOMEPAGE=http://group-office.sourceforge.net/
+IUSE=vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=app-arch/zip app-arch/unzip virtual/httpd-cgi dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib] >=app-admin/webapp-config-1.50.15
+SLOT=4.0.47
+SRC_URI=mirror://sourceforge/group-office/groupoffice-com-4.0.47.tar.gz
+_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=adab56bdc8b965782c3e2eb8bd885caa
diff --git a/metadata/md5-cache/www-apps/online-bookmarks-0.8.14_beta b/metadata/md5-cache/www-apps/online-bookmarks-0.8.14_beta
new file mode 100644
index 000000000000..73fc572064b9
--- /dev/null
+++ b/metadata/md5-cache/www-apps/online-bookmarks-0.8.14_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=A Bookmark management system to store your Bookmarks, Favorites and Links.
+EAPI=4
+HOMEPAGE=http://www.frech.ch/online-bookmarks/index.php
+IUSE=vhosts
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/httpd-php dev-lang/php[mysql] dev-php/PEAR-Auth dev-php/PEAR-DB >=app-admin/webapp-config-1.50.15
+SLOT=0.8.14_beta
+SRC_URI=http://www.frech.ch/online-bookmarks/download/online-bookmarks-0.8.14_beta.tar.gz
+_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=7fc3e95e5b3a9f6cdeb2bf01294cfa73
diff --git a/metadata/md5-cache/www-apps/phpmp-0.11.0-r1 b/metadata/md5-cache/www-apps/phpmp-0.11.0-r1
index 711489486f73..bac407bc1165 100644
--- a/metadata/md5-cache/www-apps/phpmp-0.11.0-r1
+++ b/metadata/md5-cache/www-apps/phpmp-0.11.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=phpMp is a client program for Music Player Daemon (mpd)
 EAPI=2
 HOMEPAGE=http://www.musicpd.org/
 IUSE=vhosts
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+RDEPEND=virtual/httpd-php || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=app-admin/webapp-config-1.50.15
 SLOT=0.11.0-r1
 SRC_URI=mirror://sourceforge/musicpd/phpMp-0.11.0.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=132a12c8ab39b49d7f48f809a744d03b
+_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=1c6c73582b7591f025c67e5ecb3c1867
diff --git a/metadata/md5-cache/www-client/chromium-19.0.1084.52 b/metadata/md5-cache/www-client/chromium-19.0.1084.52
index a15c97c7e820..0995ea956cbc 100644
--- a/metadata/md5-cache/www-client/chromium-19.0.1084.52
+++ b/metadata/md5-cache/www-client/chromium-19.0.1084.52
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.9.13 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 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=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-19.0.1084.52.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9d7c3f5353e7a8e5a124d285b6b762c4
diff --git a/metadata/md5-cache/www-client/chromium-19.0.1084.56-r1 b/metadata/md5-cache/www-client/chromium-19.0.1084.56-r1
index 6a3c120e1bd2..692ad48e4d98 100644
--- a/metadata/md5-cache/www-client/chromium-19.0.1084.56-r1
+++ b/metadata/md5-cache/www-client/chromium-19.0.1084.56-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.9.13 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 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=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-19.0.1084.56.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e8a8a08a48163fd9d667ad743584c755
diff --git a/metadata/md5-cache/www-client/chromium-20.0.1132.39 b/metadata/md5-cache/www-client/chromium-20.0.1132.39
index dc1495b01787..14eb98f21e9c 100644
--- a/metadata/md5-cache/www-client/chromium-20.0.1132.39
+++ b/metadata/md5-cache/www-client/chromium-20.0.1132.39
@@ -9,5 +9,5 @@ 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 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-20.0.1132.39.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=331f90e0599fff2f7eb90e3dbaa087e0
diff --git a/metadata/md5-cache/www-client/chromium-20.0.1132.42 b/metadata/md5-cache/www-client/chromium-20.0.1132.42
index d167070de62c..e2b9b52af1d4 100644
--- a/metadata/md5-cache/www-client/chromium-20.0.1132.42
+++ b/metadata/md5-cache/www-client/chromium-20.0.1132.42
@@ -9,5 +9,5 @@ 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 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-20.0.1132.42.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ead9a8c68a029e1ee8be45694b5cab5b
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1171.0 b/metadata/md5-cache/www-client/chromium-21.0.1171.0
index c2bf57502ba6..3b7bfaeffbe3 100644
--- a/metadata/md5-cache/www-client/chromium-21.0.1171.0
+++ b/metadata/md5-cache/www-client/chromium-21.0.1171.0
@@ -9,5 +9,5 @@ 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/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/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.1171.0.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=470e4ba7ab49f41bab57cb72547ab2ce
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1180.0 b/metadata/md5-cache/www-client/chromium-21.0.1180.0
index 1bf04bd39de7..80b27d869f3d 100644
--- a/metadata/md5-cache/www-client/chromium-21.0.1180.0
+++ b/metadata/md5-cache/www-client/chromium-21.0.1180.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 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/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.1180.0.tar.bz2
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5f480948b17a05b38d897f251f24a506
diff --git a/metadata/md5-cache/www-client/chromium-9999-r1 b/metadata/md5-cache/www-client/chromium-9999-r1
index 87178cfb5d23..93456e96f8a4 100644
--- a/metadata/md5-cache/www-client/chromium-9999-r1
+++ b/metadata/md5-cache/www-client/chromium-9999-r1
@@ -7,5 +7,5 @@ IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 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/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=live
-_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=fa00478d42c3bab8ac95bda04195d86e
diff --git a/metadata/md5-cache/www-client/dillo-3.0.1 b/metadata/md5-cache/www-client/dillo-3.0.1
index 298e65a22799..7b27a9d89165 100644
--- a/metadata/md5-cache/www-client/dillo-3.0.1
+++ b/metadata/md5-cache/www-client/dillo-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www.dillo.org/download/dillo-3.0.1.tar.bz2 mirror://gentoo/dillo.png
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0198b05a6e84ad739a996825fea0ad8e
diff --git a/metadata/md5-cache/www-client/dillo-3.0.2 b/metadata/md5-cache/www-client/dillo-3.0.2
index 6a1bd69bbdb0..f3b2f5104ffd 100644
--- a/metadata/md5-cache/www-client/dillo-3.0.2
+++ b/metadata/md5-cache/www-client/dillo-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/zlib >=x11-libs/fltk-1.3:1[-cairo] jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www.dillo.org/download/dillo-3.0.2.tar.bz2 mirror://gentoo/dillo.png
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7757a539df9cfa81e97333067378adc4
diff --git a/metadata/md5-cache/www-client/elinks-0.11.7 b/metadata/md5-cache/www-client/elinks-0.11.7
index 3614b2be8e5a..336a3d03c15f 100644
--- a/metadata/md5-cache/www-client/elinks-0.11.7
+++ b/metadata/md5-cache/www-client/elinks-0.11.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-l
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.11.7.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b4b1e0845249fc81e00eb07957406e47
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre5-r2 b/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
index d3cde962f58a..99940ca4369f 100644
--- a/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 http://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2bb1a4da85070486db1496d4c312cdb7
diff --git a/metadata/md5-cache/www-client/firefox-10.0.4 b/metadata/md5-cache/www-client/firefox-10.0.4
index 09bf7c96ab9c..2d68ee57a900 100644
--- a/metadata/md5-cache/www-client/firefox-10.0.4
+++ b/metadata/md5-cache/www-client/firefox-10.0.4
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/af.xpi -> firefox-10.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ak.xpi -> firefox-10.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> firefox-10.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/as.xpi -> firefox-10.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> firefox-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/be.xpi -> firefox-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> firefox-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/br.xpi -> firefox-10.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bs.xpi -> firefox-10.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> firefox-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> firefox-10.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/csb.xpi -> firefox-10.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cy.xpi -> firefox-10.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/da.xpi -> firefox-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/de.xpi -> firefox-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/el.xpi -> firefox-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eo.xpi -> firefox-10.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/et.xpi -> firefox-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> firefox-10.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fa.xpi -> firefox-10.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> firefox-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> firefox-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> firefox-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> firefox-10.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/he.xpi -> firefox-10.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hr.xpi -> firefox-10.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> firefox-10.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/id.xpi -> firefox-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/is.xpi -> firefox-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/it.xpi -> firefox-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> firefox-10.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kk.xpi -> firefox-10.0.4esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kn.xpi -> firefox-10.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> firefox-10.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ku.xpi -> firefox-10.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lg.xpi -> firefox-10.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> firefox-10.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lv.xpi -> firefox-10.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mai.xpi -> firefox-10.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mk.xpi -> firefox-10.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ml.xpi -> firefox-10.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mr.xpi -> firefox-10.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> firefox-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nso.xpi -> firefox-10.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/or.xpi -> firefox-10.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> firefox-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> firefox-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> firefox-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> firefox-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/si.xpi -> firefox-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> firefox-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> firefox-10.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/son.xpi -> firefox-10.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> firefox-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> firefox-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta.xpi -> firefox-10.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/te.xpi -> firefox-10.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/th.xpi -> firefox-10.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> firefox-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> firefox-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> firefox-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zu.xpi -> firefox-10.0.4esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.8.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/source/firefox-10.0.4esr.source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4c6a2a7a89ed20e7000284f6d3175097
diff --git a/metadata/md5-cache/www-client/firefox-10.0.5 b/metadata/md5-cache/www-client/firefox-10.0.5
index a155db85b913..023f64df59fa 100644
--- a/metadata/md5-cache/www-client/firefox-10.0.5
+++ b/metadata/md5-cache/www-client/firefox-10.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/af.xpi -> firefox-10.0.5esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ak.xpi -> firefox-10.0.5esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ar.xpi -> firefox-10.0.5esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/as.xpi -> firefox-10.0.5esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ast.xpi -> firefox-10.0.5esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/be.xpi -> firefox-10.0.5esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/bg.xpi -> firefox-10.0.5esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.5esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.5esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/br.xpi -> firefox-10.0.5esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/bs.xpi -> firefox-10.0.5esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ca.xpi -> firefox-10.0.5esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/cs.xpi -> firefox-10.0.5esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/csb.xpi -> firefox-10.0.5esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/cy.xpi -> firefox-10.0.5esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/da.xpi -> firefox-10.0.5esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/de.xpi -> firefox-10.0.5esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/el.xpi -> firefox-10.0.5esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.5esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.5esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/eo.xpi -> firefox-10.0.5esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.5esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.5esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.5esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.5esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/et.xpi -> firefox-10.0.5esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/eu.xpi -> firefox-10.0.5esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/fa.xpi -> firefox-10.0.5esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/fi.xpi -> firefox-10.0.5esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/fr.xpi -> firefox-10.0.5esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.5esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.5esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/gd.xpi -> firefox-10.0.5esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/gl.xpi -> firefox-10.0.5esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.5esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/he.xpi -> firefox-10.0.5esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.5esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/hr.xpi -> firefox-10.0.5esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/hu.xpi -> firefox-10.0.5esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.5esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/id.xpi -> firefox-10.0.5esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/is.xpi -> firefox-10.0.5esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/it.xpi -> firefox-10.0.5esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ja.xpi -> firefox-10.0.5esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/kk.xpi -> firefox-10.0.5esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/kn.xpi -> firefox-10.0.5esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ko.xpi -> firefox-10.0.5esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ku.xpi -> firefox-10.0.5esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/lg.xpi -> firefox-10.0.5esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/lt.xpi -> firefox-10.0.5esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/lv.xpi -> firefox-10.0.5esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/mai.xpi -> firefox-10.0.5esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/mk.xpi -> firefox-10.0.5esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ml.xpi -> firefox-10.0.5esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/mr.xpi -> firefox-10.0.5esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.5esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/nl.xpi -> firefox-10.0.5esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.5esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/nso.xpi -> firefox-10.0.5esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/or.xpi -> firefox-10.0.5esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.5esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/pl.xpi -> firefox-10.0.5esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.5esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.5esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/rm.xpi -> firefox-10.0.5esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ro.xpi -> firefox-10.0.5esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ru.xpi -> firefox-10.0.5esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/si.xpi -> firefox-10.0.5esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/sk.xpi -> firefox-10.0.5esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/sl.xpi -> firefox-10.0.5esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/son.xpi -> firefox-10.0.5esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/sq.xpi -> firefox-10.0.5esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/sr.xpi -> firefox-10.0.5esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.5esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ta.xpi -> firefox-10.0.5esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.5esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/te.xpi -> firefox-10.0.5esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/th.xpi -> firefox-10.0.5esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/tr.xpi -> firefox-10.0.5esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/uk.xpi -> firefox-10.0.5esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/vi.xpi -> firefox-10.0.5esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.5esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.5esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/linux-i686/xpi/zu.xpi -> firefox-10.0.5esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.8.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5esr/source/firefox-10.0.5esr.source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=dcd2fef091f019601cf70c37a2453d23
diff --git a/metadata/md5-cache/www-client/firefox-13.0 b/metadata/md5-cache/www-client/firefox-13.0
index e3c7be380763..3ed6c3b6e897 100644
--- a/metadata/md5-cache/www-client/firefox-13.0
+++ b/metadata/md5-cache/www-client/firefox-13.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/af.xpi -> firefox-13.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ak.xpi -> firefox-13.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ar.xpi -> firefox-13.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/as.xpi -> firefox-13.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ast.xpi -> firefox-13.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/be.xpi -> firefox-13.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/bg.xpi -> firefox-13.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/bn-BD.xpi -> firefox-13.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/bn-IN.xpi -> firefox-13.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/br.xpi -> firefox-13.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/bs.xpi -> firefox-13.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ca.xpi -> firefox-13.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/cs.xpi -> firefox-13.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/csb.xpi -> firefox-13.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/cy.xpi -> firefox-13.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/da.xpi -> firefox-13.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/de.xpi -> firefox-13.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/el.xpi -> firefox-13.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/en-GB.xpi -> firefox-13.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/en-ZA.xpi -> firefox-13.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/eo.xpi -> firefox-13.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/es-AR.xpi -> firefox-13.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/es-CL.xpi -> firefox-13.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/es-ES.xpi -> firefox-13.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/es-MX.xpi -> firefox-13.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/et.xpi -> firefox-13.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/eu.xpi -> firefox-13.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/fa.xpi -> firefox-13.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/fi.xpi -> firefox-13.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/fr.xpi -> firefox-13.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/fy-NL.xpi -> firefox-13.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ga-IE.xpi -> firefox-13.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/gd.xpi -> firefox-13.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/gl.xpi -> firefox-13.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/gu-IN.xpi -> firefox-13.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/he.xpi -> firefox-13.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/hi-IN.xpi -> firefox-13.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/hr.xpi -> firefox-13.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/hu.xpi -> firefox-13.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/hy-AM.xpi -> firefox-13.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/id.xpi -> firefox-13.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/is.xpi -> firefox-13.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/it.xpi -> firefox-13.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ja.xpi -> firefox-13.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/kk.xpi -> firefox-13.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/kn.xpi -> firefox-13.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ko.xpi -> firefox-13.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ku.xpi -> firefox-13.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/lg.xpi -> firefox-13.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/lt.xpi -> firefox-13.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/lv.xpi -> firefox-13.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/mai.xpi -> firefox-13.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/mk.xpi -> firefox-13.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ml.xpi -> firefox-13.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/mr.xpi -> firefox-13.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/nb-NO.xpi -> firefox-13.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/nl.xpi -> firefox-13.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/nn-NO.xpi -> firefox-13.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/nso.xpi -> firefox-13.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/or.xpi -> firefox-13.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/pa-IN.xpi -> firefox-13.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/pl.xpi -> firefox-13.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/pt-BR.xpi -> firefox-13.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/pt-PT.xpi -> firefox-13.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/rm.xpi -> firefox-13.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ro.xpi -> firefox-13.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ru.xpi -> firefox-13.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/si.xpi -> firefox-13.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/sk.xpi -> firefox-13.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/sl.xpi -> firefox-13.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/son.xpi -> firefox-13.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/sq.xpi -> firefox-13.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/sr.xpi -> firefox-13.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/sv-SE.xpi -> firefox-13.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ta.xpi -> firefox-13.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/ta-LK.xpi -> firefox-13.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/te.xpi -> firefox-13.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/th.xpi -> firefox-13.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/tr.xpi -> firefox-13.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/uk.xpi -> firefox-13.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/vi.xpi -> firefox-13.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/zh-CN.xpi -> firefox-13.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/zh-TW.xpi -> firefox-13.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//13.0/linux-i686/xpi/zu.xpi -> firefox-13.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-13.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//13.0/source/firefox-13.0.source.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0f9f70c2c75f673ee52d7084c5516ad2
diff --git a/metadata/md5-cache/www-client/jumanji-9999 b/metadata/md5-cache/www-client/jumanji-9999
index 48d9af45987e..44496f53eae0 100644
--- a/metadata/md5-cache/www-client/jumanji-9999
+++ b/metadata/md5-cache/www-client/jumanji-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pwmt.org/projects/jumanji
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/glib-2.22.4:2 >=dev-libs/libunique-1.1.6:1 >=net-libs/libsoup-2.30.2:2.4 >=net-libs/webkit-gtk-1.2.1:2 >=x11-libs/gtk+-2.18.6:2
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bea05ab467549dc8f81578ee97c50616
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.4.99 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.4.99
index 5892d568e181..702518fe8f2c 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.4.99
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c9ee063a9fc1a4369b41edbcfe0acc6
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.0 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.0
index 37d70956a0ec..562a74868472 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.0
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bdeb3509caaa0e9bbc57334fd64bd928
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.60 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.60
index b1ae2e1cd4ac..15fa37ead885 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.60
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c4ffd843f07dc30b186d6a3d2d0b60f3
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.65 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.65
index c768d6538a7c..532dc708fa95 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.65
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3ca8df1fcaecab1e1baf8d2853556b1
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.70 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.70
index 21f1e80da293..a76739958735 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.70
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08c6261246c4e3a1f2666ae214524ae0
diff --git a/metadata/md5-cache/www-client/leechcraft-deadlyrics-9999 b/metadata/md5-cache/www-client/leechcraft-deadlyrics-9999
index e25c49d477f6..6d6eb329c1fb 100644
--- a/metadata/md5-cache/www-client/leechcraft-deadlyrics-9999
+++ b/metadata/md5-cache/www-client/leechcraft-deadlyrics-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6bad4ee40b79b8c95c5cb9a0dd4bf215
diff --git a/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.65 b/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.65
index 3df308379b5d..2bd44f0c14ff 100644
--- a/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.65
+++ b/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cce260613d1cc2d068ad728329183572
diff --git a/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.70 b/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.70
index 9765b26659df..6832c78c69c2 100644
--- a/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.70
+++ b/metadata/md5-cache/www-client/leechcraft-dolozhee-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60fd430487b02327983306f6067df7cf
diff --git a/metadata/md5-cache/www-client/leechcraft-dolozhee-9999 b/metadata/md5-cache/www-client/leechcraft-dolozhee-9999
index a8ab9072cb22..46defb596495 100644
--- a/metadata/md5-cache/www-client/leechcraft-dolozhee-9999
+++ b/metadata/md5-cache/www-client/leechcraft-dolozhee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=185e36efe6573b2022bbc54d08bb8284
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-0.4.99 b/metadata/md5-cache/www-client/leechcraft-poshuku-0.4.99
index bc1f0dda7ca1..afe442686666 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-0.4.99
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a8d95528050101253c4a72d6717d0f7
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.0 b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.0
index 246b07a0ffc3..419de81a8002 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.0
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=004b7badf6ab9b47e271a17f8a5069eb
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.60 b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.60
index 674300269835..625f7a7a0faa 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.60
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=680198f320fd08138a241bca9f1164b5
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.65 b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.65
index 3c7249f7a5d9..63b78cf6231a 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.65
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1274e9a2109f1e27d46a3643c70f32dc
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.70 b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.70
index dbd120d06628..8486b7602d3b 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.70
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f321a29521fbc35e74b5e535a0b4210a
diff --git a/metadata/md5-cache/www-client/leechcraft-poshuku-9999 b/metadata/md5-cache/www-client/leechcraft-poshuku-9999
index eabb411a648f..594c35240fab 100644
--- a/metadata/md5-cache/www-client/leechcraft-poshuku-9999
+++ b/metadata/md5-cache/www-client/leechcraft-poshuku-9999
@@ -7,5 +7,5 @@ IUSE=debug +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks wy
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999[postgres?,sqlite?] x11-libs/qt-webkit onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) idn? ( net-dns/libidn ) virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3503fe37bb5206e2e0a5c072584b50a
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.4.99 b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.4.99
index fbcd9164f10f..834eae05da27 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.4.99
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4bad05f9b3adca48e69142e7190c8a65
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.0 b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.0
index 55830543b532..8866575e3203 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.0
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e603eab7339d04bbeaa077055505140
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.60 b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.60
index 6b779ce3ce87..ca5f84121f42 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.60
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db63c9d3f2bb06df6bf97a9b0e20051f
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.65 b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.65
index 7f9e975f6979..46b12e63da62 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.65
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e76a2f93ca01adb8bdf30f4d809d829
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.70 b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.70
index 8d32cc411e6a..b97fe0dc4d7d 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.70
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16f92912b7a11ed2ca8fd459d067ab17
diff --git a/metadata/md5-cache/www-client/leechcraft-vgrabber-9999 b/metadata/md5-cache/www-client/leechcraft-vgrabber-9999
index 58c1974411c0..8f16139d7fa4 100644
--- a/metadata/md5-cache/www-client/leechcraft-vgrabber-9999
+++ b/metadata/md5-cache/www-client/leechcraft-vgrabber-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c082a9f2633b5ab4110f8d7876a05968
diff --git a/metadata/md5-cache/www-client/lynx-2.8.8_pre12 b/metadata/md5-cache/www-client/lynx-2.8.8_pre12
index af211ac864ba..5219ad48956a 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.8_pre12
+++ b/metadata/md5-cache/www-client/lynx-2.8.8_pre12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=4
 HOMEPAGE=http://lynx.isc.org/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
+RDEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://lynx.isc.org/current/lynx2.8.8dev.12.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=880add81ff8bbdb94c681a43179e542e
+_md5_=81d4da73803fc4a3373b9a76c046166b
diff --git a/metadata/md5-cache/www-client/rekonq-0.9.2 b/metadata/md5-cache/www-client/rekonq-0.9.2
index be5b2154d833..ca8fb5ceb95a 100644
--- a/metadata/md5-cache/www-client/rekonq-0.9.2
+++ b/metadata/md5-cache/www-client/rekonq-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/qt-dbus-4.8:4 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bg
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://sourceforge/rekonq/rekonq-0.9.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=7e58cd94ac252f6b525e6625ede6d6e1
diff --git a/metadata/md5-cache/www-client/seamonkey-2.0.14-r1 b/metadata/md5-cache/www-client/seamonkey-2.0.14-r1
index 003c18522720..31db6c0557eb 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.0.14-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.0.14-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=java? ( virtual/jre ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 alsa? ( media-libs/alsa-lib ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) >=app-text/hunspell-1.2 >=x11-libs/gtk+-2.10.0:2 >=x11-libs/pango-1.14.0[X] crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/source/seamonkey-2.0.14.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.0.11-patches-01.tar.bz2 crypt? ( mailclient? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.0.1.tar.gz ) ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.be.langpack.xpi -> seamonkey-2.0.14-be.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ca.langpack.xpi -> seamonkey-2.0.14-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.cs.langpack.xpi -> seamonkey-2.0.14-cs.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.de.langpack.xpi -> seamonkey-2.0.14-de.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.en-GB.langpack.xpi -> seamonkey-2.0.14-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-AR.langpack.xpi -> seamonkey-2.0.14-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-ES.langpack.xpi -> seamonkey-2.0.14-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-ES.langpack.xpi -> seamonkey-2.0.14-es-ES.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.fi.langpack.xpi -> seamonkey-2.0.14-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.fr.langpack.xpi -> seamonkey-2.0.14-fr.xpi ) linguas_gl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.gl.langpack.xpi -> seamonkey-2.0.14-gl.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.hu.langpack.xpi -> seamonkey-2.0.14-hu.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.it.langpack.xpi -> seamonkey-2.0.14-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ja.langpack.xpi -> seamonkey-2.0.14-ja.xpi ) linguas_ka? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ka.langpack.xpi -> seamonkey-2.0.14-ka.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.lt.langpack.xpi -> seamonkey-2.0.14-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nb-NO.langpack.xpi -> seamonkey-2.0.14-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nb-NO.langpack.xpi -> seamonkey-2.0.14-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nl.langpack.xpi -> seamonkey-2.0.14-nl.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pl.langpack.xpi -> seamonkey-2.0.14-pl.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pt-PT.langpack.xpi -> seamonkey-2.0.14-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pt-PT.langpack.xpi -> seamonkey-2.0.14-pt-PT.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ru.langpack.xpi -> seamonkey-2.0.14-ru.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sk.langpack.xpi -> seamonkey-2.0.14-sk.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sv-SE.langpack.xpi -> seamonkey-2.0.14-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sv-SE.langpack.xpi -> seamonkey-2.0.14-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.tr.langpack.xpi -> seamonkey-2.0.14-tr.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.zh-CN.langpack.xpi -> seamonkey-2.0.14-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.zh-CN.langpack.xpi -> seamonkey-2.0.14-zh-CN.xpi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29d2806001b7a0f6c3257430d80648e7
diff --git a/metadata/md5-cache/www-client/seamonkey-2.10.1 b/metadata/md5-cache/www-client/seamonkey-2.10.1
index 16e21877c0f3..f281b2518b91 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.10.1
+++ b/metadata/md5-cache/www-client/seamonkey-2.10.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.be.langpack.xpi -> seamonkey-2.10.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ca.langpack.xpi -> seamonkey-2.10.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.cs.langpack.xpi -> seamonkey-2.10.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.de.langpack.xpi -> seamonkey-2.10.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.en-GB.langpack.xpi -> seamonkey-2.10.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.es-AR.langpack.xpi -> seamonkey-2.10.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.es-ES.langpack.xpi -> seamonkey-2.10.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.fi.langpack.xpi -> seamonkey-2.10.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.fr.langpack.xpi -> seamonkey-2.10.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.gl.langpack.xpi -> seamonkey-2.10.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.hu.langpack.xpi -> seamonkey-2.10.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.it.langpack.xpi -> seamonkey-2.10.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ja.langpack.xpi -> seamonkey-2.10.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.lt.langpack.xpi -> seamonkey-2.10.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.nb-NO.langpack.xpi -> seamonkey-2.10.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.nl.langpack.xpi -> seamonkey-2.10.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.pl.langpack.xpi -> seamonkey-2.10.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.pt-PT.langpack.xpi -> seamonkey-2.10.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ru.langpack.xpi -> seamonkey-2.10.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.sk.langpack.xpi -> seamonkey-2.10.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.sv-SE.langpack.xpi -> seamonkey-2.10.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.tr.langpack.xpi -> seamonkey-2.10.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.zh-CN.langpack.xpi -> seamonkey-2.10.1-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.be.langpack.xpi -> seamonkey-2.10.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ca.langpack.xpi -> seamonkey-2.10.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.cs.langpack.xpi -> seamonkey-2.10.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.de.langpack.xpi -> seamonkey-2.10.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.en-GB.langpack.xpi -> seamonkey-2.10.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.es-AR.langpack.xpi -> seamonkey-2.10.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.es-ES.langpack.xpi -> seamonkey-2.10.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.fi.langpack.xpi -> seamonkey-2.10.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.fr.langpack.xpi -> seamonkey-2.10.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.gl.langpack.xpi -> seamonkey-2.10.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.hu.langpack.xpi -> seamonkey-2.10.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.it.langpack.xpi -> seamonkey-2.10.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ja.langpack.xpi -> seamonkey-2.10.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.lt.langpack.xpi -> seamonkey-2.10.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.nb-NO.langpack.xpi -> seamonkey-2.10.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.nl.langpack.xpi -> seamonkey-2.10.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.pl.langpack.xpi -> seamonkey-2.10.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.pt-PT.langpack.xpi -> seamonkey-2.10.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.ru.langpack.xpi -> seamonkey-2.10.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.sk.langpack.xpi -> seamonkey-2.10.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.sv-SE.langpack.xpi -> seamonkey-2.10.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.tr.langpack.xpi -> seamonkey-2.10.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/langpack/seamonkey-2.10.1.zh-CN.langpack.xpi -> seamonkey-2.10.1-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.10.1/source/seamonkey-2.10.1.source.tar.bz2 -> seamonkey-2.10.1.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-13.0-patches-0.3.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.2.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e0f92f4dc803f39660b6f111cac3056
diff --git a/metadata/md5-cache/www-client/seamonkey-2.4.1-r1 b/metadata/md5-cache/www-client/seamonkey-2.4.1-r1
index 4a0f3b0f9679..e77e8a382c9c 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.4.1-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/source/seamonkey-2.4.1.source.tar.bz2 -> seamonkey-2.4.1.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.4.1-patches-01.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.2.tar.gz ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.be.langpack.xpi -> seamonkey-2.4.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ca.langpack.xpi -> seamonkey-2.4.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.cs.langpack.xpi -> seamonkey-2.4.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.de.langpack.xpi -> seamonkey-2.4.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.en-GB.langpack.xpi -> seamonkey-2.4.1-en-GB.xpi ) linguas_en_US? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.en-US.langpack.xpi -> seamonkey-2.4.1-en-US.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-AR.langpack.xpi -> seamonkey-2.4.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-ES.langpack.xpi -> seamonkey-2.4.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-ES.langpack.xpi -> seamonkey-2.4.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.fi.langpack.xpi -> seamonkey-2.4.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.fr.langpack.xpi -> seamonkey-2.4.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.gl.langpack.xpi -> seamonkey-2.4.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.hu.langpack.xpi -> seamonkey-2.4.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.it.langpack.xpi -> seamonkey-2.4.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ja.langpack.xpi -> seamonkey-2.4.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.lt.langpack.xpi -> seamonkey-2.4.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nb-NO.langpack.xpi -> seamonkey-2.4.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nb-NO.langpack.xpi -> seamonkey-2.4.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nl.langpack.xpi -> seamonkey-2.4.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pl.langpack.xpi -> seamonkey-2.4.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pt-PT.langpack.xpi -> seamonkey-2.4.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pt-PT.langpack.xpi -> seamonkey-2.4.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ru.langpack.xpi -> seamonkey-2.4.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sk.langpack.xpi -> seamonkey-2.4.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sv-SE.langpack.xpi -> seamonkey-2.4.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sv-SE.langpack.xpi -> seamonkey-2.4.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.tr.langpack.xpi -> seamonkey-2.4.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.zh-CN.langpack.xpi -> seamonkey-2.4.1-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.zh-CN.langpack.xpi -> seamonkey-2.4.1-zh-CN.xpi )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=679c3f7794fa33dacbc57debc7491dc5
diff --git a/metadata/md5-cache/www-client/torbrowser-10.0.5 b/metadata/md5-cache/www-client/torbrowser-10.0.5
index e6e98ceddee8..2655f5a82bba 100644
--- a/metadata/md5-cache/www-client/torbrowser-10.0.5
+++ b/metadata/md5-cache/www-client/torbrowser-10.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) BSD GPL-2 MIT CCPL-Attribution-3.0
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.8.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.5/source/firefox-10.0.5esr.source.tar.bz2 amd64? ( https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.2.36-1-dev-en-US.tar.gz ) x86? ( https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.2.36-1-dev-en-US.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0c8a10cb664020976a52188d1c2bf021
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.4.99 b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.4.99
index 9b4720324490..cba4f4c080e4 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.4.99
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.4.99
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.4.99 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.4.99.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d5f947eb4c82e3e0b60ee0292bfa247
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.0 b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.0
index 00330bd6ad76..46fca7f7fa41 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.0
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.0 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.0.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fedde7672f3910484ce3a15b7a59c4a
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.60 b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.60
index f4c60e24672a..babca6533187 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.60
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.60
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.60 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.60.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b202846d7a6daaa7c806cd74f2c90983
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.65 b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.65
index 0d6a8a5e90a3..53ced89052fc 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.65
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.65
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.65 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.65.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a6c642d6ed3fc671314dd592ca7f473
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.70 b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.70
index d0784d47b9ae..061bf10aac93 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.70
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-0.5.70
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-0.5.70 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
 SRC_URI=mirror://sourceforge/leechcraft/leechcraft-0.5.70.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ecf7462e519058ae27386347870af444
diff --git a/metadata/md5-cache/www-misc/leechcraft-seekthru-9999 b/metadata/md5-cache/www-misc/leechcraft-seekthru-9999
index 5b91f02ac254..6507feb3c6a4 100644
--- a/metadata/md5-cache/www-misc/leechcraft-seekthru-9999
+++ b/metadata/md5-cache/www-misc/leechcraft-seekthru-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~net-misc/leechcraft-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	leechcraft	1b215843b07989f61c5a8ba447fd5550	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0579d3ac0ed5b616144a922dfc0bb1cc
diff --git a/metadata/md5-cache/www-plugins/gnash-0.8.10-r2 b/metadata/md5-cache/www-plugins/gnash-0.8.10-r2
index ddfda9053336..36491b1c7129 100644
--- a/metadata/md5-cache/www-plugins/gnash-0.8.10-r2
+++ b/metadata/md5-cache/www-plugins/gnash-0.8.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gnash-0.8.10.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=9a63667d1b4d25058a39bdcf3846ff28
diff --git a/metadata/md5-cache/www-plugins/kpartsplugin-20110823 b/metadata/md5-cache/www-plugins/kpartsplugin-20110823
index 3d92f5e16921..2fb674b3cb8d 100644
--- a/metadata/md5-cache/www-plugins/kpartsplugin-20110823
+++ b/metadata/md5-cache/www-plugins/kpartsplugin-20110823
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/kpartsplugin-20110823.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=b4324d7be440cf53e79b293685736a13
diff --git a/metadata/md5-cache/www-plugins/kpartsplugin-20110823-r1 b/metadata/md5-cache/www-plugins/kpartsplugin-20110823-r1
index 2300ead87aeb..a845235111f5 100644
--- a/metadata/md5-cache/www-plugins/kpartsplugin-20110823-r1
+++ b/metadata/md5-cache/www-plugins/kpartsplugin-20110823-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/kpartsplugin-20110823.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f792df3e65df3e240fde329a00029e80
diff --git a/metadata/md5-cache/www-plugins/kpartsplugin-20120529 b/metadata/md5-cache/www-plugins/kpartsplugin-20120529
index 9ac32e851812..6ecddfcbb7ec 100644
--- a/metadata/md5-cache/www-plugins/kpartsplugin-20120529
+++ b/metadata/md5-cache/www-plugins/kpartsplugin-20120529
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/kpartsplugin-20120529.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4ac52885b4fddc8fe1e22bccf4743be6
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.5.7 b/metadata/md5-cache/www-plugins/lightspark-0.5.7
index 860a02fd8de1..e57ea66fe38d 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.5.7
+++ b/metadata/md5-cache/www-plugins/lightspark-0.5.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 || ( >=sys-devel/llvm-3 =sys-devel/llvm-2.8* ) virtual/opengl nsplugin? ( dev-libs/nspr x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11
 SLOT=0
 SRC_URI=http://launchpad.net/lightspark/trunk/lightspark-0.5.7/+download/lightspark-0.5.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=014091de0d246c302e3aa00615200d15
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.6.0.1 b/metadata/md5-cache/www-plugins/lightspark-0.6.0.1
index b4304f06eda4..8a074df3f1d8 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.6.0.1
+++ b/metadata/md5-cache/www-plugins/lightspark-0.6.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts media-libs/libsdl >=sys-devel/gcc-4.4 || ( >=sys-devel/llvm-3 =sys-devel/llvm-2.8* ) x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) !gles? ( >=media-libs/glew-1.5.3 virtual/opengl ) gles? ( media-libs/mesa[gles2] ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump )
 SLOT=0
 SRC_URI=http://launchpad.net/lightspark/trunk/lightspark-0.6.0.1/+download/lightspark-0.6.0.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=341196c4bd642c3d6996610eb2a682ea
diff --git a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4 b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4
index 881c6d315dc0..303e650b6829 100644
--- a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4
+++ b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-gtklibs >=sys-apps/util-linux-2.13
 SLOT=0
 SRC_URI=http://web.mit.edu/davidben/Public/nspluginwrapper/nspluginwrapper-1.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67f238bb11d8d7645a65f9bacd63ec8e
diff --git a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r1 b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r1
index d0e70e82a705..f407c1f7c284 100644
--- a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r1
+++ b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-gtklibs >=sys-apps/util-linux-2.13
 SLOT=0
 SRC_URI=http://web.mit.edu/davidben/Public/nspluginwrapper/nspluginwrapper-1.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=869526e4586f97a0f57f524d51569441
diff --git a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r2 b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r2
index 8bf25b027797..a5a9396e60b2 100644
--- a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r2
+++ b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-gtklibs >=sys-apps/util-linux-2.13
 SLOT=0
 SRC_URI=http://web.mit.edu/davidben/Public/nspluginwrapper/nspluginwrapper-1.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f26d0e9cface6e6ca82ddbf194404e58
diff --git a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3 b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
index e33afe64a49a..6ad8b277b1cd 100644
--- a/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
+++ b/metadata/md5-cache/www-plugins/nspluginwrapper-1.4.4-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2:2 net-misc/curl app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-gtklibs >=sys-apps/util-linux-2.13
 SLOT=0
 SRC_URI=http://web.mit.edu/davidben/Public/nspluginwrapper/nspluginwrapper-1.4.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6e7821059844199d1fa6ea926746c21
diff --git a/metadata/md5-cache/www-servers/apache-2.2.22-r1 b/metadata/md5-cache/www-servers/apache-2.2.22-r1
index 4d68fa999080..cd453ab86d96 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.22-r1
+++ b/metadata/md5-cache/www-servers/apache-2.2.22-r1
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.2.22
 RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.22.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/dist/apache/gentoo-apache-2.2.22-20120213.tar.bz2
-_eclasses_=apache-2	487f2187a5cf187b49db334b82d57422	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-2	487f2187a5cf187b49db334b82d57422	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7e43b5e9e37a7986f7f7b71f6507e4b9
diff --git a/metadata/md5-cache/www-servers/apache-2.4.2 b/metadata/md5-cache/www-servers/apache-2.4.2
index 93c12956c031..f25d0fca98e0 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.2
+++ b/metadata/md5-cache/www-servers/apache-2.4.2
@@ -10,5 +10,5 @@ PDEPEND=~app-admin/apache-tools-2.4.2
 RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.2.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.4.1-20120401.tar.bz2
-_eclasses_=apache-2	487f2187a5cf187b49db334b82d57422	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-2	487f2187a5cf187b49db334b82d57422	autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f517279685a46d6c93a7a596dc0e35b3
diff --git a/metadata/md5-cache/www-servers/cherokee-1.2.101-r1 b/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
index b09aa80f94ba..c9f429be772a 100644
--- a/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
+++ b/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre >=sys-libs/zlib-1.1.4-r1 ffmpeg? ( virtual/ffmpeg ) geo
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cherokee-project.com/download/1.2/1.2.101/cherokee-1.2.101.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0912be0beafaab7c8235431c3b49b00e
diff --git a/metadata/md5-cache/www-servers/fnord-1.10-r2 b/metadata/md5-cache/www-servers/fnord-1.10-r2
index 4c96b1062cb0..febf9e302e6e 100644
--- a/metadata/md5-cache/www-servers/fnord-1.10-r2
+++ b/metadata/md5-cache/www-servers/fnord-1.10-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fefe.de/fnord/fnord-1.10.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=918367f5a4cd8a6c46057d5a5452fcb1
diff --git a/metadata/md5-cache/www-servers/nginx-1.0.15 b/metadata/md5-cache/www-servers/nginx-1.0.15
index 3500a4130782..4ea52ae7108e 100644
--- a/metadata/md5-cache/www-servers/nginx-1.0.15
+++ b/metadata/md5-cache/www-servers/nginx-1.0.15
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.0.15.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.8.3 -> ngx_upload_progress-0.8.3.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.15 -> ngx_http_headers_more-0.15.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.4.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.6.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f8fdf0a62420d8e925244bf3fc73ab23
diff --git a/metadata/md5-cache/www-servers/nginx-1.2.1 b/metadata/md5-cache/www-servers/nginx-1.2.1
index d057fb464453..920961d2b3de 100644
--- a/metadata/md5-cache/www-servers/nginx-1.2.1
+++ b/metadata/md5-cache/www-servers/nginx-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) s
 REQUIRED_USE=pcre-jit? ( pcre )
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.2.1.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4ef4a5188c1aa921fc62da6baf748f88
diff --git a/metadata/md5-cache/www-servers/nginx-1.3.1 b/metadata/md5-cache/www-servers/nginx-1.3.1
index ac692048d67b..9b9b700dba07 100644
--- a/metadata/md5-cache/www-servers/nginx-1.3.1
+++ b/metadata/md5-cache/www-servers/nginx-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) s
 REQUIRED_USE=pcre-jit? ( pcre )
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.3.1.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=26446183c804fd7ec81d5986340fa2af
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 41c56cbeac24..5c028fb47022 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 8407b3ec3f37..afe6bc208282 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 7ed6255b68b7..5ac8b12ce0be 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 4da18a760372..1452dd14e5de 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 3761f41227f9..8f49b21bdae4 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	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 737f24d28be0..f2241447ad2c 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	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf4a449356c5ebec0bb6a754a430fd1f
diff --git a/metadata/md5-cache/www-servers/thttpd-2.25b-r7 b/metadata/md5-cache/www-servers/thttpd-2.25b-r7
index aa3a2907cea9..50373da16bfa 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.25b-r7
+++ b/metadata/md5-cache/www-servers/thttpd-2.25b-r7
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9296521c5f30eae5e157f8810647d081
diff --git a/metadata/md5-cache/www-servers/thttpd-2.26.2 b/metadata/md5-cache/www-servers/thttpd-2.26.2
index 34a0d6ac2ea3..1931246bd593 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.26.2
+++ b/metadata/md5-cache/www-servers/thttpd-2.26.2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://opensource.dyc.edu/pub/sthttpd/sthttpd-2.26.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be758ced8194b86f0fad74dfe5d0ac2d
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.2.3-r2 b/metadata/md5-cache/www-servers/uwsgi-1.2.3-r2
index b102cbf234df..b5d206d9b463 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.2.3-r2
+++ b/metadata/md5-cache/www-servers/uwsgi-1.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f177e910459a0f4e19860d9e86eade97
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.2.3-r3 b/metadata/md5-cache/www-servers/uwsgi-1.2.3-r3
index 8fc5246646e6..828dd75fdb85 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.2.3-r3
+++ b/metadata/md5-cache/www-servers/uwsgi-1.2.3-r3
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pax-utils	0ace932c4045349c7fc1af0fe7091acf	php-ext-source-r2	865acbfe8221bfac2bf4701aeb9f1ac3	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4862dd3b858e0e3b7a7097434c9dfd2f
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.3 b/metadata/md5-cache/x11-apps/appres-1.0.3
index c616a21b3c07..ccbbcb6dd717 100644
--- a/metadata/md5-cache/x11-apps/appres-1.0.3
+++ b/metadata/md5-cache/x11-apps/appres-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/appres-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7c95ab2763d470683edbc5ba814eb512
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
index f2f7825ae8d6..0762ddd1b0f5 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXfont
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d510ca32ab97ec5990d9f5dca8127ba0
diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.4 b/metadata/md5-cache/x11-apps/beforelight-1.0.4
index f500c80e16eb..22424fca92b5 100644
--- a/metadata/md5-cache/x11-apps/beforelight-1.0.4
+++ b/metadata/md5-cache/x11-apps/beforelight-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/beforelight-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bade9923cb2cee91226e6b83d25e6ea2
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.5 b/metadata/md5-cache/x11-apps/bitmap-1.0.5
index 7332081c71f7..f17a23ab6e48 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.5
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=294dccda9d27f8c4910fb442c528fcdd
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.6 b/metadata/md5-cache/x11-apps/bitmap-1.0.6
index 3b94dbdf8713..3924d8805bd0 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/x
 DESCRIPTION=X.Org bitmap application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6ceb251fc109322bdd1d481d54a74ffa
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=d78c1799be4ed14503f855dabf7af02e
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.5 b/metadata/md5-cache/x11-apps/editres-1.0.5
index 2b4683633f42..5c342064895a 100644
--- a/metadata/md5-cache/x11-apps/editres-1.0.5
+++ b/metadata/md5-cache/x11-apps/editres-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/editres-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a607d0981d62b43c824c18e5cdd11e8f
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
index 9d85a14ce0f8..d1169e4edbdd 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3d9b3b216a76298e50fc04b3e04b4fcd
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
index 9e01b8277888..fda9dfcc3a94 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-de
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1ed9a8501c4b86b397ff30e713e116f2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c22f7ef16fa951734523930f0f958413
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.3 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
index 709bed041877..f411bc63a991 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6db5971158ba90f227abe217f316ec67
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
index 26455801dc98..647dd49ef78f 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 >=s
 DESCRIPTION=list fonts served by X font server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-proto/xproto x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=df7e20527c0df4c24d84159c81171a0d
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=bad094d1be902ea79babb5c2660f3783
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.4 b/metadata/md5-cache/x11-apps/fstobdf-1.0.4
index 7cedb92ed3dc..fac5823230fb 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.4
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7f9d9cbe79b43ed27d0c4d4b839196bf
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.5 b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
index 5787106503ac..5ae551daf892 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.5
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 >=sy
 DESCRIPTION=generate BDF font from X font server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=ce0f7b9337dd5c6b4868f5e77603f157
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=8f98dc74cce5dd48cb7a9b5cab1bfd38
diff --git a/metadata/md5-cache/x11-apps/grandr-0.1 b/metadata/md5-cache/x11-apps/grandr-0.1
index 39700ac23249..d3636b84fde1 100644
--- a/metadata/md5-cache/x11-apps/grandr-0.1
+++ b/metadata/md5-cache/x11-apps/grandr-0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND==x11-libs/gtk+-2* >=x11-libs/libXrandr-1.2 gnome-base/gconf !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/grandr-0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=8dcfa0a0c13363da30371c1fe7ab6d5a
diff --git a/metadata/md5-cache/x11-apps/grandr-0.1-r1 b/metadata/md5-cache/x11-apps/grandr-0.1-r1
index 119103ecd041..bbc69afc4784 100644
--- a/metadata/md5-cache/x11-apps/grandr-0.1-r1
+++ b/metadata/md5-cache/x11-apps/grandr-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/gtk+:2 >=x11-libs/libXrandr-1.2 gnome-base/gconf
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/grandr-0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7b9c79ac49ddfe1935cd072e95e33f27
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.4 b/metadata/md5-cache/x11-apps/iceauth-1.0.4
index 1e91379f59a3..7fd0a98e83e8 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.4
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5a55cdda86f471a257af57cd51918436
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.5 b/metadata/md5-cache/x11-apps/iceauth-1.0.5
index df94e6038516..685722498b5c 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.5
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b03729b54086f74200266e5ec5296efa
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.3 b/metadata/md5-cache/x11-apps/ico-1.0.3
index bd2ac9d737db..817d8f66f8c4 100644
--- a/metadata/md5-cache/x11-apps/ico-1.0.3
+++ b/metadata/md5-cache/x11-apps/ico-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/ico-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5e49e1891087f5836389f3800c5ee4f3
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.2 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.2
index b77d3041f74c..d08ae22964a7 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.2
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.2
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 !<=x11-base/xorg-x1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=7b41e979c633433f0f79ff2aec0c481f
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.1 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.1
index 0a7f513a3284..959cdf692ae9 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.1
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.1
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.23[video_cards_intel] >=x11-libs/libpciaccess-0.10
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bc46a6f83110aebb11c08dc9bbe031a7
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
index 9e6f35968b0d..41269aa4db95 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.2
@@ -3,11 +3,11 @@ DEPEND=x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel] >=x11-libs/lib
 DESCRIPTION=intel gpu userland tools
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-libs/cairo >=x11-libs/libdrm-2.4.31[video_cards_intel] >=x11-libs/libpciaccess-0.10
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a7c22c5608f95f3471cb9cf8259dd4b9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=72d427266d0d770b557568b7b1ad96fd
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.2 b/metadata/md5-cache/x11-apps/listres-1.0.2
index 30320e4a1410..1d51d5b0f428 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.2
+++ b/metadata/md5-cache/x11-apps/listres-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=42c1f0f9c58478bcb5a931d0956c7d7e
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.3 b/metadata/md5-cache/x11-apps/listres-1.0.3
index 1a99a4d36d6e..6ef89430b9e1 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.3
+++ b/metadata/md5-cache/x11-apps/listres-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys
 DESCRIPTION=list resources in widgets
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/listres-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d32497482aeb18160202a8e4b2f016f3
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c1c0fe9c51937fb1b4a0529860c9ec56
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.0 b/metadata/md5-cache/x11-apps/luit-1.1.0
index 976b8895c268..1f4294cd0a56 100644
--- a/metadata/md5-cache/x11-apps/luit-1.1.0
+++ b/metadata/md5-cache/x11-apps/luit-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/luit-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=429831378e2fa4d8bcef72c0e6f4f6f1
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.1 b/metadata/md5-cache/x11-apps/luit-1.1.1
index b47d51fff061..c59c65744d23 100644
--- a/metadata/md5-cache/x11-apps/luit-1.1.1
+++ b/metadata/md5-cache/x11-apps/luit-1.1.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automa
 DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/luit-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e2df9a8f91193b66cc1697107c1e9e80
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=a9193842edc36cacd6be4dd6ea0aa8df
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.6 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
index 378beaeced2d..f456f5af671d 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/mkfontscale
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=db4dd882c62f76714476f0f5236c7e5e
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
index b62f78d6bff1..8e6eb466d08d 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/au
 DESCRIPTION=create an index of X font files in a directory
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-apps/mkfontscale
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=554a245c66724a1ae0b99186511506ed
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=bb71562631bc3bc9b6d2c3cbb05ebc85
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.8 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
index 45704b91de70..8529f412a13f 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.8
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c9a4a7238ff829e030dc79caf6d62a30
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
index 1387ab53f0e8..ac123deaa061 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=2f45309561d5b978a665ae42b78c6d8d
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1 b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
index 0ffdacda65ed..633c314e4daa 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=dd1b73da8b38bb22cdf3e98cd9be22f1
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0 b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
index 9ab2abbccaf8..b89ce796c072 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip
 DESCRIPTION=create an index of scalable font files for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7b27d3f44e56cc9aa7828e939c9a7a9c
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=41c383eb4ce24e7ddb94a66874399dc3
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.2 b/metadata/md5-cache/x11-apps/oclock-1.0.2
index 2d56a77409bb..aadfae7822bc 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.2
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1996126986379e9e859966908e5ebddf
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.3 b/metadata/md5-cache/x11-apps/oclock-1.0.3
index d91be4469e31..5e3e8d21bb4b 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.3
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/
 DESCRIPTION=round X clock
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=b7184be1f58b0a858c43d8b6aae23adc
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=202d0c03774235609be62919a07e96bc
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.4 b/metadata/md5-cache/x11-apps/rgb-1.0.4
index d9bd0d7bf5cb..1842a638ee89 100644
--- a/metadata/md5-cache/x11-apps/rgb-1.0.4
+++ b/metadata/md5-cache/x11-apps/rgb-1.0.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=11ff2152eb68eb6aa5bda8532aeea7b8
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.4 b/metadata/md5-cache/x11-apps/rstart-1.0.4
index f45e16b46d59..920c46e848be 100644
--- a/metadata/md5-cache/x11-apps/rstart-1.0.4
+++ b/metadata/md5-cache/x11-apps/rstart-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=50880b329f120e1fbe2c4980534c58a0
diff --git a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
index c73d0d8c8493..9557c59853e7 100644
--- a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
+++ b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/scripts-1.0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0000598efad6fd0c04c232d04ac4fcdd
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.0.6 b/metadata/md5-cache/x11-apps/sessreg-1.0.6
index 02a7df08f762..1713f018fb32 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.0.6
+++ b/metadata/md5-cache/x11-apps/sessreg-1.0.6
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d930070632cf22861b1250c503527821
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.0.7 b/metadata/md5-cache/x11-apps/sessreg-1.0.7
index 7ad7a965f609..9f682b7137fb 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.0.7
+++ b/metadata/md5-cache/x11-apps/sessreg-1.0.7
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=226c4548a97991ffeeb2703e07f783b9
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
index 8ec7b062b3eb..31c81b92948e 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4709fb56b6aac63f940e6d16d3b4f44f
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
index 39ba351e8c55..a153199e08fd 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11
 DESCRIPTION=Controls the keyboard layout of a running X server.
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7cce2865a622794ced87291bd52fd1af
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=09e498c7d7be7068dc7b971849d8e4d0
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.3 b/metadata/md5-cache/x11-apps/showfont-1.0.3
index f3d122feb34d..98e552290f7d 100644
--- a/metadata/md5-cache/x11-apps/showfont-1.0.3
+++ b/metadata/md5-cache/x11-apps/showfont-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/showfont-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d6fd6464055627c8ec204cf126de3909
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.4 b/metadata/md5-cache/x11-apps/smproxy-1.0.4
index ea2564e33a7c..730c6db79be6 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.4
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libSM x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=670546f230206dc5b082c9535203d04d
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.5 b/metadata/md5-cache/x11-apps/smproxy-1.0.5
index e6a9228be209..6177e0feb62c 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.5
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8662dca33843c16c7f6a5f2af00cdfcc
diff --git a/metadata/md5-cache/x11-apps/transset-1.0.0 b/metadata/md5-cache/x11-apps/transset-1.0.0
index fa96a1ac419d..8dbd0ff57ee7 100644
--- a/metadata/md5-cache/x11-apps/transset-1.0.0
+++ b/metadata/md5-cache/x11-apps/transset-1.0.0
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/transset-1.0.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b82b1bcfc76408e76af921331871efff
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.3 b/metadata/md5-cache/x11-apps/viewres-1.0.3
index e291a35f7407..9b9694225b3d 100644
--- a/metadata/md5-cache/x11-apps/viewres-1.0.3
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9d1236d10dfa531bed42c5f4446e9264
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.3 b/metadata/md5-cache/x11-apps/x11perf-1.5.3
index 50ee7f1eaf16..53529462818c 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.3
+++ b/metadata/md5-cache/x11-apps/x11perf-1.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0d219f8c633ff859ac7f3a17bee5b135
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.4 b/metadata/md5-cache/x11-apps/x11perf-1.5.4
index c51284166130..00b1bf75713c 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.4
+++ b/metadata/md5-cache/x11-apps/x11perf-1.5.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a95c894c13390c0a53facad7bfa577ee
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.5 b/metadata/md5-cache/x11-apps/xauth-1.0.5
index 6d610d29017e..ea38928ddc90 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.5
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=981e9f0ce60a6562c2d7d1a08b668631
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.6 b/metadata/md5-cache/x11-apps/xauth-1.0.6
index 48d5516c7ca0..fd79b3a176a6 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.6
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=774611d3f78c2e2160f801bccebf0989
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.7 b/metadata/md5-cache/x11-apps/xauth-1.0.7
index 8f2f3a521fc4..dc1b10fa7318 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.7
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X authority file utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=b5e2e448edbae07f2f09865ebfb44a29
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=7c216e82d948a7fa280dbee5eb01eb82
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.1.2 b/metadata/md5-cache/x11-apps/xbacklight-1.1.2
index 94268f489cc1..41df4f847bbe 100644
--- a/metadata/md5-cache/x11-apps/xbacklight-1.1.2
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.2 x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a2b90972d3e29bfb6f9d2187f0b98823
diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.3 b/metadata/md5-cache/x11-apps/xbiff-1.0.3
index ec22492636ed..82568edd2555 100644
--- a/metadata/md5-cache/x11-apps/xbiff-1.0.3
+++ b/metadata/md5-cache/x11-apps/xbiff-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1056eb6c8658636074eb6392961e410d
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.0.4.1 b/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
index 087f8f013f88..d9312ee37c3b 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
+++ b/metadata/md5-cache/x11-apps/xcalc-1.0.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e63b59f952267257b28f7dfc12e364f3
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.1 b/metadata/md5-cache/x11-apps/xclipboard-1.1.1
index 45130b99f1fb..ef067a2e6a65 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.1
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=84372162bd83b6f44f65a614dadd7880
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.2 b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
index a018100db19f..bc66bb5b4c37 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.2
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1
 DESCRIPTION=interchange between cut buffer and selection
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8c2b07e33d6a7746383e6c3dbec3289e
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=20410ed5dece231a36a52b4896082b63
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.5 b/metadata/md5-cache/x11-apps/xclock-1.0.5
index f3f82b790338..75c2ac5356a7 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.5
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=aa04d723c97d197c84fb0b6b6d3e46ef
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.6 b/metadata/md5-cache/x11-apps/xclock-1.0.6
index 59eb109dd483..47a6ff4672bb 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.6
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-l
 DESCRIPTION=analog / digital clock for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=fa1b754ca7c96587e2ba1c0def783362
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=61e2ba4a9b45cf4af5b43ac32629671b
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.3 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
index d5cd75bad314..b43a61169a17 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5291b1a022e88c803ba618b5640aa016
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
index 82ebf3228364..047437afe830 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
 DESCRIPTION=Device Color Characterization utility for X Color Management System
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=96b7564a2bca329d34473cff3c2430d3
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=2cba6ae5b36967ab7e3672160af81afe
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.4 b/metadata/md5-cache/x11-apps/xconsole-1.0.4
index 2ac45f890679..2302be0fa3fa 100644
--- a/metadata/md5-cache/x11-apps/xconsole-1.0.4
+++ b/metadata/md5-cache/x11-apps/xconsole-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=614c12f9030fd79d8d8d1173675ccbc8
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.4 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
index cde1ab99cbc3..f7879e580491 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c1399a9e32e72b08fb8e38cd2933f6d3
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
index 0228200907b8..f070ea80f53f 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0 || ( >=sys-devel/
 DESCRIPTION=create an X cursor file from a collection of PNG images
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e1b5f3512d16c1524362922f3e92205a
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c02c7a54e6e480e9fee896959e3de602
diff --git a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
index 2e103e3eefb7..9e53d1900a9b 100644
--- a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
+++ b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=458e0c48d1d7cdcd83ab062c686d0245
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.2 b/metadata/md5-cache/x11-apps/xditview-1.0.2
index f575cf446d22..01a5d2e61d26 100644
--- a/metadata/md5-cache/x11-apps/xditview-1.0.2
+++ b/metadata/md5-cache/x11-apps/xditview-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xditview-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f098438e25dcaeac5741d74a42d07304
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.11-r1 b/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
index 13098b521862..2b086b63b327 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.11-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/xrdb x11-libs/libXdmcp x11-libs/libXaw >=x11-apps/xinit-1.0.2-r3 x11-libs/libXinerama x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-apps/sessreg x11-apps/xconsole consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=478f8cdfbd070d844f6d40bb7cfd53cd
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
index 6d6cbda99f99..33dbfb9a55f7 100644
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
+++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3cb2404fd0d62e50982de2acbdca2665
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
index 2324133a027a..b7a412de8819 100644
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=74431fd39ed34e1bfdd4e854f0c030b0
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.0 b/metadata/md5-cache/x11-apps/xedit-1.2.0
index 30b61d9b54e3..53989317f49f 100644
--- a/metadata/md5-cache/x11-apps/xedit-1.2.0
+++ b/metadata/md5-cache/x11-apps/xedit-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xedit-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9e6d765374c67d266d6fe984b2c07b91
diff --git a/metadata/md5-cache/x11-apps/xev-1.1.0 b/metadata/md5-cache/x11-apps/xev-1.1.0
index 72e27ea83a3c..7ada7a5f8c39 100644
--- a/metadata/md5-cache/x11-apps/xev-1.1.0
+++ b/metadata/md5-cache/x11-apps/xev-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f6ef94ed6aaea06936de7176cc595ece
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.0 b/metadata/md5-cache/x11-apps/xev-1.2.0
index 2d04531521f5..59ed742c6d94 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.0
+++ b/metadata/md5-cache/x11-apps/xev-1.2.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/auto
 DESCRIPTION=print contents of X events
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5d21250f7c60e6845dbad1c045e479e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=7cdec53938b5031c16477fa53a5d9f1a
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.1 b/metadata/md5-cache/x11-apps/xeyes-1.1.1
index e3605486563c..e9775743b59f 100644
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.1
+++ b/metadata/md5-cache/x11-apps/xeyes-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xeyes-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7560e1ab1b6308f37c238cfdff925e89
diff --git a/metadata/md5-cache/x11-apps/xf86dga-1.0.3 b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
index 30ec3c256052..63b693cdc104 100644
--- a/metadata/md5-cache/x11-apps/xf86dga-1.0.3
+++ b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xf86dga-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=98f22a71c3efe508cdcfd1351ae68eb2
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.0 b/metadata/md5-cache/x11-apps/xfd-1.1.0
index c0cb4e064832..8c94df429248 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.0
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=21a3767ad36a4c4107cba178c21ced6d
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.1 b/metadata/md5-cache/x11-apps/xfd-1.1.1
index 525312cc9ed7..a7b8fd7066e3 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.1
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libX
 DESCRIPTION=X.Org xfd application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=c6277aa7e6dffae5347d930c65b86757
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=3b4bffcab784158b14a5234b9371f261
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.3 b/metadata/md5-cache/x11-apps/xfontsel-1.0.3
index 7ace0e9fb7b1..3358c4d16be9 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.3
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=32534fb207072bc68bcb8c24d6284ed6
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.4 b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
index cf68c50aa565..6c2a18f99915 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.4
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys
 DESCRIPTION=point and click selection of X11 font names
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d7e4bbb02d17eb25d39c2a89738d0cbc
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=57a268b352b4774ea36138d0a92c8c97
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.4 b/metadata/md5-cache/x11-apps/xgamma-1.0.4
index 44e13ee1087c..6d0cf2a8ffe6 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.4
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7c06d792b8dfee4e70e4dd4621f76c18
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.5 b/metadata/md5-cache/x11-apps/xgamma-1.0.5
index 4c8f6fe83f59..c6d967496167 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.5
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys
 DESCRIPTION=Alter a monitor's gamma correction through the X server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=62e564e4e46655c5c28e69a73da244be
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=9fa4960da7bd1802056ed41eb67786bf
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.3 b/metadata/md5-cache/x11-apps/xgc-1.0.3
index a100789011be..dd389751e95b 100644
--- a/metadata/md5-cache/x11-apps/xgc-1.0.3
+++ b/metadata/md5-cache/x11-apps/xgc-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7164cc5e3d73a724486bc3e0977150e4
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.4 b/metadata/md5-cache/x11-apps/xhost-1.0.4
index f5aa360ccf7e..c05bed6009c3 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.4
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ded148184b0a111ed54a2f5468b8b800
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.5 b/metadata/md5-cache/x11-apps/xhost-1.0.5
index b37b93124465..4c58780d0593 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.5
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Controls host and/or user access to a running X server.
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=eb0387e29a755956a7e2ba87145be371
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=835cf5db87d3124c299241244671b536
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 b/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
index 849bc65a99d6..847a77679d9e 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.0-r2
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7963ed1b386e2dfbbe1ba2576eeb6a8e
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.1 b/metadata/md5-cache/x11-apps/xinit-1.3.1
index 405d4e8e1138..3584900fda59 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.1
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.1
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=531281d5eca3984a04d1dbe03f929b87
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.1-r1 b/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
index 65a0cd40191e..57eb559fe773 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.1-r1
@@ -10,5 +10,5 @@ PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=00c8c603d42bc2586c82d7438e509b67
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.2 b/metadata/md5-cache/x11-apps/xinit-1.3.2
index fe99b63815c2..fa3c018c26ea 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=X Window System initializer
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=+minimal
-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=MIT GPL-2
 PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=bd20e846a7d13d31232a91639d04635b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=6d7f2b51be3e4290dc70c3de14113975
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.3 b/metadata/md5-cache/x11-apps/xinput-1.5.3
index 2f7ccd63b42b..99faf59871ab 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.3
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bafc5e3d78b8027ce6c661fe96a6a31a
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.3-r1 b/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
index 4c41887cd502..c9c5ff3b1507 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.3-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=449941e5227eb394b5dde6e395d876c5
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.4 b/metadata/md5-cache/x11-apps/xinput-1.5.4
index d3cc17d59c22..beba609892b3 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.4
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f05c5910f618748b64cb8aaf0b2fbbc0
diff --git a/metadata/md5-cache/x11-apps/xinput-1.6.0 b/metadata/md5-cache/x11-apps/xinput-1.6.0
index 12ad795a30e7..a8b47edf8f24 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.6.0
+++ b/metadata/md5-cache/x11-apps/xinput-1.6.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6652b4e826a38760831b6527db68625a
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f219efc348b9e1b73a2a3f7760db0b84
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.2.3 b/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
index 0570224e454d..2c601d9fb154 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.2.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9d699bb34a042aa5bbdcbd3bcf982ed5
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.2.4 b/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
index f9eaff066a17..b6d59a8c7d73 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=82521968b88c3d86cd9c11d9b32e344e
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.2 b/metadata/md5-cache/x11-apps/xkbevd-1.1.2
index ae3bd2aaf608..894989da8d93 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.2
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=21fc3c20957de46d7fb914fa22dcb19d
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.3 b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
index 928159853f02..c981bdc5b22e 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/auto
 DESCRIPTION=XKB event daemon
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=ff65ea936844e6c7325b2a65c35b04e3
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=107e41f00d5260b198c79dff6caa1688
diff --git a/metadata/md5-cache/x11-apps/xkbprint-1.0.3 b/metadata/md5-cache/x11-apps/xkbprint-1.0.3
index 5f60692d21af..46a0395d1c7e 100644
--- a/metadata/md5-cache/x11-apps/xkbprint-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkbprint-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=02b35a4cb2cc220f90f961e8ecc63da7
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.3 b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
index 6d543b2777a0..0156af70a64d 100644
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=04439941e3419cc4e952fef83ee0e9bf
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.3 b/metadata/md5-cache/x11-apps/xkill-1.0.3
index c8af588388f8..f44dcdb06558 100644
--- a/metadata/md5-cache/x11-apps/xkill-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkill-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=94c818fada6fefc8383076bae5c8615e
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.0 b/metadata/md5-cache/x11-apps/xload-1.1.0
index cd6e120b8a39..4b2c0f4c90bb 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.0
+++ b/metadata/md5-cache/x11-apps/xload-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xload-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6b37b36bd8a3b15c44caf536f7f15532
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.1 b/metadata/md5-cache/x11-apps/xload-1.1.1
index 3aca380f0744..3e99048ed152 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.1
+++ b/metadata/md5-cache/x11-apps/xload-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/
 DESCRIPTION=system load average display for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xload-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=520a0a43b101216fa5764a1f3b5e043f
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=20d6bca256d235214bb7a71849cd10cb
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.3 b/metadata/md5-cache/x11-apps/xlogo-1.0.3
index 5d71b64f401c..a99b661ab278 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.3
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=05502aae677645b8d0ab67af26db015f
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.4 b/metadata/md5-cache/x11-apps/xlogo-1.0.4
index 1ad44775cf2c..a960cc748cd2 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-l
 DESCRIPTION=X Window System logo
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
 LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=075d16d8271a614273d585cd8d756be2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4e62793aeae3c9fcce3ab19e834da42f
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.0 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
index b7401dd6ddf3..603a7ba3f4db 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6bed074ae4d8962ad8ff26f1841a9e9c
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
index e406ad2c038f..f5b156e561cd 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
 DESCRIPTION=list interned atoms defined on server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libxcb
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=99f0a104bdbcca17b3fa19e70f6cc901
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=718c55c4cbb539c65b0fcf486399e0cb
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.1 b/metadata/md5-cache/x11-apps/xlsclients-1.1.1
index 5f3b16ed9bd7..7c06593a6c25 100644
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b2e34f01ef57c97929bdd60ca1d2c1bd
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.2 b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
index efa7d0d25f1e..6cc774582f0c 100644
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.2
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=070cd315d548dfcd94ccbf9899348d9c
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.3 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
index bee3b3a847ce..f98d8819d95b 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=03f59f464c06ed495ea7c0a865b96064
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
index 6bba6a17952b..81b0f6ecaa31 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
 DESCRIPTION=X.Org xlsfonts application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e10102edbe2f47db7d456e24b749acc4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=5e5bde78e7f18dbdae679c3ce84be0d3
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.4 b/metadata/md5-cache/x11-apps/xmag-1.0.4
index cc977092c14d..397e0a023131 100644
--- a/metadata/md5-cache/x11-apps/xmag-1.0.4
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cb5db16cf92eeffc242f92b815e4af1f
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.1 b/metadata/md5-cache/x11-apps/xman-1.1.1
index cb2ddfcc33e9..258163f268a3 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.1
+++ b/metadata/md5-cache/x11-apps/xman-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xman-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7998999780848533f35fe8a5f3bf1898
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.2 b/metadata/md5-cache/x11-apps/xman-1.1.2
index 95eb0353b0b2..56c025609929 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.2
+++ b/metadata/md5-cache/x11-apps/xman-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xman-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d58ec8930991a8378ba3a427dfcdbddd
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.3 b/metadata/md5-cache/x11-apps/xmessage-1.0.3
index 0ddcec564176..518317c1f831 100644
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.3
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmessage-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=aa47d9a0c1258fb8074f1ed70d8b5923
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.5 b/metadata/md5-cache/x11-apps/xmodmap-1.0.5
index 6b5d3b06fa03..2004c50ad21f 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.5
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=37bb6f9f7e07efb3f370ade52673881e
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.6 b/metadata/md5-cache/x11-apps/xmodmap-1.0.6
index a42b6962d6a0..745c4fd10ff7 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=94bb895e69b7f472555049f466cfb3df
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.7 b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
index f857819c882c..6d8e97d765ca 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
 DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d1c6c55cc2c6ae25dd3ae4e15b496617
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=b5f8a4bf9c694aaa9e59d581bbe9fc45
diff --git a/metadata/md5-cache/x11-apps/xmore-1.0.2 b/metadata/md5-cache/x11-apps/xmore-1.0.2
index d93248b4bf3a..77e1ec21d758 100644
--- a/metadata/md5-cache/x11-apps/xmore-1.0.2
+++ b/metadata/md5-cache/x11-apps/xmore-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmore-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7423b372efcdb2c946ea5830cbb0fad9
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.3 b/metadata/md5-cache/x11-apps/xpr-1.0.3
index 67c427ebb2ad..6b137a9161a7 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.3
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=a9f78cf3013622583fdd18324eaf95e9
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.4 b/metadata/md5-cache/x11-apps/xpr-1.0.4
index f0e1d98d7ba8..8200bdd5f07d 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.4
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=s
 DESCRIPTION=X.Org xpr application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=9889d557c2b31fb575001c6979591cf4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=0538448c3a4d626ade8251ea9e72ad39
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.0 b/metadata/md5-cache/x11-apps/xprop-1.2.0
index 1690aea8c919..42ae0e277163 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.0
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xprop-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4890eb19b380696c9e3c988707b767f9
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.1 b/metadata/md5-cache/x11-apps/xprop-1.2.1
index 5ed6d965045a..5a2201a2ebf6 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.1
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xprop-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a4b25f9f6f95fd7adc45aed67dcadeeb
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.3.4 b/metadata/md5-cache/x11-apps/xrandr-1.3.4
index 538b3ffa3e78..fecc6444cb62 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.3.4
+++ b/metadata/md5-cache/x11-apps/xrandr-1.3.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5302ba52e83e4a394171b9fee1f963a8
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.3.5 b/metadata/md5-cache/x11-apps/xrandr-1.3.5
index 61a6f7b2b0fe..63ef51057f45 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.3.5
+++ b/metadata/md5-cache/x11-apps/xrandr-1.3.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f4cafe1bb7206a5c3fd1353eedc5d0c4
diff --git a/metadata/md5-cache/x11-apps/xrdb-1.0.9 b/metadata/md5-cache/x11-apps/xrdb-1.0.9
index 007fcb05d082..a8131c60035a 100644
--- a/metadata/md5-cache/x11-apps/xrdb-1.0.9
+++ b/metadata/md5-cache/x11-apps/xrdb-1.0.9
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=357651ffb5d44d581582f0d4d2938b52
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.4 b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
index a6b6c86a016a..632f137763e6 100644
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.4
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4d15e7c5ee862c2a6f5e1687cb926eb0
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.1-r1 b/metadata/md5-cache/x11-apps/xset-1.2.1-r1
index d35de3dc86be..8a5239790595 100644
--- a/metadata/md5-cache/x11-apps/xset-1.2.1-r1
+++ b/metadata/md5-cache/x11-apps/xset-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xset-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a0de4b2ed6089df91ccd0dbcd0616a89
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.2 b/metadata/md5-cache/x11-apps/xset-1.2.2
index 33805d43c0c8..5acaad3d3381 100644
--- a/metadata/md5-cache/x11-apps/xset-1.2.2
+++ b/metadata/md5-cache/x11-apps/xset-1.2.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xset-1.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=2a4b477504bb918f04fca53bb2b4d115
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.0 b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
index 5c58ea7c47a3..66b16ae49ed4 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.0
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=56f1e434b4f1262572e611be7f98621e
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.2 b/metadata/md5-cache/x11-apps/xsm-1.0.2
index 90ebd804cb31..6692f538206a 100644
--- a/metadata/md5-cache/x11-apps/xsm-1.0.2
+++ b/metadata/md5-cache/x11-apps/xsm-1.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e89ba5a6bfa1fd6f89752a3f8ac2eb2a
diff --git a/metadata/md5-cache/x11-apps/xstdcmap-1.0.2 b/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
index cbf012ddb1e9..1bbf78d8448f 100644
--- a/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
+++ b/metadata/md5-cache/x11-apps/xstdcmap-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xstdcmap-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4bf3d1de809fa1534714f288bae2ea49
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2 b/metadata/md5-cache/x11-apps/xtrap-1.0.2
index 7f9a91b8ca80..8045dd98c9fa 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXTrap !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=d123bcc4078122f3d7cff0fc564ddf1c
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1 b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
index 939d5cdd7cee..75007eb8fb39 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/au
 DESCRIPTION=X.Org xtrap application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXTrap
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a7a117f3cc832d886b09fe1b59aebb68
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=d7b550cf1c625fe55c922932110f2543
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.2 b/metadata/md5-cache/x11-apps/xvidtune-1.0.2
index 3e149c8a089e..97a4c14cb392 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.2
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=2e864897c3fd8dd832a3a752864f46e9
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
index f9c81bef0333..24bd73ecfb19 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/l
 DESCRIPTION=video mode tuner for Xorg
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d5677c11f9ce4d2ed9fb55c77d4d23a6
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=86cec1394c6390f94fd015f5eb803c55
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.1 b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
index 0eea8a140b41..92ded6363721 100644
--- a/metadata/md5-cache/x11-apps/xvinfo-1.1.1
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXv x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f9a4a37368e0aae3c9966ef964e321ef
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.4 b/metadata/md5-cache/x11-apps/xwd-1.0.4
index 4d726c9ba39a..9567af0bb40f 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8f1834e447c8f8beaae104b8103f619e
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.5 b/metadata/md5-cache/x11-apps/xwd-1.0.5
index 4e463f33c00e..b23f0ebd7e6e 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.5
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libxkbfile x11-proto/xproto || (
 DESCRIPTION=dump an image of an X window
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=dab73c6c43427725eae8c3733fd5b2ef
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=283e5827e1928e3cbec4244b632af53f
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.1 b/metadata/md5-cache/x11-apps/xwininfo-1.1.1
index f736b75fa836..bf38fff385b8 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.1
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5e159dd4a059d92bf385ca0588a7efd0
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.2 b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
index 717eb4144029..ecc1bdff1af1 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.2
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d6d1fcdab963f323d308150fa887a94f
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.3 b/metadata/md5-cache/x11-apps/xwud-1.0.3
index d1d2d92211f2..9156f344b77b 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.3
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=72ffec609fecc4d04f4da1196ab28287
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.4 b/metadata/md5-cache/x11-apps/xwud-1.0.4
index 6e59b33ff802..296c74cbbc6f 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
 DESCRIPTION=image displayer for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e294f1e5212f0b29bfdef0374d8a01ab
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f5ed69dc47dd39a9e2d94c7191c8979d
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.12 b/metadata/md5-cache/x11-base/xorg-drivers-1.12
index a24ebbe16ddd..6a72969ed975 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.12
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.12
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 IUSE=video_cards_apm video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=as-is
 PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_v4l? ( x11-drivers/xf86-video-v4l ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !<=x11-drivers/xf86-video-chips-1.2.4 !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !<=x11-drivers/xf86-video-rendition-4.2.4 !<=x11-drivers/xf86-video-sisusb-0.9.4 !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-tseng-1.2.4
 SLOT=0
-_md5_=362e8fdc319267141edad622bd3ec3a4
+_md5_=223f72999ec72f4f9f65b5086538637d
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 70fbe4570709..662e2d4e68e7 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
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 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	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b62e8b57e208e363700a75058cc006d7
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 8e059cdd1039..7f18b9e00aec 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
@@ -11,5 +11,5 @@ RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=
 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	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b777175f2cb94743efbb5594b70f0301
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.2 b/metadata/md5-cache/x11-base/xorg-server-1.12.2
index 39e01419b4f7..2de6a5a3c4f7 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.2
@@ -4,12 +4,12 @@ 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
 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.12.901 >=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 )
 REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8fee24f944ebd2e42fea37ebfc6152c2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=a07a5b2194b53989a7fd11729d86f103
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1 b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1
index 177ee3856724..f721562f7a8a 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1
@@ -10,5 +10,5 @@ PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.9 )
 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.15.20 >=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.5 >=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.3 ) 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 )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.9.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=10def49ababc6c04a004de677b9c9109
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta b/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta
index ae679be9101d..0ab4c08474ab 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta
@@ -4,11 +4,11 @@ DESCRIPTION=Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and new
 EAPI=4
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules multilib pax_kernel qt4 static-libs kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0 as-is
 RDEPEND=<=x11-base/xorg-server-1.12.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) kernel_linux? ( virtual/modutils )
 RESTRICT=bindist
 SLOT=1
 SRC_URI=http://www2.ati.com/drivers/hotfix/catalyst_12.6_hotfixes/amd-driver-installer-8.98-x86.x86_64.zip
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=809b18ba530ad174cfc1b56c1ede6ff1
+_md5_=7ff7a1ce43a3b9c45d0aeacc16052bde
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.31 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.31
index a37821484b83..36e4da623302 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.31
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.31
@@ -10,5 +10,5 @@ RDEPEND=<x11-base/xorg-server-1.11 gtk? ( !media-video/nvidia-settings dev-libs/
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.31/NVIDIA-Linux-x86-173.14.31-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.31/NVIDIA-Linux-x86_64-173.14.31-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.31/NVIDIA-FreeBSD-x86-173.14.31.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c601954e86e73f656d4d40f3911adb1
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.34 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.34
index 4790837a05e4..fa879954ec61 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.34
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.34
@@ -10,5 +10,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.34/NVIDIA-Linux-x86-173.14.34-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.34/NVIDIA-Linux-x86_64-173.14.34-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.34/NVIDIA-FreeBSD-x86-173.14.34.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebd7ef929bd3e2f4494fa8efd193f185
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.35 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.35
index 568b9f091033..81a4d3254312 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.35
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.35
@@ -10,5 +10,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.35/NVIDIA-Linux-x86-173.14.35-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.35/NVIDIA-Linux-x86_64-173.14.35-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.35/NVIDIA-FreeBSD-x86-173.14.35.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=950324611b022a65ae4616dcd0644762
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.40 b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.40
index dc01a93a7b5b..f553c5dbf645 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.40
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.40
@@ -11,5 +11,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/295.40/NVIDIA-Linux-x86-295.40.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/295.40/NVIDIA-Linux-x86_64-295.40.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/295.40/NVIDIA-FreeBSD-x86-295.40.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bc74e2d3d86c6ea82071b1cad96de06
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.49 b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.49
index 8c207a2f6c8f..0689ab1d58ff 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.49
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.49
@@ -11,5 +11,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/295.49/NVIDIA-Linux-x86-295.49.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/295.49/NVIDIA-Linux-x86_64-295.49.run ) amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/295.49/NVIDIA-FreeBSD-x86_64-295.49.tar.gz ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/295.49/NVIDIA-FreeBSD-x86-295.49.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69db71528613d2be803e8132ed837a80
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.53 b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.53
index b5e223975698..4f48d2dea865 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.53
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.53
@@ -11,5 +11,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/295.53/NVIDIA-Linux-x86-295.53.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/295.53/NVIDIA-Linux-x86_64-295.53.run ) amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/295.53/NVIDIA-FreeBSD-x86_64-295.53.tar.gz ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/295.53/NVIDIA-FreeBSD-x86-295.53.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3881a3af58ccc9929958f7f66ea3a43
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.59 b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.59
index ebd4fa05e9c9..6181c2503be0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-295.59
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-295.59
@@ -11,5 +11,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/295.59/NVIDIA-Linux-x86-295.59.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/295.59/NVIDIA-Linux-x86_64-295.59.run ) amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/295.59/NVIDIA-FreeBSD-x86_64-295.59.tar.gz ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/295.59/NVIDIA-FreeBSD-x86-295.59.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccd5f5eb2861d95125c968e8485f0d81
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-302.17 b/metadata/md5-cache/x11-drivers/nvidia-drivers-302.17
index 952fe36b022f..586552b4a74f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-302.17
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-302.17
@@ -11,5 +11,5 @@ RDEPEND=<x11-base/xorg-server-1.12.99 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) m
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/302.17/NVIDIA-Linux-x86-302.17.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/302.17/NVIDIA-Linux-x86_64-302.17.run ) amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/302.17/NVIDIA-FreeBSD-x86_64-302.17.tar.gz ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/302.17/NVIDIA-FreeBSD-x86-302.17.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d89da9a56d55ed361391fe88d0f60212
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.20 b/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.20
index c73a02b5d0b5..ea8abd780a90 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.20
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-96.43.20
@@ -10,5 +10,5 @@ RDEPEND=<x11-base/xorg-server-1.11 gtk? ( !media-video/nvidia-settings dev-libs/
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/96.43.20/NVIDIA-Linux-x86-96.43.20-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.20/NVIDIA-Linux-x86_64-96.43.20-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/96.43.20/NVIDIA-FreeBSD-x86-96.43.20.tar.gz )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5782800349f728f725f9378105c6a2ab	nvidia-driver	9c7860a75fb935e7d572c8bc85148e56	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d4e56170c76382825e745125c40d618
diff --git a/metadata/md5-cache/x11-drivers/radeon-ucode-20120320 b/metadata/md5-cache/x11-drivers/radeon-ucode-20120320
index f0ac2391f2e3..4b641cf046b3 100644
--- a/metadata/md5-cache/x11-drivers/radeon-ucode-20120320
+++ b/metadata/md5-cache/x11-drivers/radeon-ucode-20120320
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst setup unpack
 DESCRIPTION=IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs
 HOMEPAGE=http://people.freedesktop.org/~agd5f/radeon_ucode/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=radeon-ucode
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~agd5f/radeon_ucode/ARUBA_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/ARUBA_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/ARUBA_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/BARTS_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/BARTS_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/BARTS_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/BTC_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAICOS_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAICOS_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAICOS_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAYMAN_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAYMAN_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAYMAN_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CAYMAN_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CEDAR_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CEDAR_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CEDAR_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CYPRESS_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CYPRESS_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/CYPRESS_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/R600_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PALM_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PALM_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PITCAIRN_ce.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PITCAIRN_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PITCAIRN_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PITCAIRN_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/PITCAIRN_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/REDWOOD_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/REDWOOD_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/REDWOOD_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/SUMO2_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/SUMO2_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/SUMO_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/SUMO_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/SUMO_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TAHITI_ce.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TAHITI_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TAHITI_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TAHITI_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TAHITI_rlc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TURKS_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TURKS_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/TURKS_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/VERDE_ce.bin http://people.freedesktop.org/~agd5f/radeon_ucode/VERDE_mc.bin http://people.freedesktop.org/~agd5f/radeon_ucode/VERDE_me.bin http://people.freedesktop.org/~agd5f/radeon_ucode/VERDE_pfp.bin http://people.freedesktop.org/~agd5f/radeon_ucode/VERDE_rlc.bin
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7db77fbe8cb76a93fd222a6b4866acf3
+_md5_=c30b8634da316a7eebab28ce24b7c42c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
index 12431e7794ea..1a9f99b1cbad 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99.901 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=4cc3b7e05dccf64d399c88363bec1c08
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
index b7adf60133b0..723dcfb1ea2a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a3512e971277a0a65ec86f93be162f7e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
index 947017391a2c..8bfb3e257087 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=386c5a6ad838077f05f512567754bf8a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
index dee2bab09cc5..a29a089b8296 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=57214a70b95580cc30f1d145f40d3ff5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
index 0f287f1c71ed..4cbdd6066caf 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8890bdca96abeb66f19c61c83a8cfdb7
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2 b/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
index a87d38c230dd..1eea82e73534 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-citron-2.2.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=60172d06059ca674affd9a50c26b4861
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
index 956939a99728..7ba84c0172d2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=98f529fc8739d106f8aa7e772fbe162e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
index 0942e030a0c8..c38b7d734ad4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=faaf10fd39c311680029091db3d02a64
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
index 60ac56f474c5..f83dd8dd0436 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.6.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a4cc1e4d96904e8fe0f123b90ed336ba
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
index e8cc985a0983..93df523a28b1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
@@ -3,10 +3,10 @@ DEPEND=x11-base/xorg-server[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3
 DESCRIPTION=Generic Linux input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6111de5ec9891d8b399fabda41cbef3b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=82982777e0f5ac7cd0c38505a6dbc333
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
index f7d48c9b7e52..a2c924880c14 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=bbf5d6811ca86a877a135439bfa3709e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
index d0ccc18d5593..9a9aead5d5f4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e3b66083af414c631a0e0f711a48741f
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
index 53610fa44677..23bb80b78848 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=6cf815577e1143530b76dc38553b1cb5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
index 00f31846c308..a931e804fc91 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=af9bdf6251e151ec18a61aa07e89cd21
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.5.0
index 00bb34234eca..3dc69dc1e4ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=32f2cec0d5f81416fc9dc95726a8bb63
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.0 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.0
index c4824eb016f7..a0deb33561d6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=2ef5832542708f3e0e71077389601ddb
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
index 90b5197b31b0..44effec26ef4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >
 DESCRIPTION=X.Org driver for joystick input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d19a351459d6a5d1e6f1746f3ab3b49f
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=e5379845aa626ff6e62239cbb47e990c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.0 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.0
index 4d91b673cc50..1bd5b643ce84 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=893ae2a4e4b03442f74204a293074a2a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
index db2f6858e9d2..7332e777fe8e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-
 DESCRIPTION=Keyboard input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2ccca239f367f3aede641dcebbfb6e95
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=d9a1ec0bfa76ed41e938f0ff25179164
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.0
index 138ebfab4066..6f1a2b4435af 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.5.99.901 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f2e1d19d384f135bec81bd51a979572b
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.1 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.1
index 275deee8d319..bda3bb77123d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.5.99.901 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=29083de5c3f9aab7589528a1ce4c9c74
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
index 890033ed675d..ac10240744f9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.5.99.901 || ( >=sys-devel/automake-1.11.1:1.11 >
 DESCRIPTION=X.Org driver for mouse input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.5.99.901 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=026b4165ecec638317e47f5ea28faec3
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4edfd2e6f95f208e8dac20137dc3075d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
index d37977aceddd..f2915eda7843 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.1.1 -> xf86-input-mtrack-0.1.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ff69ffb6ec094b860256430d1fce883c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
index 14116433d074..1be17ae638d8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Xorg Driver for Multitouch Trackpads
 EAPI=4
 HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
 IUSE=debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0 -> xf86-input-mtrack-0.2.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0c777a8593740bc01a255690ad4452e6
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=17022345a1f93c64526aa8d543d1adee
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
index 0883f818e87b..556a52b01ebe 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=2d2a999ddc48b97d314f7405232ab9e0
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
index 023e7fb2b63a..4778342e6b98 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=96812820e2a6fd330395b879ac814add
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
index de097bef1051..e09c9a2ccf17 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=38810715be17aa904de1b3c20d2879b4
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
index f39c26b2ba28..4f0dc7ca50aa 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7b55bd09abe4c61065ed0809de8c9890
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
index f4df123d50a4..f21d1c3840f1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.11.99 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=473430dc9644d1f30b0206f04e4eadd5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
index f9772f71b5d7..2300bbbb5c1e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.5.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.5.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a3c4f92b0c2c0f1a6e40469c6e77524b
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.1
index e376f62155e1..04ab41a264ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=dc80c6509061a0794e81f329df44a3f1
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
index cef048a33123..71a7b6ddf218 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs
 DESCRIPTION=Driver for Synaptics touchpads
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=44eeeebbb09bc2476a1fd288bae7c6a2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=5b021cdf214d2c6f2715f5a45581c003
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2 b/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
index 5403a10fdca5..4df3abaa99dd 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/tslib x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=ftp://cdn.debian.net/debian/pool/main/x/xf86-input-tslib/xf86-input-tslib_0.0.6-3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=938a95a2479eb3711b8c794f20cf978e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.7.0
index 06b5fbdda3f7..94fcd6c22602 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.7.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.7.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f8e6028e06e02538c78a45a2ce137ca5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.8.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.8.0
index ef536303e1bd..5a18749624c0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.8.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.8.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.8.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d973758b2201567bb822cee6b7979119
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
index 87e9301659d1..48b39a003c85 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-12.9.0
@@ -3,10 +3,10 @@ DEPEND=x11-proto/randrproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/au
 DESCRIPTION=VMWare mouse input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=63c71474c773e71b6db72412956770c6
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=e9eaf755576123ed6fb5c95a665d4237
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
index 06b0f333d985..0c72d188ae3d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f40179b00e563999a504341a2287b704
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
index 06689f5c1921..273c2fcb2e68 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fb91d4fa0c245d6817b889e1f3f5665f
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.0
index 73b3430bcff0..7c9e1eac2d94 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-drivers/linuxwacom x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.11.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a593378a026c212643332bf5b21d421a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.1 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.1
index 4eba7bec7c29..b038e423785b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!x11-drivers/linuxwacom >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.11.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7e6d8cb94d0f3296f8abcf014576608a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.13.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.13.0
index 964a8ca1d9e9..18b36cf168a3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.13.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.13.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b12bc34a53d732e09f1f5993391c0ee2
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
index a7acb18ccca9..defe1dd41f7e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=4
 HOMEPAGE=http://linuxwacom.sourceforge.net/
 IUSE=debug
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.14.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7d31a548f80bfba0197d063828e9d420
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=cd81893b90338e76e51e8642e44a6a2e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.15.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.15.0
new file mode 100644
index 000000000000..873a49a4059f
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-proto/randrproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DESCRIPTION=Driver for Wacom tablets and drawing devices
+EAPI=4
+HOMEPAGE=http://linuxwacom.sourceforge.net/
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-server[xorg]
+SLOT=0
+SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.15.0.tar.bz2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c4a09326c7870e3048ca31188fa398d4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.3 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.3
index a20c7b1b1e84..4cea7cd5777f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e88a952db6b0907039da0d36a9e75d60
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
index 481e52529c94..7d4c3ec1dced 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Alliance ProMotion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=ebc7462a650ac20253f43bcb234538ff
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=efd0c4118ae365df51624f7b33902fa6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
index 0a5dfb9f05bc..1fd66df82127 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=eb2c662ee128b6f9c7e37e0162b135fd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
index 2b178e9a361a..0bcec53c8e57 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys
 DESCRIPTION=X.Org driver for ark cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8086cbae3ba59dbf08801cb1b623e490
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c532104f9e9620903166364bc02b0eb2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.93.10 b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.93.10
index 1324958d2b4d..6348b5df7c07 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.93.10
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.93.10
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.93.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a3577aedfba7afc224afdf8e99e48cd9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.95.0 b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.95.0
index dfbe2e26e909..66ccc940005b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ast-0.95.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-0.95.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=X.Org driver for ASpeedTech cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.95.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d6a1da85f4642353f37c6667df220e03
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=15fa109efec1197599057d365320746f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
index 3239ae88f4e6..f8da92fd0a4c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.13.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.13.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f095eb564d4ef435a414b3fb72a0676e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.0
index e0594c655118..4d1e5dd8bb60 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=947183dcff06d7cd0dbb748e873acb9f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.1
index d4cabf7c2d9a..b27aa1d0d998 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=312a862c17a4e49a9cb06e1be5408cfd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.2 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.2
index cc11d3b6bec7..e04112614304 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d4eaf01f1f03695c1c5171057c99448a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3
index 9fa68d474730..e80d8f0531ba 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=54ceda00e7c00af76c1cbe6a667b80d3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
index 23d61db38dec..5e1d9be0a2e3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.3-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cc568779c6e071b0d5c86e9eb75031a0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4
index fbf74547c2dc..e2b15febab45 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.31[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=796eed6c246014f6f3b6d84eed395fe3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
index c98c468e6b36..3b8ae94ef0c0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.33[video_cards_radeon] || ( >=sys-devel/automake-1.
 DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.33[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=78176b6b935acde9a26a37db359c9c44
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f5b24b681309fb284a2a06f088db7354
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.5 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.5
index 876dbf2b7a78..7ec9bb655fdd 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.35[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=25acf22483ae65867e8a3d0faca0cd08
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
index ab59fc16e624..e8dc0b0a9ca4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5ddd3acdbe3eae9c6d57712e97a64fa7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2
index c293def79ce3..1f8ba14bcd9e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=1173cdce9a4fe9d20312e163d93f9f92
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2-r1
index b422d34ce038..588a619e3f75 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.3.2-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=73a6ede5861493ebd4cafdc6d835fac4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.4.0
index fc0c9b79422a..8ff77947978d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.4.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Cirrus Logic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f292a9d065ff915cf87a950ce6f8b2ce
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=53bd58b93445990009c0a681e4cce737
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
index 5a2935d08280..c85e74ed9923 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cyrix-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cyrix-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=668d52abc0962a473ffd10b4418e5adb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.4
index b0f528780a7b..6d8d5e3eef51 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=beb37a784485ad55df09d1f44cf7963a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5
index 161b1506dd6e..4b3cb396d2ef 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for dummy cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dga
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=fe46350882a584616f6a8305c67561fd
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=83fad7b9f09720b1be459719a504f62c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.2 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.2
index ad1e6c9fa7c7..3edf99686fd4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fc0f16eb01d306a8f3f480201b362287
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.12 b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.12
index 6cee6d3cd4b6..5fcf8ee3b3d5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.12
+++ b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.12
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.12.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d0e45b4815dc7259843c60e99f98a89b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.13 b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.13
index 3c532e89e621..4739d63b73ed 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.13
+++ b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.13
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4e816ecab392f28468b1a82e48210e2f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.5
index b184ad6e6ecb..4b2c0c89a021 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=90eecfc0e36f1de112256ae4e9588bda
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.6 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.6
index 72bb82fd86fa..9e2bcbb00f59 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=81b11259f43351849a372a8cdbf26cfb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
index aa5a88d594c3..53849f9ea47a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.7
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x1
 DESCRIPTION=GLINT/Permedia video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2604a2ef5707971aa9e489680b4b12d0
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=341e8e92ce99de5c5b6adabb5daee436
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.4
index 9e91642e407a..85432a35c37d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6f4f2eca80d38c8799b3adf772d4fc32
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
index bca58ef59962..024dc4bf4a65 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Number 9 I128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=fc3954556e0710ef4514fa5c7beec30a
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=3003d8c494694b5aca2a073ff9f409dc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.2 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.2
index aa54fe91fca9..0faf4fa7394b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=966d3c89f9d2b8714dd429265acb80be
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
index d1a068172880..bd8e87312b69 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Intel i740 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=3cf9b8379db6bc017af2e1bfed76d3e7
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=39da154952a0430eff58f4227e74d80d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
index a5f19d6ce0e8..1539aec8cc70 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-impact-0.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-impact-0.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=7e9254041dd66ee0d571e9edfd2e33af
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.10.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.10.0-r1
index 2ed23eff341a..3c3c55ddeec0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.10.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 || ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_intel] ) x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4a55b7aff918149548d37bfc33c9cc5e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.11.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.11.0
index b80030f313ff..d137be0d18a0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.11.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.11.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 || ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_intel] ) x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.11.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3c4b7e0292ec4eac2f2b22f857f2132d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.13.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.13.0
index 0c6958eba751..25245da5ec8c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.13.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.13.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libdrm-2.4.22[video_cards_intel] x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.13.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9bd7d1455020dbbf2e4f5e97e3bed8ae
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.14.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.14.0
index 0aa98b980ec3..861ab33bc547 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.14.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.14.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libdrm-2.4.23[video_cards_intel] x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.14.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7dfb710c105ec23505bdb9a02bbe7bb0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.15.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.15.0-r1
index bdd86d8cba64..46402a8aa850 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.15.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.15.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libdrm-2.4.23[video_cards_intel] >=x11-libs/libxcb-1.5 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.15.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=177423bb3d444a3d3f72244a9348d29c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0
index f43dc59d19c4..f70a10b9253e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.16.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.16.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=37440a0fdadd18bc549b166b31cd1b04
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.17.0-r3 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.17.0-r3
index 5a51c16c8096..cf946aabce2b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.17.0-r3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.17.0-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.23[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 >=x11-libs/pixman-0.23 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.17.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e5e4317c8a6826b11d5219dabeed23fc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.18.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.18.0
index 9b7af34f3c18..b3f5dc64d003 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.18.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.18.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.29[video_cards_intel] sna? ( >=x11-base/xorg-server-1.10 >=x11-libs/pixman-0.24 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.18.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c8688677e03dd3eea83c83afb268d135
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
index 97e9ed352ec1..49e77a887d8d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.19.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for Intel cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=glamor sna dri
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd -x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC >=x11-libs/libxcb-1.5 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 >=x11-libs/pixman-0.24 ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.19.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=79e7138f9068a9b52b30293257642ed1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=9aaaf121172f11ee14101d19a4120338
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.8.1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.8.1
index 475195ccf730..4698b5b2c04c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.8.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-libs/libXvMC !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.8.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=0a0ef0af427a6d89dd70385840d188e9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
index d2a6c5efcc1d..22429f309be4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.9.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 <x11-libs/libdrm-2.4.21 x11-libs/libpciaccess x11-libs/libXext x11-libs/libXfixes x11-libs/libXvMC !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.9.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=f8ec62e66da4fe7d511781c1d1dee9d6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
index 51502f0652f9..d4735b857295 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ivtv-1.1.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://dl.ivtvdriver.org/xf86-video-ivtv/xf86-video-ivtv-1.1.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e7af86537ecc50fae0af7089c020af16
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
index 6539cfe03459..28ce264a698d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.8.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=fbfa429f9c112f9ea9e4cbebc12fcf84
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
index 813f5fdb7b60..eb157a7d0003 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=416ec0a39c4f26f70a1ab5e58da5be60
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
index 6c197ae3142c..3e6329ffb395 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=03bb02795e4f2fc0f215015c7a705b5b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4da5d4b85111e360c4aea50feeeeaf18
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
index c0920faa5750..3ea76bf94d7e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.4.13
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.4 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c32da7d1ae465e92d719f2111a0ef160
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
index eab1e74c330d..90bcc10913d6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.4 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=98b7da1dddcdd28060b8f2eac131b81e
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=2ad1f42e0311e6470961f04df6914661
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
index f0925959c231..5be2189482b9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4f5fef6ff3caf89287a3c27330c4bbfd
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=5b16eb031cdfd36f8f4896bd5fa77f8e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.4.0
index be4c5ce15179..ccd29a43538e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.4.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3f8b0032c551f28f9930be6031b91890
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
index 468707178708..f7407fd72404 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=149de720d78744acdbd5f77ef255184e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
index 9d26acf0dca3..f6d8ccc65c78 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Neomagic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e644a42ab58306eb5f2ee1a246dd7685
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=1de143e8f28fb19fa01350ff427ffe01
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3 b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
index 4d5ff21cd3ec..297cbf8b86f8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b944cfa4c2d6b29457bda3edffed1882
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
index ef8817e8fc21..b799741a9ef9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f8884cbb6b84e1c59e9de9dcad6fc67d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20111109 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20111109
index bfe5ff8d3c75..808b66542bcb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20111109
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20111109
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://gentoo/xf86-video-nouveau-0.0.16_pre20111109.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b2fb2a8937638bc8bed7b6940e4795e0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120305 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120305
index af3a188a25dd..e4af2a9a242c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120305
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120305
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120305.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1b9f25770e88381f425ffc1e11aff5ad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
index 5077d770f9a9..1724fb631701 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[vid
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=4
 HOMEPAGE=http://nouveau.freedesktop.org/
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] <x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120322.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=989ae6ded86ab147f8b01bb65d7885ac
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4a8204e9a4e9c46df4aad9c83fb8e0ca
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120508 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120508
index 75c4d35a62fd..90341971e3be 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120508
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120508
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120508.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d21e651d35e340e3a7585fea9d11bc84
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.1
index 790f50b2a3ce..c0218b23f56f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.34[video_cards_nouveau] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://nouveau.freedesktop.org/release/xf86-video-nouveau-1.0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e72b9c27605d38dc41348caa5f78d9e1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3 b/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
index 3c2c97f3e742..89b83bc83a53 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nsc-2.8.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=da6d6b6ed60a1ee7a30c66d6300353a9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
index 1a5c020baf6b..8a3b97b98afe 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.18
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.18.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=79580171c95b002743f8da54fcd06365
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3 b/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
index e164c8eb27f3..21b9dbe50300 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omapfb-0.1.1_p3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xf86-video-omapfb/xf86-video-omapfb_0.1.1-3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=be7e3683f5cd5747da1269e0f6130764
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.905 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.905
index 15e173c6286a..b431c4b0e88d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.905
+++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.905
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://www.openchrome.org/releases/xf86-video-openchrome-0.2.905.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c274c42168d13c207fb2688c3d7ee445
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.906 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.906
index 4339f8e52536..a711e8caa91b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.906
+++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.2.906
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for VIA/S3G cards
 EAPI=4
 HOMEPAGE=http://www.openchrome.org
 IUSE=debug viaregtool dri
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://www.openchrome.org/releases/xf86-video-openchrome-0.2.906.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=754d05fc4f68d1bfc1bbeaa39d015700
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c238996369b1dc223a449d8c8bd29dcd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.13 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.13
index 173b17a3cae6..09dd461a7143 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.13
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.13
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.0.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c05f8989c68ddd37a994a398f42313b3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.14 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.14
index 9ad52c48fcaa..0e620462c817 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.14
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.14
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.0.14.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8ef791acee18b2250db3fd265b1ed82d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.16 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.16
index 96dadd2e1b64..b572d76dd549 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.16
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.16
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.0.16.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=caf84d780a4c4eac46343c9e84652f2e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.17 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.17
index 849eda08795b..5402cf6982d6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.17
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.0.17
@@ -4,10 +4,10 @@ DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=xspice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice ) x11-base/xorg-server[-minimal] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.0.17.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e0ee16b53706e9a96ba50afbc688df8f
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=a277da6f236b9810ec4b8c1a83fc9492
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
index a2d85472be7d..f7f2a9399244 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 !<x11-drivers/xf86-video-ati-6.9 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=fb002c6c01db05a5e2094d990d15962c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
index ec31cabd784f..32117288f182 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.8.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=90bb7e817c8f54b3c4b240b5552a36be
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=2e635a6ccde62b7ab5e4af76806e8e6d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
index 369311e37c5f..f96e87b3a24f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=48f2b13c0f471caba0b385a00af85d4b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
index 2bfbb6cb15dc..db16a0fe14b9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=8389fa70aab8e56d2d6de0361085ad82
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
index 05add6c3bfb8..4415a00424c0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=X.Org driver for s3 cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=46940fce13dbb74ca00edc55f0f75ff1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=e8630e1bd8a7bd4dd40dbd8f821cb8a1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
index 6fe83218bfbe..2f7d073c7e7b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3af88c5922ad5804106ede448c895879
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
index 23e2e1d7e37f..c2b982827e1b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=S3 ViRGE video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=69d633c51ec1bb7c360bac803ecc99db
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=3859b1dc45b2651449c00703138dde62
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
index ac9b4bebad7c..0aad2a3be36c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=14d17c7cae359f75e197a6ac8dafcbc7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
index e05b2df4a004..02f556382e34 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0738c51f35332af296e3cf6bcb606c77
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4b4fca820818738cfe7ebb7c93e124e0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
index 8e04467727ce..c5c5ca45ce95 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6ce016d6c146251674d2d44f84e467a6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
index b905d9b110f9..c865e69f4195 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Silicon Motion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~mips x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=b29a41108ae8b321c274517eff7be4e0
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=10b40daeede419b04c9214acc90e83b8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
index de5e4b306872..a6e28207ec68 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] ) !dri? ( x11-base/xorg-server ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=070b91a9ce073034b83706d1291cba23
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
index 5f2ec6741061..c47f1af80041 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SiS and XGI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=amd64 ~ia64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ia64 ~ppc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=aa9f227fd0e150f016ce47258d407c00
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c9b2c65c854d251d07459206d165172e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.4 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.4
index d583ea75a24d..9ca4ec89ed8c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8746acecffe820e7973f6e203ab1514b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
index 197f907c06d0..46f5428a2939 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunbw2-1.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunbw2-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=91f3ac49a25cc1d0e20549a4ffdcc712
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
index 330a629fadaa..caa374197b7a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=b1fcb78f2fb1c0c04c107e3fa1d41552
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
index b51c9ba6c32e..6eb7232a6d87 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=022f9031daf0c56fbf03dad62a0c64cb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
index 5e0dbf8f34b3..ffd6cb1c3317 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e53637c27fa0226450be96ffa60586b0
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
index 0bf56f6e381f..e49785bb8a92 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=42fe6504878ee990ba6e3b1055cbcadd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
index 426f4ded9ed6..78640d62f134 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=3d33731f270d44fff97ea198cede3f4d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
index 26836c54e255..ea55d4a936c8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=6b867eb68573422354a149dca24b7bfa
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.3 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.3
index 56225b134b7a..1c2e059f956b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=a76ff13357e7b706cffb40317c524cf8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
index 43f9ee1c87ff..0a98a58e2d6f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=3Dfx video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4dec22140dc9bf189d932393f1b93853
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=7c1a0bc4c094e0dc798878c3d38d470c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.1
index e5d544df465a..781d68590e46 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=16faf8c090864253dcfc29165c41a03f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.4
index 11d3da46cfe2..4e8c60fce8ea 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a197adfbf11e3c68ec7b94f5ea2d3d69
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
index 07f038b58b4f..dfbb1105c87b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Trident video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5bb2ec135a7ec1f34b89d5b9ba630793
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f1151afc466439d6470fe0a88b39ed7c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
index 2a3e224c32b8..4faf3d5fb7ca 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fcf7e0db13b8dfba2ecc706b13a53890
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
index 38120ae4a725..c74f7ce33045 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-v4l-0.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-v4l-0.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=9e851eb694278182e1fc85bcc4ba1095
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0
index f527785d70aa..331399bfb6c3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e41ba5e0d125361e94b9616309eb76bc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1
index 780547c56136..54e4fee44fc6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=08841f95bf1af82651c267b8ebcadeb7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.1 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.1
index ab70847dedab..c7598120cceb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Generic VESA video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=-* ~alpha amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d18facaca7af5c7aa487a1eb137b2df1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=e6a9f9f6d3189f75fb574eac2e63e4d3
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.0.3 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.0.3
index 1d80d1f4fb9e..64ecd95a771b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.0.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-libs/libdrm[libkms,video_cards_vmware] x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-11.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=435dfc491dfa2ba1caca7e84cb408fcc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.1.0
index e2b9ff245757..a7ac14c049b3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-11.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-11.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c53ad0fd473f10e0d0153e65557a2597
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.0
index bb947a4daf90..ab19f7fe4813 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-12.0.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d6e886f98e72eb9149fc384e2a0b0a02
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.1
index 2d3be6c90f52..5df2d5b92f32 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-12.0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7499d7ff58ff6508f84f8c4156936ad4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2
index f256e16f7069..45edcc9e3c63 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-12.0.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] || ( >=sys
 DESCRIPTION=VMware SVGA video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-12.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a9b0e4992e285910c9a15d89ca743723
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f6dcf3cd3ae31b6abf02ee10fae62df9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
index 81ed173d1b6f..169381376c9d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=94687618a91be456c5efaa1192911789
diff --git a/metadata/md5-cache/x11-libs/cairo-1.10.2-r1 b/metadata/md5-cache/x11-libs/cairo-1.10.2-r1
index fe980dd64b5c..0d17d133c5b5 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.10.2-r1
+++ b/metadata/md5-cache/x11-libs/cairo-1.10.2-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=70f26e1ed9e1c9573ee3963b96358fe6
diff --git a/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 b/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
index 3e1e7ba1d8c7..7c7b21bc6b50 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
+++ b/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bd5236be1f7ad2905ae77ec6e12f299c
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.0 b/metadata/md5-cache/x11-libs/cairo-1.12.0
index ebc4b132b98a..07df2936c24d 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.0
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=285e71177ec7fa79198fe94881bcdfe3
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.2 b/metadata/md5-cache/x11-libs/cairo-1.12.2
index e27eb06fb8ca..3131edd03bd1 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.2
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.2.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ff57b797f64dbfeedc595efa56a2620
diff --git a/metadata/md5-cache/x11-libs/cairo-1.8.10 b/metadata/md5-cache/x11-libs/cairo-1.8.10
index aa4595ecf27e..be32f8269328 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.8.10
+++ b/metadata/md5-cache/x11-libs/cairo-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.1.9 sys-libs/zlib >=media-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.8.10.tar.gz mirror://gentoo/cairo-1.8-lcd_filter.patch.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=479f43220543aa6231946c60cc72138a
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 1e24eefff4fc..c11b35c4fd9f 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs
 REQUIRED_USE=drm? ( X ) gallium? ( drm )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae42b3a0266f64436bb794e33544bf20
diff --git a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.4 b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
index 337d49331a94..87bd8489291c 100644
--- a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
+++ b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.4/compizconfig-backend-kconfig4-0.8.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=72c20150fed0f4cf07cc51b96d099359
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1 b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
index 1753a354cb80..723077283cbc 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=FLTK LGPL-2
 RDEPEND=>=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft )
 SLOT=1
 SRC_URI=mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a6a53aa32c8c286f1f134411a23aea20
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.3.6 b/metadata/md5-cache/x11-libs/gl2ps-1.3.6
index 8beea31f2018..221ca5577df7 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.3.6
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.3.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng ) doc? ( dev-tex/tth dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.3.6.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b59249d603c4862c2c8c4fb8574794ae
diff --git a/metadata/md5-cache/x11-libs/glamor-0.4.1 b/metadata/md5-cache/x11-libs/glamor-0.4.1
index e777f0f188c6..2b27fd2c584b 100644
--- a/metadata/md5-cache/x11-libs/glamor-0.4.1
+++ b/metadata/md5-cache/x11-libs/glamor-0.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 x11-base/xorg-server[-minimal] x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/glamor-0.4.1.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=13b3f200dc3529486b4052955bedc511
diff --git a/metadata/md5-cache/x11-libs/goffice-0.8.17 b/metadata/md5-cache/x11-libs/goffice-0.8.17
index c1d51b6ab1d8..29a164dd2432 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.8.17
+++ b/metadata/md5-cache/x11-libs/goffice-0.8.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 )
 SLOT=0.8
 SRC_URI=mirror://gnome/sources/goffice/0.8/goffice-0.8.17.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=541c551f8905841940b455510643041a
diff --git a/metadata/md5-cache/x11-libs/goffice-0.8.17-r1 b/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
index 06f53b1639a0..7adb7993cde7 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
+++ b/metadata/md5-cache/x11-libs/goffice-0.8.17-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 )
 SLOT=0.8
 SRC_URI=mirror://gnome/sources/goffice/0.8/goffice-0.8.17.tar.xz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3b8212a42fd8d7a5c6bb0c39ed436d72
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.10-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.10-r1
index bce5a9c23b07..d9c7c9261d88 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.10-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.10-r1
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.28.2-r201:0
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=16326d137f128af01da9a699c5b9aa1a
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.8-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.8-r1
index 62a95c8283cb..bb6456ff173a 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.8-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.8-r1
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 !<x11-libs/vte-0.28.2-r201:0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.8.tar.xz mirror://gentoo/introspection.m4.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=8e4a4907a0a109328887497653c859da
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.0.12-r1 b/metadata/md5-cache/x11-libs/gtk+-3.0.12-r1
index 4a4e4cdee0ae..400ad3625fd7 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.0.12-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-3.0.12-r1
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.28.0 >=x11-libs/pango-1.24.0[introspection?] >=dev-libs/atk-1.30[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) !<gnome-base/gail-1000
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.0/gtk+-3.0.12.tar.xz http://dev.gentoo.org/~pacho/gnome/gtk+-3.0.12-use-const2.patch.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=78c8015194803353f8aeef8c978103e0
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.2.3 b/metadata/md5-cache/x11-libs/gtk+-3.2.3
index 5929dfc34850..30a3953cfa67 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.2.3
+++ b/metadata/md5-cache/x11-libs/gtk+-3.2.3
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.30.1-r1:2.90 packagekit? ( app-admin/packagekit-base )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=de20d07ca2b8d9734bd07edd0efb1c75
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.2.4-r1 b/metadata/md5-cache/x11-libs/gtk+-3.2.4-r1
index 893264220969..ffcc32ca9a36 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.2.4-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-3.2.4-r1
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.10.0[X,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.10.0[aqua,glib,svg] >=x11-libs/gdk-pixbuf-2.23.5:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.29.14 >=x11-libs/pango-1.29.0[introspection?] >=dev-libs/atk-2.1.5[introspection?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.30.1-r1:2.90 packagekit? ( app-admin/packagekit-base )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.2/gtk+-3.2.4.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=25b13e2583c59a7e9173f6cbe5283079
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.4.2 b/metadata/md5-cache/x11-libs/gtk+-3.4.2
index 26a06d5ffc7d..0e38f0310761 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.4.2
+++ b/metadata/md5-cache/x11-libs/gtk+-3.4.2
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/l
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.4/gtk+-3.4.2.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=23f5ea31095638802adaa89de6576682
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.4.3 b/metadata/md5-cache/x11-libs/gtk+-3.4.3
index 79f12e3e3df5..1c39bd8fac91 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.4.3
+++ b/metadata/md5-cache/x11-libs/gtk+-3.4.3
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/l
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.4/gtk+-3.4.3.tar.xz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d6629c0e2dfc3a51fd15955839837014
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.3 b/metadata/md5-cache/x11-libs/libFS-1.0.3
index 76d946eadc12..097ffefda8db 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.3
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a1f172e9007664ab7805712b0369375d
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.4 b/metadata/md5-cache/x11-libs/libFS-1.0.4
index feb1715b1b49..7c2b04e56b2b 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.4
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org FS library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f4057c5bb35ddad721d18630b5519d44
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=826b7a0203f43e0e7371199df8279689
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0 b/metadata/md5-cache/x11-libs/libGLw-8.0.0
index 788b454371d1..71f23864bc7c 100644
--- a/metadata/md5-cache/x11-libs/libGLw-8.0.0
+++ b/metadata/md5-cache/x11-libs/libGLw-8.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mesa GLw library
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=+motif static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3774d7165ae5cb7e2974803b066d5292
+_md5_=56ca3856328390b6c04c0afd56462f37
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.7 b/metadata/md5-cache/x11-libs/libICE-1.0.7
index 0ab68b476056..3003f33ab13f 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.7
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8deca2fe3d2137c9b30b7df999c7bc18
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8 b/metadata/md5-cache/x11-libs/libICE-1.0.8
index 125e36ee8275..6bc80ea3f8c6 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org ICE library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2e33108fcf9033148bdda6652d472e4f
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=5c4c26ccfea97d46adcee4fa5d1ab3f1
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.0 b/metadata/md5-cache/x11-libs/libSM-1.2.0
index 610a400e80fb..b45a21df2979 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.0
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f5ebf13298cca31242216692ae4e8f63
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.1 b/metadata/md5-cache/x11-libs/libSM-1.2.1
index 160d7ed5e9fb..acfdc007904b 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org SM library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc ipv6 +uuid static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=51ab71b2fbb55e41d7dc893b466a2188
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=ceb5bbb2384b36f107a9b7ea0cc1d07b
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.1 b/metadata/md5-cache/x11-libs/libX11-1.4.1
index 4bc2090893eb..1e49104155a7 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.1
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto >=x11-proto/xproto-7.0.13
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1681a99e054f88f9dbb10fea7a0dec82
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.3 b/metadata/md5-cache/x11-libs/libX11-1.4.3
index fe0c4be6c30d..1e02de57ff0d 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.3
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.13 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=854fa82eb38ead3b559abe253c7e39c6
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.4 b/metadata/md5-cache/x11-libs/libX11-1.4.4
index c0c313d21644..ec651a54690e 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.4
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5d50b7c5312ab01fa971c8ff25a29b1d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.5.0 b/metadata/md5-cache/x11-libs/libX11-1.5.0
index eb2d9180e911..3afd9d5b9485 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.5.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 test static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.8.1 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=afb9056cba9af4be34422ba61e47df1e
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=e6654be1a6db6fa89a6a23a2f8d49c40
diff --git a/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1 b/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
index 310a8699055e..3d410a200e1c 100644
--- a/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
+++ b/metadata/md5-cache/x11-libs/libXCalibrate-0.1_pre20081207-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/libXCalibrate-20081207.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3c776067f8bb6f8a1223cb70e2ff03c8
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
index 99cff2f4e7e1..0e1a5d245e15 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3adc0bcce26824512d68653a49888e05
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
index c38f146584cc..9c90deb218f9 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XScrnSaver library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7545865a2f4ed29ae50fcded45eadbac
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=007a61c27a6c5fe6735a01cba15e19c0
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.0 b/metadata/md5-cache/x11-libs/libXTrap-1.0.0
index 0539f3b2c018..b97c2f4d214b 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.0
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=15e8979161d2b9ed11299822553a4da9
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1 b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
index c365087df1c0..838040b0d893 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XTrap library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8e738869a908552591eb6a65bac73d77
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=77b8a22b6f985851c5416dba358074e5
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.6 b/metadata/md5-cache/x11-libs/libXau-1.0.6
index 38062ad7b8a9..71fa29373e27 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9fb05282fdf0245aad39d0801a8589fe
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.7 b/metadata/md5-cache/x11-libs/libXau-1.0.7
index c363f8d095db..547e31da552a 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xau library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5e4fda000a5c63d5de4c895b1e1d7da3
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=b34cc0ab6ced2e5ca786224ec983e4e6
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.10 b/metadata/md5-cache/x11-libs/libXaw-1.0.10
index 5ddd8f4e9cc9..3115c7fd3c57 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.10
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9fe4edaf818bf0db9d16b07c8f5f346b
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11 b/metadata/md5-cache/x11-libs/libXaw-1.0.11
index 96509470d2b0..012da49a6d52 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=9c44a00ace3d33a11b0adf8409bfad98
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=ec2a9177804b99c716d1b84d2f1d5e85
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.9 b/metadata/md5-cache/x11-libs/libXaw-1.0.9
index a1cdc0c67eef..09b9f1bd096c 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.9
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f342ff9a9b8c1b1cd2d6b4ad5ff2426b
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
index 2a86730bd09d..ea6bc9d2d785 100644
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
+++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=22161ed40c4e89b51f931226017e5678
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
index 5d47153ef7eb..a3db64c503da 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext >=x11-proto/compositeproto-0.4 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=add67440f52a6166b4903d797514b0cb
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
index ffec26229dea..3f46b0b2510e 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/compositeproto-0.4 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=63019184895a82c7b9521dc3c8ec8884
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.11 b/metadata/md5-cache/x11-libs/libXcursor-1.1.11
index b1ca2fd53718..4db574b5b3e9 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.11
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11 x11-proto/fixesproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e2692191ccdc682e1452f2082dc4de37
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.12 b/metadata/md5-cache/x11-libs/libXcursor-1.1.12
index 8a437b340e6b..0c82f408da69 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.12
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.12
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.12.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a6cdcaedcaa4fabd0ca329dd34a8f39c
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.13 b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
index 6a677105af37..3f4406692648 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.13
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xcursor library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=28816b784dd37a67404682b9384c320e
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=0ca5d59eb3d65e78411b96f198bc53a4
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.3 b/metadata/md5-cache/x11-libs/libXdamage-1.1.3
index 13dc3e55aed2..4ddd9cdd161a 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXfixes >=x11-proto/damageproto-1.1 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0cda8bdfac9aec7fb0c71ee9d74493f2
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.0 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
index 32cbb5731508..3bc130caae61 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1e9940b102689d4e135888c24132c3bc
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
index 208ddd07647d..ec9f69d6c8c8 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xdmcp library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a82fb9181d18f374e5a0bee3b9d31464
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=4bc1bed1e50ab5251bf56610c162b997
diff --git a/metadata/md5-cache/x11-libs/libXevie-1.0.3 b/metadata/md5-cache/x11-libs/libXevie-1.0.3
index 7b92bbb5a125..62aa78d9cdef 100644
--- a/metadata/md5-cache/x11-libs/libXevie-1.0.3
+++ b/metadata/md5-cache/x11-libs/libXevie-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto x11-proto/evieext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXevie-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=48e2d02e2076562fc9a2866562c47746
diff --git a/metadata/md5-cache/x11-libs/libXext-1.2.0 b/metadata/md5-cache/x11-libs/libXext-1.2.0
index 5d40f475b71b..cf1f59896b1f 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXext-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1 >=x11-proto/xproto-7.0.13
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cb33d1a21f6603002f3f746c6ec4c813
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.0 b/metadata/md5-cache/x11-libs/libXext-1.3.0
index 66fe88566f3e..ac442686ae15 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.0
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3d196a204cae8a657945df19dbcd491e
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.1 b/metadata/md5-cache/x11-libs/libXext-1.3.1
index 6e2395530c97..8fe428247270 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xext library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2b70a16d6249bd4974f1b6d178bbc41d
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=44623a046713adea81616b0c2d60a7bd
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0 b/metadata/md5-cache/x11-libs/libXfixes-5.0
index a3ccd521093e..34afcd2e98b6 100644
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0
+++ b/metadata/md5-cache/x11-libs/libXfixes-5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/fixesproto-5 x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0079a6144d5d61b2e1c336507b3f2561
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.3 b/metadata/md5-cache/x11-libs/libXfont-1.4.3
deleted file mode 100644
index b6a337f7d291..000000000000
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto doc? ( app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org Xfont library
-EAPI=3
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=doc ipv6 static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e7b9643e6037ef5ad64057c02ee35ed1
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.4 b/metadata/md5-cache/x11-libs/libXfont-1.4.4
index 6a5f4092c1fa..86d0e2a8a320 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.4
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=86db6b16606392085b377b4a7040a75e
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=831850b010dc3d88f1476e2365942978
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5 b/metadata/md5-cache/x11-libs/libXfont-1.4.5
index bdd6302a3b37..94180fc1f6de 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-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=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8b1fc60130f2e603503f14a112e3d225
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=8fb5b4d123e75c52be155307ccb4295a
diff --git a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5 b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
index cf836396129f..63f4f8b98eab 100644
--- a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
+++ b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=e5c88fbf03520b68d4fb063971f79531
diff --git a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1 b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
index fec391250076..04cad37585ea 100644
--- a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
+++ b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfontcache library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=34551200f98e55df430148352efc7a33
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=2110689a50019fe6b43d44f8b8fa38c1
diff --git a/metadata/md5-cache/x11-libs/libXft-2.2.0 b/metadata/md5-cache/x11-libs/libXft-2.2.0
index cb41f0ca8c4f..6823c8ee09b7 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.2.0
+++ b/metadata/md5-cache/x11-libs/libXft-2.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0c20e5bd8a0b4eb68ebccfd428e2455b
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.0 b/metadata/md5-cache/x11-libs/libXft-2.3.0
index 6a53d5b6ef7e..b70356b20cdb 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.0
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=37889830878cfa790ce4b64d51b16307
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1 b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
index 1784ed78d59e..efcf9cac37d3 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=021cb477e36408168bd7b8b37578acde
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.1 b/metadata/md5-cache/x11-libs/libXft-2.3.1
index 682cf3979974..216107339d97 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xft library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4bac1ce6622a0bf22c16e1ff6655dac7
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=8abf2551aee4eb5edb8a67b05a88cb0c
diff --git a/metadata/md5-cache/x11-libs/libXi-1.4.1 b/metadata/md5-cache/x11-libs/libXi-1.4.1
index 51e2c0e0c185..e3ca865b03ce 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.4.1
+++ b/metadata/md5-cache/x11-libs/libXi-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5d8b3097dd3fb5c90e8012fa46b2858a
diff --git a/metadata/md5-cache/x11-libs/libXi-1.4.2 b/metadata/md5-cache/x11-libs/libXi-1.4.2
index 1709c642143a..2d0cc33382cc 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.4.2
+++ b/metadata/md5-cache/x11-libs/libXi-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.4.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=50c7cf47266b54cf0ee1962f8beda433
diff --git a/metadata/md5-cache/x11-libs/libXi-1.4.3 b/metadata/md5-cache/x11-libs/libXi-1.4.3
index 90fb188ea6a1..a35d2cdbbf28 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.4.3
+++ b/metadata/md5-cache/x11-libs/libXi-1.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=3dd885b37dd45b8e378179540cdd9403
diff --git a/metadata/md5-cache/x11-libs/libXi-1.4.3-r1 b/metadata/md5-cache/x11-libs/libXi-1.4.3-r1
index bd7bf6a195ec..3d9e8e0459fc 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.4.3-r1
+++ b/metadata/md5-cache/x11-libs/libXi-1.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4c3d4b5cd75201a0cc380cdde6a99c02
diff --git a/metadata/md5-cache/x11-libs/libXi-1.4.5 b/metadata/md5-cache/x11-libs/libXi-1.4.5
index a8308b2be20e..0accd624f218 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.4.5
+++ b/metadata/md5-cache/x11-libs/libXi-1.4.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.4.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6e06ec9393f4767c69a3d51c99a03b3a
diff --git a/metadata/md5-cache/x11-libs/libXi-1.5.0 b/metadata/md5-cache/x11-libs/libXi-1.5.0
index 5b0d3b1bc781..6fa2da981cbc 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.5.0
+++ b/metadata/md5-cache/x11-libs/libXi-1.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.0.99.1 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=42ee862e7f861d755078b06e530aaa01
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.0 b/metadata/md5-cache/x11-libs/libXi-1.6.0
index b87f45fc41c4..7f4258b6aefd 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.0
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ea576cb0661538eaeb5102e786adc544
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.1 b/metadata/md5-cache/x11-libs/libXi-1.6.1
index 10203f225f7b..9c8e6e0245c6 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.1
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xi library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=c1fa02a41ae18f5e68198554c39aa68d
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=8de596758b79cc52c07080b66dce20de
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.1 b/metadata/md5-cache/x11-libs/libXinerama-1.1.1
index 379e4701e383..ba0fc8ff1c04 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=47b839909633ebb5417e1f470ca5c9e8
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.2 b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
index 15e138699087..e0379ab6b7dd 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xinerama library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a0a8aed7171563e4243b516521e72429
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=c82bc12be9a5b6cfe2ba15ac8e13dda7
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.0 b/metadata/md5-cache/x11-libs/libXmu-1.1.0
index f9184f89ed2f..8abbd3720694 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.0
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0af04ec0528c0e44ccd22aac8efe71f7
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1
index 01b5727ee868..56da322c9077 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xmu library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2e4ff53d918c79a7fbb7c7b9b3736338
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=73153b7dcc176f8fd6e20e622f198af4
diff --git a/metadata/md5-cache/x11-libs/libXp-1.0.1 b/metadata/md5-cache/x11-libs/libXp-1.0.1
index 03cab541e1dd..cc6ec4ecafc7 100644
--- a/metadata/md5-cache/x11-libs/libXp-1.0.1
+++ b/metadata/md5-cache/x11-libs/libXp-1.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-proto/xextproto x11-proto/printproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e316cb2c5843ed253be9cd7e2d96e1d3
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10 b/metadata/md5-cache/x11-libs/libXpm-3.5.10
index 087201eae0bd..d607c718f4ce 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xpm library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1f31482b7e95424b460491f57ad6b7cc
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f34d975d52be68bc0b64e5ad3828dd1f
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.9 b/metadata/md5-cache/x11-libs/libXpm-3.5.9
index 219a55f99b58..1d333686391f 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.9
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1ecaf7d6f8709046d32e7f1504278228
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.3.1 b/metadata/md5-cache/x11-libs/libXrandr-1.3.1
index 2c4c0fa93d91..71f5e5273b0d 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.1 x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6c20678340fb900238cd1740ef8a2294
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.3.2 b/metadata/md5-cache/x11-libs/libXrandr-1.3.2
index 51fa6ae55cc3..e3bba03701ee 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.3.2
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-proto/randrproto-1.3.2 x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d2f44ac962c0f7b253fe1e649aa91d0d
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.6 b/metadata/md5-cache/x11-libs/libXrender-0.9.6
index e71996411ad9..5fe410c62c54 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.6
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=91bb62872a1a7d81b919701b915303d2
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.7 b/metadata/md5-cache/x11-libs/libXrender-0.9.7
index ac83a77b3bdb..0bd8e8a5e4aa 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.7
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xrender library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=fa94f0be1ec0c7e22665188ffbd2e44a
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=b9adaf1f9a14f4744083bd499dc96d75
diff --git a/metadata/md5-cache/x11-libs/libXres-1.0.5 b/metadata/md5-cache/x11-libs/libXres-1.0.5
index 3d4ac98cc9b3..0a656caee055 100644
--- a/metadata/md5-cache/x11-libs/libXres-1.0.5
+++ b/metadata/md5-cache/x11-libs/libXres-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=339954a3ade3142ff641fda906082861
diff --git a/metadata/md5-cache/x11-libs/libXres-1.0.6 b/metadata/md5-cache/x11-libs/libXres-1.0.6
index 35283de7e00c..c4daf64b214e 100644
--- a/metadata/md5-cache/x11-libs/libXres-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXres-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XRes library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=c56f450a85ae46b6104dcf2ec1537d5b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=b4cf2d88ffe8835be0da605d9acff062
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.1 b/metadata/md5-cache/x11-libs/libXt-1.1.1
index 367ffe0acaad..c0b0a4fc2de7 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d1509ea9b8f7477a9dc6b6732d9de40d
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.3 b/metadata/md5-cache/x11-libs/libXt-1.1.3
index f547cc098c51..953416ab7de7 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xt library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f1c619a265d422586c29faa702de2117
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=7082974442a42c7daa312ba7ee303441
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.0 b/metadata/md5-cache/x11-libs/libXtst-1.2.0
index a14a2fffbe9c..18e9be01095e 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi x11-proto/inputproto >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a600198db5ffc168fe971448945e6d98
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.1 b/metadata/md5-cache/x11-libs/libXtst-1.2.1
index 0dd900ca0297..e674c4a2228d 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xtst library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 x11-proto/inputproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f158f2182787874f48d752ead594cb0b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=fbf467de3c81891e313f9fdf1593f837
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.6 b/metadata/md5-cache/x11-libs/libXv-1.0.6
index 9d2801003a95..b14b89bd24fa 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7141561df062300c4d6e4d81ff2111d6
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.7 b/metadata/md5-cache/x11-libs/libXv-1.0.7
index 46474d408c33..943768a385d4 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xv library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7761ec54e3c5fb6d483a6a7ec1e736d2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=ddc9c32ac46d6c826c926b7d9b307145
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.6 b/metadata/md5-cache/x11-libs/libXvMC-1.0.6
index 61cf9b395ee2..c2ca46c42218 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.6
@@ -10,5 +10,5 @@ PDEPEND=app-admin/eselect-xvmc
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a822fe1ce6ab598f1d6edd2539d3a5d5
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.7 b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
index 683cfd17d289..977c95b96897 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org XvMC library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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 ~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 ~x86-solaris
 LICENSE=MIT
 PDEPEND=app-admin/eselect-xvmc
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=05030fd33911e05036bf41918f6c6f16
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=345022e05572f20451ec7279560dadaf
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
index b6f848314cab..29aef2aabec7 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=499b674d1ed547d1a5bff92e4de061e2
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
index e6bd19e8589d..110c85322997 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xxf86dga library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=57bd0045bf6cffff6f2f74f699741d00
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=b441ec891d00bad70ac0036e0c44dc55
diff --git a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3 b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
index bc8323ad522c..f897f4b08054 100644
--- a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
+++ b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto x11-proto/xf86miscproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=07549209c3e95af3362eb430d3e96dcd
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
index 06c7893f8192..b203744c3fdd 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9b6200db28facd69cf1702c4118ac7dd
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
index db661fe690df..5d6b5fd76dd3 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xxf86vm library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=645b35deac5a5c070884588b4515215b
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=0e4c78736d7a902a4458749e83c5276d
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.1 b/metadata/md5-cache/x11-libs/libdmx-1.1.1
index ead14179f7cf..2ef18fa61b50 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.1
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/dmxproto-2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=75d91ea32aeca082320cd6d15b44e9db
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.2 b/metadata/md5-cache/x11-libs/libdmx-1.1.2
index 3a504b252099..71bbfc24417d 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.2
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org dmx library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/dmxproto-2.3 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=dbbfe955ecbe694c4ca8c0d5491076bd
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=f871b972c2d0c3abc7bfa53d0fe08a5e
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1 b/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
index 1ab2c487f1b6..069395fe423e 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.20-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.20.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5ab66ecf08d839756979daf27fce2b1f
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.25 b/metadata/md5-cache/x11-libs/libdrm-2.4.25
index 7f5eee820111..8bfb48653c49 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.25
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.25
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.25.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b303088cb52822b655b3d8b5192ef38c
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.26 b/metadata/md5-cache/x11-libs/libdrm-2.4.26
index 668f6380834f..0a7ad90e6546 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.26
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.26
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e3384bb09b8def788929139b13a242a6
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.27 b/metadata/md5-cache/x11-libs/libdrm-2.4.27
index 14fe2da79e20..4adfa3357528 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.27
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.27
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.27.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=89e6691c9855c25ca10fb037b55a973c
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.29 b/metadata/md5-cache/x11-libs/libdrm-2.4.29
index 4def435d705f..6c623f8ea45a 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.29
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.29
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.29.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0e39e819330103577178e1f0e0b34513
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.30 b/metadata/md5-cache/x11-libs/libdrm-2.4.30
index 76b90e77a444..42748f7cf9ff 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.30
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.30
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.30.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=aa6149eef1d5936ec5260fa971b2da37
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.31 b/metadata/md5-cache/x11-libs/libdrm-2.4.31
index 03973f038f29..3eb9598d4676 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.31
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.31
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.31.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d6c6c98b8f12828cdc95fdbca5bebae5
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.32 b/metadata/md5-cache/x11-libs/libdrm-2.4.32
index 78a91b182740..7dfe0f785eb3 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.32
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.32
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.32.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b0d18f4e209171f8f0b0cffc6c2c10e1
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.33 b/metadata/md5-cache/x11-libs/libdrm-2.4.33
index a3b52e726b63..cc05327334ee 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.33
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.33
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.33.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e89107bf60b9a7f189abc3e2b0ffcaa5
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.34 b/metadata/md5-cache/x11-libs/libdrm-2.4.34
index 0a6e02d88708..f2892271012d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.34
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.34
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.34.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b415bae28bd3194dfc8cf8b4b1719ec3
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.35 b/metadata/md5-cache/x11-libs/libdrm-2.4.35
index 1349b0e6e732..4adfd69e9ff7 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.35
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.35
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.35.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4559203507cefac52dc47b7c192f3c15
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.0 b/metadata/md5-cache/x11-libs/libfontenc-1.1.0
index 1ccff1e4cb93..d137726030fe 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.0
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0a976b838101054d8443ae33f09d1474
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
index 772b1d3fb5d2..09a52d5b17f7 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f520ae25e7d2d0e41f21b6e625746e50
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.12.1 b/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
index a65e266a5147..ee93342157a0 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.12.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.12.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8b38a696ef6b3b0058c6eaed210714c9
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13 b/metadata/md5-cache/x11-libs/libpciaccess-0.13
index a9c321526228..0139baba4b43 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=2efbbd53d238fc507982978bcc0fdca6
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
index 55f88b8345f2..0878957b5053 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9f2b9a00d342bc8edb9ab2da2a45379e
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.7 b/metadata/md5-cache/x11-libs/libxcb-1.7
index 9a19022b7340..008b6d32b055 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.7
+++ b/metadata/md5-cache/x11-libs/libxcb-1.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8139541b2b0e8a81454a37c16de3189f
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8 b/metadata/md5-cache/x11-libs/libxcb-1.8
index 5a0079d5ed4a..4eae426de5f6 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=36be67fa1b052930ddb246e1e039a90b
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8-r1 b/metadata/md5-cache/x11-libs/libxcb-1.8-r1
index e3796a61ee00..fc3384583bbc 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9e5220900fa63845e6c5c23eaeab8a08
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/metadata/md5-cache/x11-libs/libxcb-1.8.1
index 0d52b9804b62..fbff86506286 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5d505db35a8e96fb817fed4786bb7f85
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.7 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
index 2b049254b5ac..ce1c830dfda0 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6677eed0c64136734b4d9b60df0b5031
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.8 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
index 18bbd2148b6e..9ef465487456 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d3793ede7e97562134acc76d0027b13a
diff --git a/metadata/md5-cache/x11-libs/libxkbui-1.0.2 b/metadata/md5-cache/x11-libs/libxkbui-1.0.2
index 8f545c3954b0..fb87ebc4d6f2 100644
--- a/metadata/md5-cache/x11-libs/libxkbui-1.0.2
+++ b/metadata/md5-cache/x11-libs/libxkbui-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=55fb4372ba958e24c2b2946014a985fc
diff --git a/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1 b/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
index e5531c7916dc..2ed1a9d64b41 100644
--- a/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
+++ b/metadata/md5-cache/x11-libs/libxkbui-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXt >=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cb00c0ef3ee2f791eed283b0c3d0cfce
diff --git a/metadata/md5-cache/x11-libs/libyui-qt-2.21.1 b/metadata/md5-cache/x11-libs/libyui-qt-2.21.1
index 341711c71d37..ba045871610b 100644
--- a/metadata/md5-cache/x11-libs/libyui-qt-2.21.1
+++ b/metadata/md5-cache/x11-libs/libyui-qt-2.21.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-gui x11-libs/libyui dev-python/PyQt4
 SLOT=0
 SRC_URI=mirror://sourceforge/libyui/libyui-qt-2.21.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aabcec8de9b57eee11e9aac0743a3591
diff --git a/metadata/md5-cache/x11-libs/openmotif-2.2.3-r11 b/metadata/md5-cache/x11-libs/openmotif-2.2.3-r11
index 2d642c1be175..0e091c6b2d76 100644
--- a/metadata/md5-cache/x11-libs/openmotif-2.2.3-r11
+++ b/metadata/md5-cache/x11-libs/openmotif-2.2.3-r11
@@ -8,5 +8,5 @@ LICENSE=MOTIF MIT
 RDEPEND=x11-libs/libXmu x11-libs/libXp
 SLOT=2.2
 SRC_URI=ftp://ftp.ics.com/openmotif/2.2/2.2.3/src/openMotif-2.2.3.tar.gz mirror://gentoo/openmotif-2.2.3-patches-4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4160093de81fde33ae82aba9f573eece
diff --git a/metadata/md5-cache/x11-libs/openmotif-2.3.2-r2 b/metadata/md5-cache/x11-libs/openmotif-2.3.2-r2
index eac6c3341eec..c73a1861748a 100644
--- a/metadata/md5-cache/x11-libs/openmotif-2.3.2-r2
+++ b/metadata/md5-cache/x11-libs/openmotif-2.3.2-r2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-
 RESTRICT=!kernel_linux? ( !kernel_FreeBSD? ( !kernel_Darwin? ( fetch bindist ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.ics.com/openmotif/2.3/2.3.2/openmotif-2.3.2.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a20326e21397e44eb70590c87126233a
diff --git a/metadata/md5-cache/x11-libs/openmotif-2.3.3-r1 b/metadata/md5-cache/x11-libs/openmotif-2.3.3-r1
index ec9e1ed37970..518bc011db3a 100644
--- a/metadata/md5-cache/x11-libs/openmotif-2.3.3-r1
+++ b/metadata/md5-cache/x11-libs/openmotif-2.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-
 RESTRICT=!kernel_linux? ( !kernel_FreeBSD? ( !kernel_Darwin? ( fetch bindist ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.ics.com/openmotif/2.3/2.3.3/openmotif-2.3.3.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e69e68cc262f29c80e813529f0947e5d
diff --git a/metadata/md5-cache/x11-libs/pixman-0.20.2 b/metadata/md5-cache/x11-libs/pixman-0.20.2
index a51ef7c712f6..8af01a1515eb 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.20.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.20.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.20.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ad7fa39f18e09974541105a49c278ad9
diff --git a/metadata/md5-cache/x11-libs/pixman-0.22.0 b/metadata/md5-cache/x11-libs/pixman-0.22.0
index 87bded741811..7e658d3fefce 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.22.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.22.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.22.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f8cfff0d7e08f058bc66addb68f6e801
diff --git a/metadata/md5-cache/x11-libs/pixman-0.22.2 b/metadata/md5-cache/x11-libs/pixman-0.22.2
index f413abe3fb9a..520d319794c0 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.22.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.22.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.22.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8f2af85d403fd4972717c41555de81e5
diff --git a/metadata/md5-cache/x11-libs/pixman-0.24.0 b/metadata/md5-cache/x11-libs/pixman-0.24.0
index 1aefb0fc41ab..2a4776c6ec15 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.24.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.24.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.24.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d946824ade3deb90db949ddfc166c93f
diff --git a/metadata/md5-cache/x11-libs/pixman-0.24.2 b/metadata/md5-cache/x11-libs/pixman-0.24.2
index f902d40fccbd..0bca0b5d8ed2 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.24.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.24.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.24.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=41589d1b6ba2a3f0d92e0f7364d02664
diff --git a/metadata/md5-cache/x11-libs/pixman-0.24.4 b/metadata/md5-cache/x11-libs/pixman-0.24.4
index 13e3e653ed50..664a38895cac 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.24.4
+++ b/metadata/md5-cache/x11-libs/pixman-0.24.4
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.24.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1bc718ce1af6a1a247a3780fdd96c301
diff --git a/metadata/md5-cache/x11-libs/pixman-0.26.0 b/metadata/md5-cache/x11-libs/pixman-0.26.0
index 1184e77b8d5b..3d4dc923c3d9 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.26.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.26.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.26.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4ba016a61d62e1ee102fc8c767bbd2ef
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.6.3 b/metadata/md5-cache/x11-libs/qt-assistant-4.6.3
index 40c51f3105b5..50c40c5296c4 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.6.3[aqua=,debug=,trace?] ~x11-libs/qt-sql-4.6.3[aqua=,debug=,sqlite] ~x11-libs/qt-webkit-4.6.3[aqua=,debug=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4edc2cddbd870e15418fc431fe74b77a
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4 b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
index dda492a89153..768f5dbc137b 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=973dd9b306fdaa69bd7f7cb5d46463fb
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
index 1a91333b7373..622fa66b3718 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7493e637a345861a830885e012946dcf
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2
index ba90e9e5f3e6..f9b9190b97d0 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3b2b351909885f0a3fa06710df83f14a
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
index c51a139838d4..796ac4a72428 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13793892ad9ae82474fefdf7b23cfa6c
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
index d339338a32e7..3b001e2676f6 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d288f547065e043111c86e39f4adbe98
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.6.3-r1 b/metadata/md5-cache/x11-libs/qt-core-4.6.3-r1
index 54d17d6d89f5..53875306468a 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.6.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.6.3-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.6.3[aqua=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib ) ssl? ( dev-libs/openssl ) !<x11-libs/qt-4.4.0:4 !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=950f57f252dae647e53f7dfbc048f0b7
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1 b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
index 199dc85b3e70..285279fe1e22 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.7.4[aqua=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib ) ssl? ( dev-libs/openssl ) !<x11-libs/qt-4.4.0:4 !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1d915a994c04fa29c0b8615e2e1288e
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3 b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
index 7aa88cc57d98..f6b685569733 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !<x11-libs/qt-4.4.0:4 !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=700c6afe26ab599e8dab0bd42052faa9
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.2 b/metadata/md5-cache/x11-libs/qt-core-4.8.2
index 6bd26cdd7e21..aadfafb8dffa 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.2
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 !x11-libs/qt:4 !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0893c6e85f8c9458b9c516394cd30d58
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.6.3 b/metadata/md5-cache/x11-libs/qt-dbus-4.6.3
index fde2045b571c..96797e87b728 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=] >=sys-apps/dbus-1.0.2 !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07903418abaa358c37c7b0031554c2ae
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4 b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
index 5046b78ff1f0..96e67ba47919 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] >=sys-apps/dbus-1.0.2 !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c232fb72bcc982245b612922f0baa9a
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
index c250e0eb8f18..d179d51fcf5d 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1a7f224704ac8dba0e117c85d879078
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
index 53ce9d0e5091..f46b7320bafa 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=671a255a33c2a8591a796ab2c9804303
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.7.4 b/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
index c52fbf1faf37..9867a9b689fa 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,qt3support=] ~x11-libs/qt-gui-4.7.4[aqua=,qt3support=] ~x11-libs/qt-opengl-4.7.4[aqua=,qt3support=] ~x11-libs/qt-script-4.7.4[aqua=] ~x11-libs/qt-sql-4.7.4[aqua=,qt3support=] ~x11-libs/qt-svg-4.7.4[aqua=] ~x11-libs/qt-xmlpatterns-4.7.4[aqua=] qt3support? ( ~x11-libs/qt-qt3support-4.7.4[aqua=] ) webkit? ( ~x11-libs/qt-webkit-4.7.4[aqua=] ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4739412655170ca5df298c1250ab65e
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.1 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
index 97c6b4f3424f..afa3f86ae4f5 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-opengl-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-script-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-svg-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.1[aqua=,c++0x=,debug=,qpa=] qt3support? ( ~x11-libs/qt-qt3support-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f48a4de0e773ccf3fc9e0a9e588026fe
diff --git a/metadata/md5-cache/x11-libs/qt-declarative-4.8.2 b/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
index 36bd104b84ce..eab07cd795e8 100644
--- a/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-declarative-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-opengl-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-script-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-svg-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.2[aqua=,c++0x=,debug=,qpa=] qt3support? ( ~x11-libs/qt-qt3support-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7463c88604436861827cb9d9c1044e67
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.6.3 b/metadata/md5-cache/x11-libs/qt-demo-4.6.3
index 6c60f9a7597b..302cd022c93f 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.6.3:4[aqua=] ~x11-libs/qt-core-4.6.3:4[aqua=] ~x11-libs/qt-dbus-4.6.3:4[aqua=] ~x11-libs/qt-gui-4.6.3:4[aqua=] ~x11-libs/qt-multimedia-4.6.3:4[aqua=] ~x11-libs/qt-opengl-4.6.3:4[aqua=] !kde? ( || ( ~x11-libs/qt-phonon-4.6.3:4[aqua=] media-libs/phonon[aqua=] ) ) kde? ( media-libs/phonon[aqua=] ) ~x11-libs/qt-script-4.6.3:4[aqua=] ~x11-libs/qt-sql-4.6.3:4[aqua=] ~x11-libs/qt-svg-4.6.3:4[aqua=] ~x11-libs/qt-test-4.6.3:4[aqua=] ~x11-libs/qt-webkit-4.6.3:4[aqua=] ~x11-libs/qt-xmlpatterns-4.6.3:4[aqua=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a648fbe4a8076852145cb7662306be14
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.7.4 b/metadata/md5-cache/x11-libs/qt-demo-4.7.4
index 952cdbd1b293..e6a3cbc92ca1 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.7.4:4[aqua=] ~x11-libs/qt-core-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-dbus-4.7.4:4[aqua=] ~x11-libs/qt-declarative-4.7.4:4[aqua=,webkit] ~x11-libs/qt-gui-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-multimedia-4.7.4:4[aqua=] ~x11-libs/qt-opengl-4.7.4:4[aqua=,qt3support=] !kde? ( || ( ~x11-libs/qt-phonon-4.7.4:4[aqua=] media-libs/phonon[aqua=] ) ) kde? ( media-libs/phonon[aqua=] ) ~x11-libs/qt-script-4.7.4:4[aqua=] ~x11-libs/qt-sql-4.7.4:4[aqua=,qt3support=] ~x11-libs/qt-svg-4.7.4:4[aqua=] ~x11-libs/qt-test-4.7.4:4[aqua=] ~x11-libs/qt-webkit-4.7.4:4[aqua=] ~x11-libs/qt-xmlpatterns-4.7.4:4[aqua=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3de66d45b1e97b53e98c412c4573ba1f
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
index 4daa2d36d2a8..ffc713192d08 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7727a6135566f263d18398f0caa0aa1c
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.2 b/metadata/md5-cache/x11-libs/qt-demo-4.8.2
index 464ecbf26660..ef90c4cf4b01 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-assistant-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.2:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.2:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.2:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.2:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.2:4[aqua=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.2:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4514de6d28940c23d955a0edc6e81f96
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.6.3 b/metadata/md5-cache/x11-libs/qt-gui-4.6.3
index 932b7fcc413a..d0e2a306b448 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.6.3
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-qt3support-4.6.3[aqua=,debug=] )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg ~x11-libs/qt-core-4.6.3[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-4.6.3[aqua=,debug=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXfont x11-libs/libSM x11-libs/libXi ) cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-4.6.3[aqua=,debug=] ) gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=020730c58f1a175f809c4ebbeaf59622
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.6.3-r2 b/metadata/md5-cache/x11-libs/qt-gui-4.6.3-r2
index 592212f865f1..cf7f903c31f4 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.6.3-r2
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.6.3-r2
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-qt3support-4.6.3[aqua=,debug=] )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg ~x11-libs/qt-core-4.6.3[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-4.6.3[aqua=,debug=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXfont x11-libs/libSM x11-libs/libXi ) cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-4.6.3[aqua=,debug=] ) gtk? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98d74c49709d88bcae87aa225275a99c
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1 b/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
index 7f3a43105ab8..d172157b6663 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.7.4-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-qt3support-4.7.4[aqua=,debug=] )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg ~x11-libs/qt-core-4.7.4[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-4.7.4[aqua=,debug=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXfont x11-libs/libSM x11-libs/libXi ) cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) gtkstyle? ( x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3a8cdd2efc86fd272dad7eddaab9091
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
index 3c1c3055fd89..f614e64a608c 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc92d4d694b4d4dcdcf115ab1147cb23
diff --git a/metadata/md5-cache/x11-libs/qt-gui-4.8.2 b/metadata/md5-cache/x11-libs/qt-gui-4.8.2
index 64c18d5c230f..41a7c2e07ff3 100644
--- a/metadata/md5-cache/x11-libs/qt-gui-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-gui-4.8.2
@@ -11,5 +11,5 @@ RDEPEND=app-admin/eselect-qtgraphicssystem media-libs/fontconfig media-libs/free
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=009abdfd26690db57ac43be577f431a3
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.6.3 b/metadata/md5-cache/x11-libs/qt-multimedia-4.6.3
index 84aa124afd41..4df69f38ed98 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!aqua? ( media-libs/alsa-lib ) ~x11-libs/qt-core-4.6.3[aqua=,debug=] ~x11-libs/qt-gui-4.6.3[aqua=,debug=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01ed7a777ddaecac8387eaf8c5ea64bd
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4 b/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
index 0fa04a4ae66b..49a51337661f 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!aqua? ( media-libs/alsa-lib ) ~x11-libs/qt-core-4.7.4[aqua=,debug=] ~x11-libs/qt-gui-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c79b8c32eab86d5ee26e9b9aee1eb1c4
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
index 5f1eece5132b..67717962e0ec 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,qpa=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0dcaeac51fffdc725589005b193982df
diff --git a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2 b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
index 25473db6d9a1..963a5dd8b8ce 100644
--- a/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-multimedia-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,qpa=] alsa? ( media-libs/alsa-lib ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=09defa783c6f807e4fb6f6eb16ec0cbf
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.6.3 b/metadata/md5-cache/x11-libs/qt-opengl-4.6.3
index 93a5a8904687..977d0cc6e1f0 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.6.3[aqua=,debug=,qt3support=] virtual/opengl !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=23377bb4b8ee96aa2321b5b265b41843
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.7.4 b/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
index a334ab323b49..8e5e6fb5ef37 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support=] ~x11-libs/qt-gui-4.7.4[aqua=,debug=,egl=,qt3support=] virtual/opengl !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21470586ff5b1b5b50bc81b1170b8608
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.1 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
index 05cd2dd94d1a..2eae5a623d63 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3a8a881bd60b922682f624d3f1240f9
diff --git a/metadata/md5-cache/x11-libs/qt-opengl-4.8.2 b/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
index 3793b14c8891..bfe4e75e4b3e 100644
--- a/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-opengl-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=virtual/opengl ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bdbd8cb5fc2d4320928db77048c5bb74
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.1 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
index c8fca23f1ae4..1d94f0bafbb3 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dc89406966e204153b3d773a4382a1b0
diff --git a/metadata/md5-cache/x11-libs/qt-openvg-4.8.2 b/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
index e2d2388f441f..9e12b45b7238 100644
--- a/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-openvg-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=media-libs/mesa[egl,openvg] ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=189883295ac571d877d010dc323f4700
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.6.3 b/metadata/md5-cache/x11-libs/qt-phonon-4.6.3
index 45bda6c66c27..d38902bd5e01 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.6.3[aqua=,debug=,glib,qt3support] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer media-plugins/gst-plugins-meta ) aqua? ( ~x11-libs/qt-opengl-4.6.3[aqua] ) dbus? ( ~x11-libs/qt-dbus-4.6.3[aqua=,debug=] ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd18e3148278e4b04caf4ab973d5f4ee
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.7.4 b/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
index 0bc29ab9ef6e..b1a4fb659580 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer media-plugins/gst-plugins-meta ) aqua? ( ~x11-libs/qt-opengl-4.7.4[aqua,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eb9c3b8b23956997eb019fd126a91047
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.1 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
index 03647c1a1123..644424c8c105 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,qpa=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer media-plugins/gst-plugins-meta ) aqua? ( ~x11-libs/qt-opengl-4.8.1[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,qpa=,debug=] ) !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4513f56574c0ab710573572894cd0ed4
diff --git a/metadata/md5-cache/x11-libs/qt-phonon-4.8.2 b/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
index 1ef2db37bffa..49e819bc7abb 100644
--- a/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-phonon-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,qpa=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer media-plugins/gst-plugins-meta ) aqua? ( ~x11-libs/qt-opengl-4.8.2[aqua,debug=,qt3support=] ) dbus? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,qpa=,debug=] ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c5a97bb3fde43ba6fdfdd389c43e2ced
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.6.3 b/metadata/md5-cache/x11-libs/qt-qt3support-4.6.3
index 060a47874de6..c83e34743a45 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=,qt3support] ~x11-libs/qt-gui-4.6.3[accessibility=,aqua=,debug=,qt3support] ~x11-libs/qt-sql-4.6.3[aqua=,debug=,qt3support] phonon? ( !kde? ( || ( ~x11-libs/qt-phonon-4.6.3[aqua=,debug=] media-libs/phonon[aqua=,gstreamer] ) ) kde? ( media-libs/phonon[aqua=,gstreamer] ) ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eba3dd3460d4acb8eff8b9ddd2d79c9c
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4 b/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
index 2f63a17e19b2..8c43570f4772 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support] ~x11-libs/qt-gui-4.7.4[accessibility=,aqua=,debug=,qt3support] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support] phonon? ( !kde? ( || ( ~x11-libs/qt-phonon-4.7.4[aqua=,debug=] media-libs/phonon[aqua=,gstreamer] ) ) kde? ( media-libs/phonon[aqua=,gstreamer] ) ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d69f15c9ce69be3a6d713d0e90d87f63
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
index eb8e41a88466..69c1f08a957b 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=558c48690a97f70d99fe8f50ef5ebe9d
diff --git a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2 b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
index fcaf646f1681..ed2a85f2194e 100644
--- a/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-qt3support-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=219c44c92ecefe3ac03c445aa50c3e95
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.6.3 b/metadata/md5-cache/x11-libs/qt-script-4.6.3
index bb45341e0b87..f7e18f8baa11 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-script-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=071261622ba0ac679c4658793a00e6e6
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.7.4 b/metadata/md5-cache/x11-libs/qt-script-4.7.4
index 816536e5e04e..a44e8fbc8c0e 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-script-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=26686e115a17f7090162fc0cf365a426
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.1 b/metadata/md5-cache/x11-libs/qt-script-4.8.1
index fbf10e48cfb5..53808684a5af 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a7c4c528c70d20439a642a066cd5e4c
diff --git a/metadata/md5-cache/x11-libs/qt-script-4.8.2 b/metadata/md5-cache/x11-libs/qt-script-4.8.2
index d00f847ae989..e1c4ae461a2f 100644
--- a/metadata/md5-cache/x11-libs/qt-script-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-script-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=309b69af847ae82f84490ac2f609387f
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.6.3-r2 b/metadata/md5-cache/x11-libs/qt-sql-4.6.3-r2
index 17ca246c3880..ddd1c4341ba9 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.6.3-r2
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.6.3-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=,qt3support=] firebird? ( dev-db/firebird ) freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be4d5c03b2c59eb2c51a07928aba5021
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.7.4 b/metadata/md5-cache/x11-libs/qt-sql-4.7.4
index 55f65045f70a..08ca5fa26962 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,qt3support=] firebird? ( dev-db/firebird ) freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93f6dad8b9ba453fe34dd0f68ff0c094
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.1 b/metadata/md5-cache/x11-libs/qt-sql-4.8.1
index 5518fe685e78..76dfc34d3734 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.1
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=] firebird?
 REQUIRED_USE=|| ( firebird freetds mysql odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=405caca37c3ec1569bc123fd8c8938fb
diff --git a/metadata/md5-cache/x11-libs/qt-sql-4.8.2 b/metadata/md5-cache/x11-libs/qt-sql-4.8.2
index 4331656670a7..00e22be1843a 100644
--- a/metadata/md5-cache/x11-libs/qt-sql-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-sql-4.8.2
@@ -10,5 +10,5 @@ RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=] firebird?
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd90868abea3a5f2e9c3e180477e54bc
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.6.3 b/metadata/md5-cache/x11-libs/qt-svg-4.6.3
index 9b356f9226ee..411b868cc0bb 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.6.3[aqua=,debug=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=714e39981300f55654f9572f7f93b058
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.7.4 b/metadata/md5-cache/x11-libs/qt-svg-4.7.4
index 02be6f1a454a..bf03eb30e475 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-gui-4.7.4[accessibility=,aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8f1bfbc13c171a02fc9bf2ad8a28a8c
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.1 b/metadata/md5-cache/x11-libs/qt-svg-4.8.1
index bdc3b8a59400..2c237a7141a2 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.1[accessibility=,aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d33f7b67f9458775619cbc6542d455b
diff --git a/metadata/md5-cache/x11-libs/qt-svg-4.8.2 b/metadata/md5-cache/x11-libs/qt-svg-4.8.2
index 834e5176c6a9..e04f22e9f9be 100644
--- a/metadata/md5-cache/x11-libs/qt-svg-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-svg-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=sys-libs/zlib ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-gui-4.8.2[accessibility=,aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=950ffe3f10e6284afba25e1e88998ea0
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.6.3 b/metadata/md5-cache/x11-libs/qt-test-4.6.3
index 8c0a9ac17800..c94d4a7eef8d 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-test-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e77a1e7f232508c9612b660fce8c73d0
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.7.4 b/metadata/md5-cache/x11-libs/qt-test-4.7.4
index 25dc637bb4b2..16eafbf32a12 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-test-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8a722e1c56efc8f99bf491f1567c8f9
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.1 b/metadata/md5-cache/x11-libs/qt-test-4.8.1
index 54c3afb51edb..247991649cea 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ecec7d6b69dde6dd2a406d68c3a13db
diff --git a/metadata/md5-cache/x11-libs/qt-test-4.8.2 b/metadata/md5-cache/x11-libs/qt-test-4.8.2
index cc9ee3d6e444..7813adfe5a09 100644
--- a/metadata/md5-cache/x11-libs/qt-test-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-test-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bbe615c9ba42ef57072f0544de45f512
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r1 b/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r1
index ad38fc000f04..480583d11a70 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.6.3[aqua=,dbus?,debug=] ~x11-libs/qt-xmlpatterns-4.6.3[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.6.3[aqua=,debug=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.6.3:4[aqua=,dbus=,debug=] media-libs/phonon[aqua=] ) ) kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-4.6.3:4[aqua=,dbus=,debug=] ) ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b580a676f54387bfca9c20e7ccee5107
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r2 b/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r2
index 3b11dba8bb82..89a107fdf445 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r2
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.6.3-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 ~x11-libs/qt-core-4.6.3[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.6.3[aqua=,dbus?,debug=] ~x11-libs/qt-xmlpatterns-4.6.3[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.6.3[aqua=,debug=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.6.3:4[aqua=,dbus=,debug=] media-libs/phonon[aqua=] ) ) kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-4.6.3:4[aqua=,dbus=,debug=] ) ) !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eee7bebc8857a0421082ee882f69b6ff
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.7.4 b/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
index b19087e37811..543393798120 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 ~x11-libs/qt-core-4.7.4[aqua=,debug=,ssl] ~x11-libs/qt-gui-4.7.4[aqua=,dbus?,debug=] ~x11-libs/qt-xmlpatterns-4.7.4[aqua=,debug=] dbus? ( ~x11-libs/qt-dbus-4.7.4[aqua=,debug=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.7.4:4[aqua=,dbus=,debug=] media-libs/phonon[aqua=] ) ) kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-4.7.4:4[aqua=,dbus=,debug=] ) ) !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e2a3e8a1480ee2658592dfe4bb03668b
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.1 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
index 22fa43670056..b6f00a12f693 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.
 REQUIRED_USE=gstreamer? ( icu )
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07817391aa54012ca4812a4564adb097
diff --git a/metadata/md5-cache/x11-libs/qt-webkit-4.8.2 b/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
index d62c2a0a5bac..5219be5131fe 100644
--- a/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-webkit-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-4.8.2[aqua=,debug=,ssl,qpa=] ~x11-libs/qt-gui-4.8.2[aqua=,debug=,qpa=] ~x11-libs/qt-xmlpatterns-4.8.2[aqua=,debug=,qpa=] gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) icu? ( dev-libs/icu ) !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5626c60c99d72bba48551121cfc733a
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.6.3 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.6.3
index b2e424c7d420..21aed9b03d49 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.6.3
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.6.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.6.3[aqua=,debug=,exceptions] !<x11-libs/qt-assistant-4.6.3:4 !>x11-libs/qt-assistant-4.6.3-r9999:4 !<x11-libs/qt-bearer-4.6.3:4 !>x11-libs/qt-bearer-4.6.3-r9999:4 !<x11-libs/qt-core-4.6.3:4 !>x11-libs/qt-core-4.6.3-r9999:4 !<x11-libs/qt-dbus-4.6.3:4 !>x11-libs/qt-dbus-4.6.3-r9999:4 !<x11-libs/qt-declarative-4.6.3:4 !>x11-libs/qt-declarative-4.6.3-r9999:4 !<x11-libs/qt-demo-4.6.3:4 !>x11-libs/qt-demo-4.6.3-r9999:4 !<x11-libs/qt-gui-4.6.3:4 !>x11-libs/qt-gui-4.6.3-r9999:4 !<x11-libs/qt-multimedia-4.6.3:4 !>x11-libs/qt-multimedia-4.6.3-r9999:4 !<x11-libs/qt-opengl-4.6.3:4 !>x11-libs/qt-opengl-4.6.3-r9999:4 !<x11-libs/qt-openvg-4.6.3:4 !>x11-libs/qt-openvg-4.6.3-r9999:4 !<x11-libs/qt-phonon-4.6.3:4 !>x11-libs/qt-phonon-4.6.3-r9999:4 !<x11-libs/qt-qt3support-4.6.3:4 !>x11-libs/qt-qt3support-4.6.3-r9999:4 !<x11-libs/qt-script-4.6.3:4 !>x11-libs/qt-script-4.6.3-r9999:4 !<x11-libs/qt-sql-4.6.3:4 !>x11-libs/qt-sql-4.6.3-r9999:4 !<x11-libs/qt-svg-4.6.3:4 !>x11-libs/qt-svg-4.6.3-r9999:4 !<x11-libs/qt-test-4.6.3:4 !>x11-libs/qt-test-4.6.3-r9999:4 !<x11-libs/qt-webkit-4.6.3:4 !>x11-libs/qt-webkit-4.6.3-r9999:4 !<x11-libs/qt-xmlpatterns-4.6.3:4 !>x11-libs/qt-xmlpatterns-4.6.3-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1bb4af0f979ed1c538f63470421931c0
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
index f183136be759..e82cbab1976e 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=,exceptions] !<x11-libs/qt-assistant-4.7.4:4 !>x11-libs/qt-assistant-4.7.4-r9999:4 !<x11-libs/qt-bearer-4.7.4:4 !>x11-libs/qt-bearer-4.7.4-r9999:4 !<x11-libs/qt-core-4.7.4:4 !>x11-libs/qt-core-4.7.4-r9999:4 !<x11-libs/qt-dbus-4.7.4:4 !>x11-libs/qt-dbus-4.7.4-r9999:4 !<x11-libs/qt-declarative-4.7.4:4 !>x11-libs/qt-declarative-4.7.4-r9999:4 !<x11-libs/qt-demo-4.7.4:4 !>x11-libs/qt-demo-4.7.4-r9999:4 !<x11-libs/qt-gui-4.7.4:4 !>x11-libs/qt-gui-4.7.4-r9999:4 !<x11-libs/qt-multimedia-4.7.4:4 !>x11-libs/qt-multimedia-4.7.4-r9999:4 !<x11-libs/qt-opengl-4.7.4:4 !>x11-libs/qt-opengl-4.7.4-r9999:4 !<x11-libs/qt-openvg-4.7.4:4 !>x11-libs/qt-openvg-4.7.4-r9999:4 !<x11-libs/qt-phonon-4.7.4:4 !>x11-libs/qt-phonon-4.7.4-r9999:4 !<x11-libs/qt-qt3support-4.7.4:4 !>x11-libs/qt-qt3support-4.7.4-r9999:4 !<x11-libs/qt-script-4.7.4:4 !>x11-libs/qt-script-4.7.4-r9999:4 !<x11-libs/qt-sql-4.7.4:4 !>x11-libs/qt-sql-4.7.4-r9999:4 !<x11-libs/qt-svg-4.7.4:4 !>x11-libs/qt-svg-4.7.4-r9999:4 !<x11-libs/qt-test-4.7.4:4 !>x11-libs/qt-test-4.7.4-r9999:4 !<x11-libs/qt-webkit-4.7.4:4 !>x11-libs/qt-webkit-4.7.4-r9999:4 !<x11-libs/qt-xmlpatterns-4.7.4:4 !>x11-libs/qt-xmlpatterns-4.7.4-r9999:4
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=566131abe5cb5930101637035b323e06
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
index 4aed1af418fd..a4d8aff556b3 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,exceptions,qpa=] !<x11-libs/qt-assistant-4.8.1:4 !>x11-libs/qt-assistant-4.8.1-r9999:4 !<x11-libs/qt-bearer-4.8.1:4 !>x11-libs/qt-bearer-4.8.1-r9999:4 !<x11-libs/qt-core-4.8.1:4 !>x11-libs/qt-core-4.8.1-r9999:4 !<x11-libs/qt-dbus-4.8.1:4 !>x11-libs/qt-dbus-4.8.1-r9999:4 !<x11-libs/qt-declarative-4.8.1:4 !>x11-libs/qt-declarative-4.8.1-r9999:4 !<x11-libs/qt-demo-4.8.1:4 !>x11-libs/qt-demo-4.8.1-r9999:4 !<x11-libs/qt-gui-4.8.1:4 !>x11-libs/qt-gui-4.8.1-r9999:4 !<x11-libs/qt-multimedia-4.8.1:4 !>x11-libs/qt-multimedia-4.8.1-r9999:4 !<x11-libs/qt-opengl-4.8.1:4 !>x11-libs/qt-opengl-4.8.1-r9999:4 !<x11-libs/qt-openvg-4.8.1:4 !>x11-libs/qt-openvg-4.8.1-r9999:4 !<x11-libs/qt-phonon-4.8.1:4 !>x11-libs/qt-phonon-4.8.1-r9999:4 !<x11-libs/qt-qt3support-4.8.1:4 !>x11-libs/qt-qt3support-4.8.1-r9999:4 !<x11-libs/qt-script-4.8.1:4 !>x11-libs/qt-script-4.8.1-r9999:4 !<x11-libs/qt-sql-4.8.1:4 !>x11-libs/qt-sql-4.8.1-r9999:4 !<x11-libs/qt-svg-4.8.1:4 !>x11-libs/qt-svg-4.8.1-r9999:4 !<x11-libs/qt-test-4.8.1:4 !>x11-libs/qt-test-4.8.1-r9999:4 !<x11-libs/qt-webkit-4.8.1:4 !>x11-libs/qt-webkit-4.8.1-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.1:4 !>x11-libs/qt-xmlpatterns-4.8.1-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5024bd1b0c1b7adb017ccf50ad0726e
diff --git a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2 b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
index 36daef5d6e3f..ec2ca9df2e11 100644
--- a/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,exceptions,qpa=] !<x11-libs/qt-assistant-4.8.2:4 !>x11-libs/qt-assistant-4.8.2-r9999:4 !<x11-libs/qt-bearer-4.8.2:4 !>x11-libs/qt-bearer-4.8.2-r9999:4 !<x11-libs/qt-core-4.8.2:4 !>x11-libs/qt-core-4.8.2-r9999:4 !<x11-libs/qt-dbus-4.8.2:4 !>x11-libs/qt-dbus-4.8.2-r9999:4 !<x11-libs/qt-declarative-4.8.2:4 !>x11-libs/qt-declarative-4.8.2-r9999:4 !<x11-libs/qt-demo-4.8.2:4 !>x11-libs/qt-demo-4.8.2-r9999:4 !<x11-libs/qt-gui-4.8.2:4 !>x11-libs/qt-gui-4.8.2-r9999:4 !<x11-libs/qt-multimedia-4.8.2:4 !>x11-libs/qt-multimedia-4.8.2-r9999:4 !<x11-libs/qt-opengl-4.8.2:4 !>x11-libs/qt-opengl-4.8.2-r9999:4 !<x11-libs/qt-openvg-4.8.2:4 !>x11-libs/qt-openvg-4.8.2-r9999:4 !<x11-libs/qt-phonon-4.8.2:4 !>x11-libs/qt-phonon-4.8.2-r9999:4 !<x11-libs/qt-qt3support-4.8.2:4 !>x11-libs/qt-qt3support-4.8.2-r9999:4 !<x11-libs/qt-script-4.8.2:4 !>x11-libs/qt-script-4.8.2-r9999:4 !<x11-libs/qt-sql-4.8.2:4 !>x11-libs/qt-sql-4.8.2-r9999:4 !<x11-libs/qt-svg-4.8.2:4 !>x11-libs/qt-svg-4.8.2-r9999:4 !<x11-libs/qt-test-4.8.2:4 !>x11-libs/qt-test-4.8.2-r9999:4 !<x11-libs/qt-webkit-4.8.2:4 !>x11-libs/qt-webkit-4.8.2-r9999:4 !<x11-libs/qt-xmlpatterns-4.8.2:4 !>x11-libs/qt-xmlpatterns-4.8.2-r9999:4
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-build	1e48a2738d082efdab4fa29f3238aee2	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fe9cd793be804eb4be4c5dab255f0ae
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.12 b/metadata/md5-cache/x11-libs/startup-notification-0.12
index 7c9b9f226e3b..87cdc5ff8076 100644
--- a/metadata/md5-cache/x11-libs/startup-notification-0.12
+++ b/metadata/md5-cache/x11-libs/startup-notification-0.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 MIT
 RDEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=08e8ddcf810492796e92a456488a37fa
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.11.0 b/metadata/md5-cache/x11-libs/wxGTK-2.8.11.0
index 3425ad13409c..749fc2a217b4 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.11.0
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.8.11.0
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/eselect-wxwidgets-0.7
 RDEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 >=media-libs/gstreamer-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) )
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.11.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=17880652beb9522ba9fcb25b528368a4
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.0 b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.0
index f5067d254555..bc09960d573f 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.0
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.0
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/eselect-wxwidgets-0.7
 RDEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] virtual/jpeg tiff? ( media-libs/tiff:0 ) )
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff3477e0ac88d7b666aca17be2f61fed
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1 b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1
index d893e49e97e5..3b4c4d09a0b0 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/eselect-wxwidgets-0.7
 RDEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] virtual/jpeg tiff? ( media-libs/tiff:0 ) )
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86fdbd351ca967304989090b6335f42f
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.9.1.1 b/metadata/md5-cache/x11-libs/wxGTK-2.9.1.1
index a92cafaa24b6..9f1e764e2a26 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.9.1.1
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.9.1.1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/eselect-wxwidgets-1.4
 RDEPEND=dev-libs/expat sdl? ( media-libs/libsdl ) X? ( >=dev-libs/glib-2.22:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] virtual/jpeg tiff? ( media-libs/tiff:0 ) )
 SLOT=2.9
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.9.1.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1fc279a7ee809563d553d9b756b97ab5
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.9.3.1 b/metadata/md5-cache/x11-libs/wxGTK-2.9.3.1
index 760c0728033d..5b8991a4e5aa 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.9.3.1
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.9.3.1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/eselect-wxwidgets-1.4
 RDEPEND=dev-libs/expat sdl? ( media-libs/libsdl ) X? ( >=dev-libs/glib-2.22:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg >=x11-libs/gtk+-2.18:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] virtual/jpeg tiff? ( media-libs/tiff:0 ) )
 SLOT=2.9
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.9.3.1.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.3.1.tar.bz2 )
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4ce20c7a2035738adf93fb3a8c3e71f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.6 b/metadata/md5-cache/x11-libs/xcb-util-0.3.6
index 6aaced894970..833eeb8fb218 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.6
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.4 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=0baff6974a37a971cc80e7439806d62f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
index 4955deabf865..8af6e12cb42d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-image-0.3.8 >=x11-libs/xcb-util-keysyms-0.3.8 >=x11-
 RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=55286b380427fef99c3842d4bbda0c06
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
index 922262732796..99384c8047c1 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-image-0.3.9 >=x11-libs/xcb-util-keysyms-0.3.9 >=x11-
 RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=e9f5505e20ff7bdc8593b213f3108fb6
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
index 29f45e466d3f..0fbc2ae3a7d5 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fdd094b52208a38b53aa095fccb0ee0f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
index 58f5d6c0fbe9..942d30dcb809 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b815f842bdfc948ca33c25787b3a015c
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
index d85fbf85b046..4ea729b0d2d5 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b3d3c128e1cfaa3a0e23e6374965517f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
index 7fbd724202b3..6e9eb204fbc6 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f037236770f12af94b8fe8864ce38213
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
index b21c994ee906..e906a8cc3e60 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c0af3a9c6ff50cfc064ff296f33bc73e
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
index 667175be2df4..7bc06b7dc95b 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xcb-proto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bc7db82c2913fd20052b5a8991afe366
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
index a0c465132232..9cf39cd054dc 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xcb-proto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bb8ccc09497591e535b0468a80800750
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.2-r1 b/metadata/md5-cache/x11-libs/xpyb-1.2-r1
index 954166f9451e..3b0eadafdb9b 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.2-r1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1 >=dev-lang/python-2.5 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=9499e2a0f9f3523e126444c91553eb1c
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.3.1 b/metadata/md5-cache/x11-libs/xpyb-1.3.1
index 2f37a8ae1a0c..00ddd652e9d8 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.3.1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=23ab6dcb19009571bf23129ff8f1a6dd
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.6 b/metadata/md5-cache/x11-libs/xtrans-1.2.6
index 46555d15c503..c8404afb5674 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.6
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.6
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b3df496c95486cb25f6d6800f61a0d64
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.7 b/metadata/md5-cache/x11-libs/xtrans-1.2.7
index eb8c85046912..abf5d84fddd3 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.7
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f4c82f504cc9dec8603810df0cd94b9c
diff --git a/metadata/md5-cache/x11-misc/andromeda-0.2.1 b/metadata/md5-cache/x11-misc/andromeda-0.2.1
index 3ec4c7b13500..37ca8caefd14 100644
--- a/metadata/md5-cache/x11-misc/andromeda-0.2.1
+++ b/metadata/md5-cache/x11-misc/andromeda-0.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/qt-core-4.8.0:4 >=x11-libs/qt-gui-4.8.0:4 >=x11-libs/qt-webkit-4.8.0:4
 SLOT=0
 SRC_URI=https://gitorious.org/andromeda/andromeda/archive-tarball/v0.2.1 -> andromeda-0.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78ce1942219c4913e58396e4bdf2ea1b
diff --git a/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6 b/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6
index cfc90001d289..bcccd623e49f 100644
--- a/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6
+++ b/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=x11-libs/qt-core-4.8:4 >=x11-libs/qt-dbus-4.8:4 >=x11-libs/qt-gui-4.8:4 >=dev-libs/libdbusmenu-qt-0.9.0
 SLOT=0
 SRC_URI=http://launchpad.net/appmenu-qt/trunk/0.2.6/+download/appmenu-qt-0.2.6.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8153c6eafb5852c91b7e1d4eafe32d4
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.5 b/metadata/md5-cache/x11-misc/arandr-0.1.5
deleted file mode 100644
index 25d6c8459556..000000000000
--- a/metadata/md5-cache/x11-misc/arandr-0.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=dev-python/docutils-0.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=A simple visual frontend for XRandR 1.2/1.3
-EAPI=3
-HOMEPAGE=http://christian.amsuess.com/tools/arandr/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/pygtk-2 x11-apps/xrandr || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://christian.amsuess.com/tools/arandr/files/arandr-0.1.5.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=a1f0dc79d2bd8863c1e7e375e326a18f
diff --git a/metadata/md5-cache/x11-misc/autocutsel-0.9.0 b/metadata/md5-cache/x11-misc/autocutsel-0.9.0
index 35b4a0bfdf3c..41b35479fc22 100644
--- a/metadata/md5-cache/x11-misc/autocutsel-0.9.0
+++ b/metadata/md5-cache/x11-misc/autocutsel-0.9.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-proto/xproto
 DESCRIPTION=Synchronise the two copy/paste buffers mainly used by X applications
-HOMEPAGE=http://www.lepton.fr/tools/autocutsel/
+HOMEPAGE=http://www.nongnu.org/autocutsel/
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/autocutsel/autocutsel-0.9.0.tar.gz
-_md5_=9b613f95ffabc685603697f70d6141e5
+_md5_=e104e6455f6676863fb979af06a85f9f
diff --git a/metadata/md5-cache/x11-misc/cdm-0.5.3 b/metadata/md5-cache/x11-misc/cdm-0.5.3
index 93af51fe58c9..f68ee01c39b1 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.5.3
+++ b/metadata/md5-cache/x11-misc/cdm-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=app-shells/bash dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit console
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~gienah/snapshots/cdm-0.5.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f469f57b2e124db809aa5f7cb1430cc6
diff --git a/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11 b/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
index 28846e03c1cc..bdc31aefa73b 100644
--- a/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
+++ b/metadata/md5-cache/x11-misc/electricsheep-2.7_beta11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 virtual/ffmpeg sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 app-arch/gzip media-gfx/flam3 media-video/mplayer net-misc/curl x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~dreeevil/electricsheep-2.7_beta11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a89c5ff7efd1cfe7b0563b26c601c67
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
index aa2cb41172a0..b4a03025d840 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=a971e12b98fec2d15e3b1bb3e6a009b0
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
index 7de6b02dd34f..bc1760cfdc8e 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=93777f23ec4dab33a02de249b89e16df
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.4 b/metadata/md5-cache/x11-misc/imake-1.0.4
index bf73bee273f1..89d2d4b1b5f0 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.4
+++ b/metadata/md5-cache/x11-misc/imake-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/imake-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6a83e7439d8c290e3a0d39d2a3f2d790
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.5 b/metadata/md5-cache/x11-misc/imake-1.0.5
index 8379b2b4858c..0fe3aeb0f21c 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.5
+++ b/metadata/md5-cache/x11-misc/imake-1.0.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/imake-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6a3e11f45fbd8ffdb27d33a6e9d2b50f
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.0.11 b/metadata/md5-cache/x11-misc/lightdm-1.0.11
index 734ee7066379..53c5840817f8 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.0.11
+++ b/metadata/md5-cache/x11-misc/lightdm-1.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=branding? ( gtk ) || ( gtk qt4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.0/1.0.11/+download/lightdm-1.0.11.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2 gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=f03f52612837b0af062c4ffad7651b88
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.2.2 b/metadata/md5-cache/x11-misc/lightdm-1.2.2
deleted file mode 100644
index dc5a568d71b7..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool virtual/pkgconfig gnome-base/gnome-common sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A lightweight display manager
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
-IUSE=+introspection
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=x11-misc/lightdm-gtk-greeter
-RDEPEND=dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
-SLOT=0
-SRC_URI=http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ddc41da26019e9a44d76739faf4fca8
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r1 b/metadata/md5-cache/x11-misc/lightdm-1.2.2-r1
deleted file mode 100644
index fe251ed06ad0..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libxklavier x11-libs/libX11 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A lightweight display manager
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
-IUSE=+introspection qt4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libxklavier x11-libs/libX11 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 )
-SLOT=0
-SRC_URI=http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9776d76b98c01319a0b7ce717c684126
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r2 b/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
similarity index 58%
rename from metadata/md5-cache/x11-misc/lightdm-1.2.2-r2
rename to metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
index 16fce0cd18d7..01acaa06c660 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.2.2-r2
+++ b/metadata/md5-cache/x11-misc/lightdm-1.2.2-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) dev-util/gtk-doc-am dev-util/intltool gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A lightweight display manager
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LightDM
 IUSE=+introspection qt4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) >=sys-auth/pambase-20101024-r2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/accountsservice virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 introspection? ( >=dev-libs/gobject-introspection-1 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) >=sys-auth/pambase-20101024-r2
 SLOT=0
 SRC_URI=http://launchpad.net/lightdm/1.2/1.2.2/+download/lightdm-1.2.2.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=014b96816151060e6716bf0b93bc0561
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c188e933f6b7e16632b6025fc60b04d5
diff --git a/metadata/md5-cache/x11-misc/lightdm-kde-0.1.1 b/metadata/md5-cache/x11-misc/lightdm-kde-0.1.1
index d30070cbda04..26302490242b 100644
--- a/metadata/md5-cache/x11-misc/lightdm-kde-0.1.1
+++ b/metadata/md5-cache/x11-misc/lightdm-kde-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-misc/lightdm[qt4] >=kde-base/oxygen-icons-4.8:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/lightdm-kde/src/lightdm-kde-0.1.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=56e52f8efe609fc7fb7fe7f10831b268
diff --git a/metadata/md5-cache/x11-misc/lightdm-razorqt-greeter-0.4.1.20120524 b/metadata/md5-cache/x11-misc/lightdm-razorqt-greeter-0.4.1.20120524
index 050fb3eb1f83..69b4d05ed7d9 100644
--- a/metadata/md5-cache/x11-misc/lightdm-razorqt-greeter-0.4.1.20120524
+++ b/metadata/md5-cache/x11-misc/lightdm-razorqt-greeter-0.4.1.20120524
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-misc/lightdm[qt4] =x11-wm/razorqt-0.4.1*
 SLOT=0
 SRC_URI=mirror://gentoo/lightdm-razorqt-greeter-0.4.1.20120524.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=822effa5b3eba640290ac8d3b8888f9f
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.2 b/metadata/md5-cache/x11-misc/lndir-1.0.2
index 0efd6c443361..d65e911e0817 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.2
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a5ba1ceeea0bacf35e30cce55e131c52
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.3 b/metadata/md5-cache/x11-misc/lndir-1.0.3
index c09df6501a48..84454a6be25f 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.3
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d1435deb5b8d4f0947dc6b63d4473eec
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.3 b/metadata/md5-cache/x11-misc/makedepend-1.0.3
index d77245629e5c..b386096bcba3 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.3
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8cb2677a6632566e394878c188c3471a
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.4 b/metadata/md5-cache/x11-misc/makedepend-1.0.4
index b2e08def681f..54bd0877ea65 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.4
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=00ab17d09cbb0fbffca212e69048e6f2
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.8.2 b/metadata/md5-cache/x11-misc/qcomicbook-0.8.2
index a02b8617bb98..c3c505b02057 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.8.2
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 app-text/poppler[qt4]
 SLOT=0
 SRC_URI=mirror://gentoo/qcomicbook-0.8.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2548ab824dae4d9b69f3eb382075ad3e
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.9.0 b/metadata/md5-cache/x11-misc/qcomicbook-0.9.0
index 2b077e02b65e..ab15105c746b 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.9.0
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 app-text/poppler[qt4]
 SLOT=0
 SRC_URI=http://qcomicbook.org/releases/qcomicbook-0.9.0.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c39f612e88d352bd804ded1bcbc2e91f
diff --git a/metadata/md5-cache/x11-misc/qterm-0.5.11 b/metadata/md5-cache/x11-misc/qterm-0.5.11
index 32fd51fdcb4f..5374cc26c300 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.5.11
+++ b/metadata/md5-cache/x11-misc/qterm-0.5.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-gui-4.5:4[qt3support] dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/qterm/qterm-0.5.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2988df020ba1a864854a942fa419db65
diff --git a/metadata/md5-cache/x11-misc/qterm-0.5.12 b/metadata/md5-cache/x11-misc/qterm-0.5.12
index 6f7dbbc5903c..4200283793f5 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.5.12
+++ b/metadata/md5-cache/x11-misc/qterm-0.5.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-gui-4.5:4[qt3support] dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/qterm/qterm-0.5.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb2efb9d04916393b187de8413380c2e
diff --git a/metadata/md5-cache/x11-misc/qxkb-0.4.4 b/metadata/md5-cache/x11-misc/qxkb-0.4.4
index 274af2c71b58..3d56c651cb1d 100644
--- a/metadata/md5-cache/x11-misc/qxkb-0.4.4
+++ b/metadata/md5-cache/x11-misc/qxkb-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libxkbfile x11-libs/qt-gui:4 x11-libs/qt-svg:4
 SLOT=0
 SRC_URI=http://qxkb.googlecode.com/files/qxkb-0.4.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aa1e79120fefee38a4847c43e434e102
diff --git a/metadata/md5-cache/x11-misc/rendercheck-1.4 b/metadata/md5-cache/x11-misc/rendercheck-1.4
index 40922a47fd3c..a0ce9eece8af 100644
--- a/metadata/md5-cache/x11-misc/rendercheck-1.4
+++ b/metadata/md5-cache/x11-misc/rendercheck-1.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/rendercheck-1.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=72527944fa0e91460b2266c4e8f1533a
diff --git a/metadata/md5-cache/x11-misc/screengrab-0.9.85 b/metadata/md5-cache/x11-misc/screengrab-0.9.85
index d3eefdd2bbe6..dfeeae133fbd 100644
--- a/metadata/md5-cache/x11-misc/screengrab-0.9.85
+++ b/metadata/md5-cache/x11-misc/screengrab-0.9.85
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=http://screengrab-qt.googlecode.com/files/screengrab-0.9.85.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c6e09fdc7043ddbac2fcdfd74cfd1db
diff --git a/metadata/md5-cache/x11-misc/screengrab-0.9.90-r1 b/metadata/md5-cache/x11-misc/screengrab-0.9.90-r1
index 8566b6f94aa7..edb7d8d1fa70 100644
--- a/metadata/md5-cache/x11-misc/screengrab-0.9.90-r1
+++ b/metadata/md5-cache/x11-misc/screengrab-0.9.90-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/qt-core:4 x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=http://screengrab-qt.googlecode.com/files/screengrab-0.9.90.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6ae027f7932efa7597f3eedb1997bfc
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.2-r7 b/metadata/md5-cache/x11-misc/slim-1.3.2-r7
index aa53dec6b56e..850f1c83456e 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.2-r7
+++ b/metadata/md5-cache/x11-misc/slim-1.3.2-r7
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft >=media-
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=mirror://berlios/slim/slim-1.3.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dffe1925759951bc117da0ed24cd800a
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.3 b/metadata/md5-cache/x11-misc/slim-1.3.3
index d52a824e9904..1cfb4e8cda16 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.3
+++ b/metadata/md5-cache/x11-misc/slim-1.3.3
@@ -4,12 +4,12 @@ DESCRIPTION=Simple Login Manager
 EAPI=4
 HOMEPAGE=http://slim.berlios.de
 IUSE=branding pam consolekit
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft media-libs/libpng virtual/jpeg x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam )
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=mirror://berlios/slim/slim-1.3.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d5dad509c162b44384794d4dac78efee
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6e91795337169e200205d90b72029860
diff --git a/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3 b/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3
index 43476d3a92d7..9ea5efbb07db 100644
--- a/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3
+++ b/metadata/md5-cache/x11-misc/suxpanel-0.4b-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libwnck:1
 SLOT=0
 SRC_URI=mirror://berlios/suxpanel/suxpanel-0.4b.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d8bc23c5ba6c621a5a19f758fb5e48d0
diff --git a/metadata/md5-cache/x11-misc/synergy-1.3.6 b/metadata/md5-cache/x11-misc/synergy-1.3.6
index 902945aca6bb..46cccf84f21f 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.3.6
+++ b/metadata/md5-cache/x11-misc/synergy-1.3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama
 SLOT=0
 SRC_URI=http://synergy.googlecode.com/files/synergy-1.3.6-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0e97d66c210ca85d0f31a31c9dcde7a
diff --git a/metadata/md5-cache/x11-misc/synergy-1.4.2 b/metadata/md5-cache/x11-misc/synergy-1.4.2
index cea71def67ab..2a006fa88a09 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.4.2
+++ b/metadata/md5-cache/x11-misc/synergy-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama qt4? ( x11-libs/qt-gui ) qt4? ( !x11-misc/qsynergy )
 SLOT=0
 SRC_URI=http://synergy.googlecode.com/files/synergy-1.4.2-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fa79d0e77f195b1221473a19cd85d78
diff --git a/metadata/md5-cache/x11-misc/synergy-1.4.5-r2 b/metadata/md5-cache/x11-misc/synergy-1.4.5-r2
index a9ea6d0d8860..dd95601c2560 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.4.5-r2
+++ b/metadata/md5-cache/x11-misc/synergy-1.4.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama qt4? ( x11-libs/qt-gui ) qt4? ( !x11-misc/qsynergy )
 SLOT=0
 SRC_URI=http://synergy.googlecode.com/files/synergy-1.4.5-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07acb79c6ad7a0c6598c7695a4884a05
diff --git a/metadata/md5-cache/x11-misc/synergy-1.4.7 b/metadata/md5-cache/x11-misc/synergy-1.4.7
index f1ee1e5f2cd6..97513fa5be9a 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.4.7
+++ b/metadata/md5-cache/x11-misc/synergy-1.4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama qt4? ( x11-libs/qt-gui ) qt4? ( !x11-misc/qsynergy )
 SLOT=0
 SRC_URI=http://synergy.googlecode.com/files/synergy-1.4.7-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62c2021963ee77c5a8b1eddf0eb72e46
diff --git a/metadata/md5-cache/x11-misc/tint2-0.11 b/metadata/md5-cache/x11-misc/tint2-0.11
index 7f4b0c01e2b2..aa8046d35714 100644
--- a/metadata/md5-cache/x11-misc/tint2-0.11
+++ b/metadata/md5-cache/x11-misc/tint2-0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/pango x11-libs/libX11 x11-libs/libXinerama x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXrandr media-libs/imlib2[X] tint2conf? ( x11-misc/tintwizard )
 SLOT=0
 SRC_URI=http://tint2.googlecode.com/files/tint2-0.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=895c17763bf547dd074500b64d538a5c
diff --git a/metadata/md5-cache/x11-misc/tint2-0.11-r1 b/metadata/md5-cache/x11-misc/tint2-0.11-r1
index 1d2c35c9d5f7..85b1936c1e23 100644
--- a/metadata/md5-cache/x11-misc/tint2-0.11-r1
+++ b/metadata/md5-cache/x11-misc/tint2-0.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/pango x11-libs/libX11 x11-libs/libXinerama x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXrandr media-libs/imlib2[X] tint2conf? ( x11-misc/tintwizard )
 SLOT=0
 SRC_URI=http://tint2.googlecode.com/files/tint2-0.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=362d279a1faf5c478b19360f7f952450
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.14.0 b/metadata/md5-cache/x11-misc/util-macros-1.14.0
index cf60b8eb8fd2..22110c75a0fd 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.14.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.14.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.14.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=812cb983bd6a0be8e79926a4ce330b2b
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.15.0 b/metadata/md5-cache/x11-misc/util-macros-1.15.0
index 7917fffbeb93..47f8fb2f66bc 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.15.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.15.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.15.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=a69b788de7a395659b6a4b059ab6316f
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.0 b/metadata/md5-cache/x11-misc/util-macros-1.16.0
index b6d0108f7cf9..c22beada4b65 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=dd18fe5879fb45d91bc78950eeb23d12
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.1 b/metadata/md5-cache/x11-misc/util-macros-1.16.1
index f29c96cadc4a..08afa4f7ff8d 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.1
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b9df4673a0b0409f6d96eb88b78063fd
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.2 b/metadata/md5-cache/x11-misc/util-macros-1.16.2
index c90144de3339..c385c81eb721 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.2
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=8103c8396f51542c29a53014414aa51e
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.17 b/metadata/md5-cache/x11-misc/util-macros-1.17
index 9cc781c50f85..6bfe4e505425 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.17
+++ b/metadata/md5-cache/x11-misc/util-macros-1.17
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5ab9e3797cd9194117fba1660ba715dd
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3 b/metadata/md5-cache/x11-misc/virtualgl-2.3
index 019bb96c0f45..0f2d6d706f90 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs ) virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3/VirtualGL-2.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a8728ef89265f2966d6baf2a5a2a5bba
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.0 b/metadata/md5-cache/x11-misc/wbar-2.3.0
index 2227e4809a9c..b66a3e85e20d 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.0
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] virtual/init x11-libs/libX11 gtk? ( gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://wbar.googlecode.com/files/wbar_2.3.0.orig.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41b918625047f231478a3a11d898f4c7
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r1 b/metadata/md5-cache/x11-misc/wdm-1.28-r1
index 30dcb1ca322c..b7d2894add2d 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r1
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.70.0 truetype? ( x11-libs/libXft ) x11-libs/libXmu x11-libs/libXt x11-libs/libXpm pam? ( virtual/pam )
 SLOT=0
 SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c25901e7b40762f745881ffdb6e8563d
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r3 b/metadata/md5-cache/x11-misc/wdm-1.28-r3
index bdd42d2d71b9..2f82b9ba2fcf 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r3
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.70.0 truetype? ( x11-libs/libXft ) x11-libs/libXmu x11-libs/libXt x11-libs/libXpm pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1dcd0913d146f2a7818bff13539be52
diff --git a/metadata/md5-cache/x11-misc/wmctrl-1.07 b/metadata/md5-cache/x11-misc/wmctrl-1.07
index 1d7bd0254d99..1e98e944b5e8 100644
--- a/metadata/md5-cache/x11-misc/wmctrl-1.07
+++ b/metadata/md5-cache/x11-misc/wmctrl-1.07
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=>=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu virtual/pkgconfig x11-proto/xproto
 DESCRIPTION=command line tool to interact with an EWMH/NetWM compatible X Window Manager
-HOMEPAGE=http://sweb.cz/tripie/utils/wmctrl/
+HOMEPAGE=http://tomas.styblo.name/wmctrl/
 KEYWORDS=~amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu
 SLOT=0
-SRC_URI=http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
-_md5_=14978ddca8eaf00ef272ad096502a8e6
+SRC_URI=http://tomas.styblo.name/wmctrl/dist/wmctrl-1.07.tar.gz
+_md5_=5c569e5a9e13b2678196b3ccf852956b
diff --git a/metadata/md5-cache/x11-misc/wmctrl-1.07-r1 b/metadata/md5-cache/x11-misc/wmctrl-1.07-r1
index 36745932ee91..c1d235da9b10 100644
--- a/metadata/md5-cache/x11-misc/wmctrl-1.07-r1
+++ b/metadata/md5-cache/x11-misc/wmctrl-1.07-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install unpack
 DEPEND=>=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu virtual/pkgconfig x11-proto/xproto
 DESCRIPTION=command line tool to interact with an EWMH/NetWM compatible X Window Manager
-HOMEPAGE=http://sweb.cz/tripie/utils/wmctrl/
+HOMEPAGE=http://tomas.styblo.name/wmctrl/
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 x11-libs/libX11 x11-libs/libXt x11-libs/libXmu
 SLOT=0
-SRC_URI=http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+SRC_URI=http://tomas.styblo.name/wmctrl/dist/wmctrl-1.07.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a254ebf9a747c2ded127d859bb5b3bbd
+_md5_=cd70cd667d45665c747ce6be7a21881b
diff --git a/metadata/md5-cache/x11-misc/wmiface-2.1 b/metadata/md5-cache/x11-misc/wmiface-2.1
index e07e3d05d1bf..75f878fa4665 100644
--- a/metadata/md5-cache/x11-misc/wmiface-2.1
+++ b/metadata/md5-cache/x11-misc/wmiface-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core x11-libs/libX11
 SLOT=0
 SRC_URI=http://home.kde.org/~seli/wmiface/wmiface-2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7269dd22b5799ce7cb723ac34b781df
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.3 b/metadata/md5-cache/x11-misc/xbattbar-1.4.3
index e0f583109332..d356e129cda1 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.3
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 !ppc? ( >=sys-power/acpi-1.5 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.3.orig.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acaa7722a469731477f501e98780f701
diff --git a/metadata/md5-cache/x11-misc/xbitmaps-1.1.1 b/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
index c3208172d934..73f906d20b1e 100644
--- a/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
+++ b/metadata/md5-cache/x11-misc/xbitmaps-1.1.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=116d0f9a1945210d14c7bb3ee4cb9cf5
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.5 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
index 8e61cf307cc6..05532c7dbed5 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=4d26de9dee64d707717388df5ea189c7
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
index 6ccbf70e6fc3..29378c7458e5 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=768996a1e96254c92807789ad2824ecd
diff --git a/metadata/md5-cache/x11-misc/xdotool-2.20101012.3049 b/metadata/md5-cache/x11-misc/xdotool-2.20101012.3049
index a9e0cc9eaca6..f22d36267510 100644
--- a/metadata/md5-cache/x11-misc/xdotool-2.20101012.3049
+++ b/metadata/md5-cache/x11-misc/xdotool-2.20101012.3049
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXtst x11-libs/libX11
 RESTRICT=test
 SLOT=0
 SRC_URI=http://semicomplete.googlecode.com/files/xdotool-2.20101012.3049.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3375437976a72451b746f339919d725d
diff --git a/metadata/md5-cache/x11-misc/xdotool-2.20110530.1 b/metadata/md5-cache/x11-misc/xdotool-2.20110530.1
index 678185808b8c..a892fbadb200 100644
--- a/metadata/md5-cache/x11-misc/xdotool-2.20110530.1
+++ b/metadata/md5-cache/x11-misc/xdotool-2.20110530.1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama
 RESTRICT=test
 SLOT=0
 SRC_URI=http://semicomplete.googlecode.com/files/xdotool-2.20110530.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe1146d727bfec086ea9aee1fdd9993a
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.1 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.1
index c7edba8718fc..b64b4d9c09a8 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.1
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=56bd0ca273b9f2384216e85841d115cf
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.2.1-r1 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.2.1-r1
index 2783131a793f..1e9d245e38ec 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.2.1-r1
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4bf9c558457ca88866c180426e9d612f
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.3 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.3
index 0d31037660f0..8afcf07c5d6f 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.3
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=9de526e72d7fe0eaa6aa55e06b8a8a57
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r2 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r2
index 800c7236572b..47e9226ef3f0 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r2
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b6a5ac8722de48be2d673fa28fffdf43
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r3 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r3
index dbe928bd5c7e..ac52d642e49c 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r3
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=1d143b0de50f33606513b04194b43bfa
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.5 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.5
index 2234383ae4ed..e4bb23db6181 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.5
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=7a79d9be793211d0f51085995666d296
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.5.1 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.5.1
index 339aeb501c22..a2973dc86520 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.5.1
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.5.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.5.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=2ae6818a95c9cff97fdbf5bfd7ae7dca
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
index f9a754808e98..555f8c9855da 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bc1adac5adcde560eeabddcbce2942a0
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.31 b/metadata/md5-cache/x11-misc/xlockmore-5.31
index 3559138d05c1..7c1b103a49d3 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.31
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.31
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXmu opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) truetype? ( media-libs/freetype:2 ) pam? ( virtual/pam ) nas? ( media-libs/nas ) motif? ( >=x11-libs/openmotif-2.3:0 ) gtk? ( x11-libs/gtk+:2 ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.31/xlockmore-5.31.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50b7b539d69bf939de1e07cdbdf74f47
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.37 b/metadata/md5-cache/x11-misc/xlockmore-5.37
index 3ed07a114bc0..697dfb2ad50c 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.37
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.37
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-lib
 REQUIRED_USE=|| ( crypt pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.37/xlockmore-5.37.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=551f032f1fe694689b3b2d7c30c53090
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.38 b/metadata/md5-cache/x11-misc/xlockmore-5.38
index 09584a6e9c23..378fdd69cdc1 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.38
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.38
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-lib
 REQUIRED_USE=|| ( crypt pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.38/xlockmore-5.38.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aaaf3e0c6ccb52481d8f43cd28afcf4f
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.39 b/metadata/md5-cache/x11-misc/xlockmore-5.39
index 3844026f6b9c..8d086e73ed6e 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.39
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.39
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? (
 REQUIRED_USE=|| ( crypt pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.39/xlockmore-5.39.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b2dabe6f1e3a45d55c7f00152b08e76
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
index d6eb545aa01c..cf67fbe2a8de 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b0014c962fbc126fe37463c3899b7cba
diff --git a/metadata/md5-cache/x11-misc/xosview-1.9.3 b/metadata/md5-cache/x11-misc/xosview-1.9.3
index e21b932779d5..c52df679b07a 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.9.3
+++ b/metadata/md5-cache/x11-misc/xosview-1.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=X11 operating system viewer
 EAPI=4
 HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
 IUSE=suid
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.3.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6bf48b11d58dfc18e9bfd581bb2ecc3
+_md5_=2a1a169ea6b05771ce3ab03e325335cc
diff --git a/metadata/md5-cache/x11-misc/xplanet-1.3.0 b/metadata/md5-cache/x11-misc/xplanet-1.3.0
index c43519e1c1e6..a6fed30eca53 100644
--- a/metadata/md5-cache/x11-misc/xplanet-1.3.0
+++ b/metadata/md5-cache/x11-misc/xplanet-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/xplanet/xplanet-1.3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8c0b7cb97efc3a37c0bc79861ecc245
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.15 b/metadata/md5-cache/x11-misc/xscreensaver-5.15
index e7836c7ead95..3911f1a64ac9 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.15
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.15
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b98d8b726ad77e28c558727f763d55de
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.15-r1 b/metadata/md5-cache/x11-misc/xscreensaver-5.15-r1
index 50bf5c565cca..cd0cff90de82 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.15-r1
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.15-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appr
 REQUIRED_USE=gdm? ( new-login )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.15.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ad6e13068dd70d70db4da48165a4cd4
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r2 b/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r2
index 1e25ff3c503c..b8629fc05bba 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r2
+++ b/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=>=mail-client/thunderbird-3.1.1-r1[system-sqlite=] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/source/thunderbird-3.1.1.source.tar.bz2 http://www.mozilla-enigmail.org/download/source/enigmail-1.1.2.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-0.8.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=90a653649a4ce523ea306515013ae9dc
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r3 b/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r3
index cff603918cc9..d4ae7dd22e60 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r3
+++ b/metadata/md5-cache/x11-plugins/enigmail-1.1.2-r3
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=>=mail-client/thunderbird-3.1.1-r1[system-sqlite=] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/source/thunderbird-3.1.4.source.tar.bz2 http://www.mozilla-enigmail.org/download/source/enigmail-1.1.2.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c2964532440b220bc506b7a374e6ae8
diff --git a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.0-r1 b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.0-r1
index 8b41bbad91b0..9ca17d1969b3 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.0-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-im/pidgin x11-libs/gtk+:2 >=dev-libs/nss-3.11
 SLOT=0
 SRC_URI=mirror://sourceforge/gaim-encryption/pidgin-encryption-3.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=39851fa3791d03b46eb23b4a7deb2c18
diff --git a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1 b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
index af8d9e802e78..fa0f471a65aa 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 >=dev-libs/nss-3.11
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-encrypt/pidgin-encryption-3.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf642ac910add73c474698d6e6263c24
diff --git a/metadata/md5-cache/x11-plugins/wmcpu-1.4 b/metadata/md5-cache/x11-plugins/wmcpu-1.4
index 134b733f1671..3f3344b0623d 100644
--- a/metadata/md5-cache/x11-plugins/wmcpu-1.4
+++ b/metadata/md5-cache/x11-plugins/wmcpu-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-proto/xextproto
 SLOT=0
 SRC_URI=http://denilsonsa.sh.nu/~denilson/wmcpu-1.4.tar.gz http://denilsonsa.selfip.org/~denilson/wmcpu-1.4.tar.gz http://dockapps.windowmaker.org/download.php/id/673/wmcpu-1.4.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=adb2a5148d49974561dcfbe459d97805
diff --git a/metadata/md5-cache/x11-plugins/wmlpq-0.2.1-r2 b/metadata/md5-cache/x11-plugins/wmlpq-0.2.1-r2
index 46a13e1401b0..551ab2c802d3 100644
--- a/metadata/md5-cache/x11-plugins/wmlpq-0.2.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmlpq-0.2.1-r2
@@ -6,5 +6,5 @@ KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1160fb0fd4c022719932e98cdbde0d1
diff --git a/metadata/md5-cache/x11-plugins/wmudmount-1.8 b/metadata/md5-cache/x11-plugins/wmudmount-1.8
index e516cb1c6803..880bc5714e3f 100644
--- a/metadata/md5-cache/x11-plugins/wmudmount-1.8
+++ b/metadata/md5-cache/x11-plugins/wmudmount-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.18:2 dev-libs/dbus-glib sys-fs/udisks:0 gnome-keyring? ( gnome-base/libgnome-keyring ) libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=mirror://sourceforge/wmudmount/wmudmount-1.8.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cb0f10ca035bb54efa09b5bc0927987f
diff --git a/metadata/md5-cache/x11-plugins/wmweather+-2.11 b/metadata/md5-cache/x11-plugins/wmweather+-2.11
index 6da39864a34b..0dbfc5cd9169 100644
--- a/metadata/md5-cache/x11-plugins/wmweather+-2.11
+++ b/metadata/md5-cache/x11-plugins/wmweather+-2.11
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/windowmaker dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/wmweatherplus/wmweather+-2.11.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92f5bf4adc185f04c55546a24222980c
diff --git a/metadata/md5-cache/x11-plugins/wmweather+-2.13 b/metadata/md5-cache/x11-plugins/wmweather+-2.13
index b6b10363fd5a..0ba1ca3976d3 100644
--- a/metadata/md5-cache/x11-plugins/wmweather+-2.13
+++ b/metadata/md5-cache/x11-plugins/wmweather+-2.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-wm/windowmaker
 SLOT=0
 SRC_URI=mirror://sourceforge/wmweatherplus/wmweather+-2.13.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92baf737b07f04695020f06a5f1a574a
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
index 001367250eff..c126ec683029 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f05a5e25c2172d5abf1d3dc382d9c1e8
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
index 07cfe40db70c..c546befcc564 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d9e77997218edf71db5fe61ed21f13d6
diff --git a/metadata/md5-cache/x11-proto/compositeproto-0.4.2 b/metadata/md5-cache/x11-proto/compositeproto-0.4.2
index d65d3ad82e95..e2f32c36f76e 100644
--- a/metadata/md5-cache/x11-proto/compositeproto-0.4.2
+++ b/metadata/md5-cache/x11-proto/compositeproto-0.4.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=01080dc4323dea362740b3d968d445ff
diff --git a/metadata/md5-cache/x11-proto/damageproto-1.2.1 b/metadata/md5-cache/x11-proto/damageproto-1.2.1
index 3475d8839bfa..8aa307792872 100644
--- a/metadata/md5-cache/x11-proto/damageproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/damageproto-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=48566eb2a8dfb42b3e11e4b82092f0f5
diff --git a/metadata/md5-cache/x11-proto/dmxproto-2.3.1 b/metadata/md5-cache/x11-proto/dmxproto-2.3.1
index d8373c6795c1..7e326a223573 100644
--- a/metadata/md5-cache/x11-proto/dmxproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/dmxproto-2.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libdmx-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fddaa14033d75bc982153f13aa4b2538
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.6 b/metadata/md5-cache/x11-proto/dri2proto-2.6
index 21139e25ddbd..6127b5ac7b49 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.6
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.6
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6d0b3f837635361803cc21ef0d0c13dd
diff --git a/metadata/md5-cache/x11-proto/evieext-1.1.1 b/metadata/md5-cache/x11-proto/evieext-1.1.1
index b8a172cdf45e..573d722da073 100644
--- a/metadata/md5-cache/x11-proto/evieext-1.1.1
+++ b/metadata/md5-cache/x11-proto/evieext-1.1.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/evieext-1.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=29c4e460dfdd8a296afd3b5b44ba130c
diff --git a/metadata/md5-cache/x11-proto/fixesproto-5.0 b/metadata/md5-cache/x11-proto/fixesproto-5.0
index 6732c6a48723..82050537e256 100644
--- a/metadata/md5-cache/x11-proto/fixesproto-5.0
+++ b/metadata/md5-cache/x11-proto/fixesproto-5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-proto/xextproto-7.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fixesproto-5.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=45e9b101d9a7bee167d878251408a954
diff --git a/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3 b/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
index cc5816cd5a01..cd0b864a544f 100644
--- a/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
+++ b/metadata/md5-cache/x11-proto/fontcacheproto-0.1.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cb98e22cc3c265311bffdcae28814ac5
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.1 b/metadata/md5-cache/x11-proto/fontsproto-2.1.1
index bfa4c73947f5..fe058700954f 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.1
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5e73c1297dcfc6ab34f8a9e538dcedd0
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.2 b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
index 6e5e08e32309..d4a7ecd934de 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=79efe294276602fecd48716a3a0a56e5
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.14-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
index b0ae4daf02d7..7b9dbe449df2 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.14-r1
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=431df5f4b005a383e5bad5e429320d61
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.15 b/metadata/md5-cache/x11-proto/glproto-1.4.15
index da6744140e14..edecae88ce45 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.15
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.15
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5170ff224ab3fd9f3c57909904fb28b2
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.15-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
index ef962b594b7f..33279f67de4d 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.15-r1
@@ -8,5 +8,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-admin/eselect-opengl-1.2.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=92cfdc3b1daeffad8bd31e861bd18fde
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.0.2 b/metadata/md5-cache/x11-proto/inputproto-2.0.2
index 8d573be4a399..dc313b4c3dfa 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.0.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.0.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=0ccb456d8bf1996c63e96b30bc50e8bc
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.1 b/metadata/md5-cache/x11-proto/inputproto-2.1
index ef7aa4f6a885..26d4ee2d4240 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.1
+++ b/metadata/md5-cache/x11-proto/inputproto-2.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=550278cadd477de6b649ccbe2f7ca1d1
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.2 b/metadata/md5-cache/x11-proto/inputproto-2.2
index 5176f49bd2a8..c39a8d131361 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.2
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=323207b7fbfd1a31387c5cce4590909c
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.5 b/metadata/md5-cache/x11-proto/kbproto-1.0.5
index 9faaf699db56..ebd1c58307c6 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.5
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=04ba13b7c8c735d949679703f7cba8f1
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6 b/metadata/md5-cache/x11-proto/kbproto-1.0.6
index 70579cb863a2..df6a6e58eef2 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b8162bcb33d8d785339c82792f9389e3
diff --git a/metadata/md5-cache/x11-proto/printproto-1.0.5 b/metadata/md5-cache/x11-proto/printproto-1.0.5
index f3276c66d349..82d878cb5f6c 100644
--- a/metadata/md5-cache/x11-proto/printproto-1.0.5
+++ b/metadata/md5-cache/x11-proto/printproto-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=66f14b1ec3ebd554731c48ba23157bf0
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.3.2 b/metadata/md5-cache/x11-proto/randrproto-1.3.2
index 329739558be6..0740b539cf5f 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.3.2
+++ b/metadata/md5-cache/x11-proto/randrproto-1.3.2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=72948a0e210718c8136045b3f7843111
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.1 b/metadata/md5-cache/x11-proto/recordproto-1.14.1
index 52270399f698..d944a3fd52ac 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.1
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=00275afadff442df020ef97752b02a40
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2 b/metadata/md5-cache/x11-proto/recordproto-1.14.2
index 5f29252a6c75..b6cc3c6cae7b 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=c7d8e3816a2ebb788f763cf14e1c056e
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1 b/metadata/md5-cache/x11-proto/renderproto-0.11.1
index 49d93cf5a314..466a6eca62c5 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=ffa084373404b89447a884398ee3d61d
diff --git a/metadata/md5-cache/x11-proto/resourceproto-1.2.0 b/metadata/md5-cache/x11-proto/resourceproto-1.2.0
index ceb180a45eca..0844daf848bc 100644
--- a/metadata/md5-cache/x11-proto/resourceproto-1.2.0
+++ b/metadata/md5-cache/x11-proto/resourceproto-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=4c2827d365445b5607cfb54ec4dbb94d
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
index 7e9a2c176739..b33750aa4ce4 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=db044703fd81f593889444b96084825b
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
index 957f8f84938b..ffc73eebbc1e 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=6e24bc03a6885e44f315e341da1ecb05
diff --git a/metadata/md5-cache/x11-proto/trapproto-3.4.3 b/metadata/md5-cache/x11-proto/trapproto-3.4.3
index fd20f25c982b..e2a679589e5c 100644
--- a/metadata/md5-cache/x11-proto/trapproto-3.4.3
+++ b/metadata/md5-cache/x11-proto/trapproto-3.4.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=773aa046e8169928207001711fcbfb2c
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.1 b/metadata/md5-cache/x11-proto/videoproto-2.3.1
index 01a56e1e46bf..e2f8ff6715d5 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=258a4224a9cdd7e85965fb534ee85809
diff --git a/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210 b/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
index ba5c8a9c0cfc..c6e2693713ec 100644
--- a/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
+++ b/metadata/md5-cache/x11-proto/xcalibrateproto-0.1_pre20081210
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-f
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/calibrateproto-20081210.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=80e9a6b6b957bdb4659e3deb7ae90c64
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
index 4d2fd0099352..7bf74e7d8a4f 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=08d5438a2649f2169d9c7622b4ca3bb8
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2 b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
index 36c916b49799..b88298f40a25 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.6-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d75985d87a3f17729cefe7a9f8229f0b
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7 b/metadata/md5-cache/x11-proto/xcb-proto-1.7
index f9352d47931d..63c4fb2ef8af 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d6ddfcff1ef78c2f1f0df2f1254a23da
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
index 71c7d5d8ec66..0e2fb8da452e 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=eceed6b5ba97dd33c6fbd361cbf00ab5
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
index 4827ef38c756..af1034977438 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f4e315b7342915ebd49a7c597a8938d7
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
index 5f991251e8f0..ad505d3bbf47 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=51ad10be1175fe29d63cc3d9522021be
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
index 2d64dd7dc4f6..bfc056d12e38 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=62c61c351b00c8e9eb9666a63141a111
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.0 b/metadata/md5-cache/x11-proto/xextproto-7.2.0
index 4a8a3f44da91..3b63ffd1686b 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.0
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=cb95620ed80e592fe8fb1353e0e0e233
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1
index b1fad727bfd8..d44898873c23 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=52eb8f6ac99d00d75db519f5a33507a8
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
index 3f5cfc380b7f..55150363bf8d 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=fee1f268522e4b8c521ebcad5ccadc15
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
index 9edd845a02f9..227fa39422a2 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1 !<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=49fb75181e14b15802e97ce324729624
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
index 57a3fa6b5ee3..2d002dbe54c8 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=bc8fbe89401f65c045b83d10a413b1f2
diff --git a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1 b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
index a3f4ef14c9bf..c8eb3765dd82 100644
--- a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
+++ b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.1.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=59fb08a90c254ddd58ee4f3648d87ad9
diff --git a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3 b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
index 0f19197a7389..4fb5f7104f3f 100644
--- a/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
+++ b/metadata/md5-cache/x11-proto/xf86miscproto-0.9.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=b2b651bbe28dafcb1f62dbf2123f8e8b
diff --git a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2 b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
index cf859be978f4..7cbdbfc4c1ac 100644
--- a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
+++ b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=!<=x11-base/xorg-x11-6.9
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
 _md5_=537db7840bc622a1dd2c3ff64701282c
diff --git a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1 b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
index 920353cd9ec5..14fbb6c7db4b 100644
--- a/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
+++ b/metadata/md5-cache/x11-proto/xf86rushproto-1.1.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=19edbbf70682015bdf59b5244b0dc32b
diff --git a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1 b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
index c612ed104eae..db48499f2e99 100644
--- a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86vm-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=f598053bb7e575be6a59d30349b7ed73
diff --git a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1 b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
index fe40c796459e..14af342364a7 100644
--- a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
+++ b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXinerama-1.0.99.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.1.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=abe428bb93bc48e14b3b36429dd0828d
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.22 b/metadata/md5-cache/x11-proto/xproto-7.0.22
index eafae6f7c9e1..cd21beb78b65 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.22
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.22
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.22.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=de1035740023b50b55973f19f2166f7b
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23 b/metadata/md5-cache/x11-proto/xproto-7.0.23
index 5cef96b835c0..af537b0506e7 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=99c3e65647413cc478b01c9a5e789c45
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1 b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
index b825f1e858e2..7385f9fc7f5a 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=19bd6ae37772d1c4369fc161b6c93d93
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r1 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r1
index ccde292af9f3..5e502f8a5a73 100644
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r1
+++ b/metadata/md5-cache/x11-terms/aterm-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7412dae7cb838c2db9a3f9573a277110
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
index b281a3daab36..8c2fc88aad36 100644
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
+++ b/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16bac855939e0fd4ea7abbb4b6df3e13
diff --git a/metadata/md5-cache/x11-terms/kterm-6.2.0-r5 b/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
index 03ea9bfcd895..025454553d39 100644
--- a/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
+++ b/metadata/md5-cache/x11-terms/kterm-6.2.0-r5
@@ -8,5 +8,5 @@ LICENSE=MIT as-is
 RDEPEND=app-text/rman sys-libs/ncurses x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile x11-libs/libXaw x11-libs/libXp Xaw3d? ( x11-libs/libXaw3d )
 SLOT=0
 SRC_URI=ftp://ftp.x.org/contrib/applications/kterm-6.2.0.tar.gz http://www.asahi-net.or.jp/~hc3j-tkg/kterm/kterm-6.2.0-wpi.patch.gz http://www.st.rim.or.jp/~hanataka/kterm-6.2.0.ext02.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da2f007eb1c2b97218315f6390cb203d
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r2 b/metadata/md5-cache/x11-terms/root-tail-1.2-r2
index ef44aca03c4c..59a34f98af39 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r2
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c80bce2ea69d62c92098256e6cd64d3
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r3 b/metadata/md5-cache/x11-terms/root-tail-1.2-r3
index 1f24647539a7..6c129f8339c8 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r3
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6cdf6baf4e464f1881d1339c2c51cbdf
diff --git a/metadata/md5-cache/x11-terms/rxvt-2.7.10-r4 b/metadata/md5-cache/x11-terms/rxvt-2.7.10-r4
index f22a7d3fbaa8..c5cc391d6bd7 100644
--- a/metadata/md5-cache/x11-terms/rxvt-2.7.10-r4
+++ b/metadata/md5-cache/x11-terms/rxvt-2.7.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext motif? ( >=x11-libs/openmotif-2.3:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rxvt/rxvt-2.7.10.tar.gz http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/rxvt-2.7.10-xim-fix.patch.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=121a60ecf17caced9381337a8570f30a
diff --git a/metadata/md5-cache/x11-terms/sakura-2.4.2 b/metadata/md5-cache/x11-terms/sakura-2.4.2
index 4e3d96c5c9d7..8c5dbf0a3add 100644
--- a/metadata/md5-cache/x11-terms/sakura-2.4.2
+++ b/metadata/md5-cache/x11-terms/sakura-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.26:0
 SLOT=0
 SRC_URI=http://launchpad.net/sakura/trunk/2.4.2/+download/sakura-2.4.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b06cbba80b36105325f9d0397648783e
diff --git a/metadata/md5-cache/x11-terms/sakura-3.0.3 b/metadata/md5-cache/x11-terms/sakura-3.0.3
index f6fcba5ad5e4..c9b91d3ff571 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.0.3
+++ b/metadata/md5-cache/x11-terms/sakura-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3 >=x11-libs/vte-0.28:2.90
 SLOT=0
 SRC_URI=http://launchpad.net/sakura/trunk/3.0.3/+download/sakura-3.0.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=219d4d1f8e453afbed27aed28dabac69
diff --git a/metadata/md5-cache/x11-terms/sakura-3.0.4 b/metadata/md5-cache/x11-terms/sakura-3.0.4
index b4ff5a99d48f..71aa84202d11 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.0.4
+++ b/metadata/md5-cache/x11-terms/sakura-3.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 x11-libs/gtk+:3 >=x11-libs/vte-0.28:2.90
 SLOT=0
 SRC_URI=http://launchpad.net/sakura/trunk/3.0.4/+download/sakura-3.0.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f9ff8b58d302ab476a6f5f7ff97e35d
diff --git a/metadata/md5-cache/x11-terms/xvt-2.1-r1 b/metadata/md5-cache/x11-terms/xvt-2.1-r1
index 98842a42ba4d..da1071635617 100644
--- a/metadata/md5-cache/x11-terms/xvt-2.1-r1
+++ b/metadata/md5-cache/x11-terms/xvt-2.1-r1
@@ -7,5 +7,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z mirror://gentoo/xvt-2.1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=669cef6e64a0e56a0846bc970b47fceb
diff --git a/metadata/md5-cache/x11-terms/xvt-2.1-r2 b/metadata/md5-cache/x11-terms/xvt-2.1-r2
index 22e02617252d..6d867875a55c 100644
--- a/metadata/md5-cache/x11-terms/xvt-2.1-r2
+++ b/metadata/md5-cache/x11-terms/xvt-2.1-r2
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z mirror://gentoo/xvt-2.1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1767c43b3126843e68cfc09f0e51784d
diff --git a/metadata/md5-cache/x11-terms/xvt-2.1-r3 b/metadata/md5-cache/x11-terms/xvt-2.1-r3
index f147b9ff2aa7..3955f0aea6da 100644
--- a/metadata/md5-cache/x11-terms/xvt-2.1-r3
+++ b/metadata/md5-cache/x11-terms/xvt-2.1-r3
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z mirror://gentoo/xvt-2.1.diff.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=60abd7d74d57c6d410c05809b34ba733
diff --git a/metadata/md5-cache/x11-themes/crystal-2.0.5 b/metadata/md5-cache/x11-themes/crystal-2.0.5
index 822a6fbd1252..9d4ccfc814bc 100644
--- a/metadata/md5-cache/x11-themes/crystal-2.0.5
+++ b/metadata/md5-cache/x11-themes/crystal-2.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/75140-crystal-2.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3706d5e4712cfe3c3b55e123fb84a72e
diff --git a/metadata/md5-cache/x11-themes/crystal-2.1.0 b/metadata/md5-cache/x11-themes/crystal-2.1.0
index 5da582d192ca..7304f5e28c9d 100644
--- a/metadata/md5-cache/x11-themes/crystal-2.1.0
+++ b/metadata/md5-cache/x11-themes/crystal-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/75140-crystal-2.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=ac1519a0b2fc75aa593ea8ac12c69e25
diff --git a/metadata/md5-cache/x11-themes/dekorator-0.5.1 b/metadata/md5-cache/x11-themes/dekorator-0.5.1
index 7f55662a77a1..eac8143e3362 100644
--- a/metadata/md5-cache/x11-themes/dekorator-0.5.1
+++ b/metadata/md5-cache/x11-themes/dekorator-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/87921-dekorator-0.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=c8e72f37c0ac2c995938bfd401cb13af
diff --git a/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1 b/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
index 5b1b46d7390e..f7d28e556ccc 100644
--- a/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
+++ b/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/Neos-0.1.theme.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9223303f45a8ee55cef8bc07f488547d
diff --git a/metadata/md5-cache/x11-themes/gnustep-silver-theme-2.5 b/metadata/md5-cache/x11-themes/gnustep-silver-theme-2.5
index 70e460f31794..dd07f1c35190 100644
--- a/metadata/md5-cache/x11-themes/gnustep-silver-theme-2.5
+++ b/metadata/md5-cache/x11-themes/gnustep-silver-theme-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/silver.theme-2.5.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7f3bcc5a11e16d6f1dd0a2c6054477e
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.6.4 b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.6.4
index 21c6c3a6be8c..53ef177bc17c 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.6.4
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/cairo firefox3? ( || ( >=www-client/firefox-3.0 >=www-client/firefox-bin-3.0 ) )
 SLOT=0
 SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-1.6.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cef5c8666e98914dad7c9becc2e06777
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15 b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15
index bec9f641b74a..91838a7026bd 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 mozilla? ( || ( >=www-client/firefox-3.0 >=www-client/firefox-bin-3.0 >=www-client/icecat-3.0 ) )
 SLOT=0
 SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-1.8.15.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c6b366db8cfb61c96a66b671d8aa0d3
diff --git a/metadata/md5-cache/x11-themes/nitrogen-3.3.3 b/metadata/md5-cache/x11-themes/nitrogen-3.3.3
index b84eb07f3e59..94910e9267aa 100644
--- a/metadata/md5-cache/x11-themes/nitrogen-3.3.3
+++ b/metadata/md5-cache/x11-themes/nitrogen-3.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/99551-kde4-windeco-nitrogen-3.3.3-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=78cdf6fbcf0141d97dd6aa73d7d34558
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.0.5 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.0.5
index cadaddbdb2a3..82675bfc42bf 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.0.5
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11
 SLOT=3
 SRC_URI=mirror://kde/stable/oxygen-gtk3/1.0.5/src/oxygen-gtk3-1.0.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77ed241eb6d5a070ce2b896929813e73
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.2.5 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.2.5
index ce2b9ef8d256..6683596bd6b0 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.2.5
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.2.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!x11-themes/oxygen-gtk:0 dev-libs/dbus-glib dev-libs/glib x11-libs/cairo >=x11-libs/gtk+-2.24.2:2 x11-libs/libX11 x11-libs/pango
 SLOT=2
 SRC_URI=mirror://kde/stable/oxygen-gtk2/1.2.5/src/oxygen-gtk2-1.2.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d856a4d2590098476b3a40ac4c821be
diff --git a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.6.4-r1 b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.6.4-r1
index 619a388ede61..b41af3b60088 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.6.4-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 SLOT=0
 SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-KDE4-1.6.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=5e076c78195689899fbc3dfc92f8e13c
diff --git a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12 b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12
index f609d66ec91e..cdb03acf3f26 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12
+++ b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettin
 REQUIRED_USE=windeco? ( kde )
 SLOT=0
 SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-KDE4-1.8.12.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=aa288ee9475969c95bfc739fd17baf6e
diff --git a/metadata/md5-cache/x11-themes/skulpture-0.2.4 b/metadata/md5-cache/x11-themes/skulpture-0.2.4
index 8cf2a7ba192c..d072f31dc6d7 100644
--- a/metadata/md5-cache/x11-themes/skulpture-0.2.4
+++ b/metadata/md5-cache/x11-themes/skulpture-0.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/59031-skulpture-0.2.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=2be7f3034e5fc1549777d9bdb990f336
diff --git a/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r6 b/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r6
index b8940f33a676..4b8dbdf583ba 100644
--- a/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r6
+++ b/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r6
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=SLiM (Simple Login Manager) themes pack
 EAPI=2
 HOMEPAGE=http://slim.berlios.de
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-misc/slim
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://berlios/slim/slim-1.2.3-themepack1a.tar.gz mirror://berlios/slim/slim-gentoo-simple.tar.bz2 mirror://gentoo/slim-archlinux.tar.gz mirror://berlios/slim/slim-debian-moreblue.tar.bz2 mirror://berlios/slim/slim-fingerprint.tar.gz mirror://berlios/slim/slim-flat.tar.gz mirror://berlios/slim/slim-lunar-0.4.tar.bz2 mirror://berlios/slim/slim-previous.tar.gz mirror://berlios/slim/slim-rainbow.tar.gz mirror://berlios/slim/slim-rear-window.tar.gz mirror://berlios/slim/slim-scotland-road.tar.gz mirror://berlios/slim/slim-subway.tar.gz mirror://berlios/slim/slim-wave.tar.gz mirror://berlios/slim/slim-zenwalk.tar.gz mirror://berlios/slim/slim-archlinux-simple.tar.gz mirror://berlios/slim/slim-lake.tar.gz mirror://gentoo/slim-gentoo-1.0.tar.bz2 http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2 http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2 http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=33b66007c6bf7cd312b883b3bdb679f5
+_md5_=bd1c168265c79323a1c714b1e9d76289
diff --git a/metadata/md5-cache/x11-themes/smaragd-0.0.7 b/metadata/md5-cache/x11-themes/smaragd-0.0.7
index c04a3ee6bbed..4c753d0c730f 100644
--- a/metadata/md5-cache/x11-themes/smaragd-0.0.7
+++ b/metadata/md5-cache/x11-themes/smaragd-0.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.6:4[aqua=] x11-libs/cairo >=kde-base/kwin-4.6:4[aqua=] >=kde-base/oxygen-icons-4.6:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/125162-smaragd-0.0.7.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e5543c62584eea4c7f7194ae1a93165f
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
index 0cea663abb5a..d6f55cb7d438 100644
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.3.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=d00b55db68e3d06b4177b5a36683c5ab
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.11 b/metadata/md5-cache/x11-wm/afterstep-2.2.11
index 9f82a9a1d0a3..fa9a788ab9b6 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.11
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.11.tar.bz2 mirror://sourceforge/afterstep/AfterStep-2.2.11.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=69d0fc0112b926809af3f07e833f6b9b
diff --git a/metadata/md5-cache/x11-wm/afterstep-2.2.9 b/metadata/md5-cache/x11-wm/afterstep-2.2.9
index 4f5743eb3a00..24c14706e4be 100644
--- a/metadata/md5-cache/x11-wm/afterstep-2.2.9
+++ b/metadata/md5-cache/x11-wm/afterstep-2.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/AfterStep-2.2.9.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4283aa6f45fb2eebfd318c2d13cdc3f7
diff --git a/metadata/md5-cache/x11-wm/awesome-3.4.10 b/metadata/md5-cache/x11-wm/awesome-3.4.10
index 6f66bb6bbbbc..dda654f8374e 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.4.10
+++ b/metadata/md5-cache/x11-wm/awesome-3.4.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1 <dev-lang/lua-5.2 dev-libs/libev >=dev-libs/libxdg-basedir-1 media-libs/imlib2[png] x11-libs/cairo[xcb] || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.4.10.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b93bf92ba0d85d4b65f55061ffc24e5
diff --git a/metadata/md5-cache/x11-wm/awesome-3.4.11 b/metadata/md5-cache/x11-wm/awesome-3.4.11
index 28ffbc4731c5..8f1b67c49d91 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.4.11
+++ b/metadata/md5-cache/x11-wm/awesome-3.4.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/libev >=dev-libs/libxdg-basedir-1 media-libs/imlib2[png] x11-libs/cairo[xcb] || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.4.11.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae1371d3d66731baefc1f0178c0f62fb
diff --git a/metadata/md5-cache/x11-wm/awesome-3.4.8 b/metadata/md5-cache/x11-wm/awesome-3.4.8
index 72d289b19130..ad49da9bd8ca 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.4.8
+++ b/metadata/md5-cache/x11-wm/awesome-3.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1[deprecated] <dev-lang/lua-5.2 dev-libs/libev >=dev-libs/libxdg-basedir-1 media-libs/imlib2[png] x11-libs/cairo[xcb] || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.4 >=x11-libs/pango-1.19.3 ~x11-libs/startup-notification-0.10 ~x11-libs/xcb-util-0.3.6 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) app-shells/bash bash-completion? ( app-shells/bash-completion ) || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.4.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f4a9a902d18518777b0ddb15433eab04
diff --git a/metadata/md5-cache/x11-wm/awesome-3.4.9 b/metadata/md5-cache/x11-wm/awesome-3.4.9
index 4bbad4833889..e9b6292c86fb 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.4.9
+++ b/metadata/md5-cache/x11-wm/awesome-3.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1 <dev-lang/lua-5.2 dev-libs/libev >=dev-libs/libxdg-basedir-1 media-libs/imlib2[png] x11-libs/cairo[xcb] || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.4 >=x11-libs/pango-1.19.3 ~x11-libs/startup-notification-0.10 ~x11-libs/xcb-util-0.3.6 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.4.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b8f88798c8af646d643b6f0ebbb1eb62
diff --git a/metadata/md5-cache/x11-wm/awesome-3.4.9-r1 b/metadata/md5-cache/x11-wm/awesome-3.4.9-r1
index 8c4bbbcc6d34..6f54bb825b5d 100644
--- a/metadata/md5-cache/x11-wm/awesome-3.4.9-r1
+++ b/metadata/md5-cache/x11-wm/awesome-3.4.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1 <dev-lang/lua-5.2 dev-libs/libev >=dev-libs/libxdg-basedir-1 media-libs/imlib2[png] x11-libs/cairo[xcb] || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo ) || ( x11-misc/gxmessage x11-apps/xmessage ) || ( ( x11-apps/xwininfo || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) x11-misc/habak media-gfx/feh x11-misc/hsetroot media-gfx/qiv media-gfx/xv x11-misc/xsri media-gfx/xli x11-apps/xsetroot )
 SLOT=0
 SRC_URI=http://awesome.naquadah.org/download/awesome-3.4.9.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9f77fbcab6d1ff94b25181e5f3ca6eed
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index 3bf3dfbb21fb..d179d22269ea 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ http://github.c
 LICENSE=ISC
 RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bacb255fc138da52b0cbaa9ff7b674a0
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.2 b/metadata/md5-cache/x11-wm/fvwm-2.6.2
index 8b9c6b1bf235..2182b6ef5683 100644
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.2
+++ b/metadata/md5-cache/x11-wm/fvwm-2.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FVWM
 RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( >=dev-libs/fribidi-0.19.2 ) png? ( media-libs/libpng ) readline? ( sys-libs/ncurses sys-libs/readline ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) dev-lang/perl gtk2-perl? ( dev-perl/gtk2-perl ) perl? ( tk? ( dev-lang/tk dev-perl/perl-tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
 SLOT=0
 SRC_URI=ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.6.2.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=75e0d01e566c8ef685221e9ddc8fc30c
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.3 b/metadata/md5-cache/x11-wm/fvwm-2.6.3
index 4c91e193c93a..154713334645 100644
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.3
+++ b/metadata/md5-cache/x11-wm/fvwm-2.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FVWM
 RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) png? ( media-libs/libpng ) readline? ( sys-libs/ncurses sys-libs/readline ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) dev-lang/perl gtk2-perl? ( dev-perl/gtk2-perl ) perl? ( tk? ( dev-lang/tk dev-perl/perl-tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
 SLOT=0
 SRC_URI=ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.6.3.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d490588d5c389e80e9cb4ef9cdd3f12
diff --git a/metadata/md5-cache/x11-wm/razorqt-0.4.1-r1 b/metadata/md5-cache/x11-wm/razorqt-0.4.1-r1
index 43152cc8c739..fa535357c5ad 100644
--- a/metadata/md5-cache/x11-wm/razorqt-0.4.1-r1
+++ b/metadata/md5-cache/x11-wm/razorqt-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/file policykit? ( dev-libs/glib:2 sys-auth/polkit-qt ) sys-libs/zlib x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 || ( x11-wm/openbox kde-base/kwin x11-wm/metacity xfce-base/xfwm4 x11-wm/enlightenment x11-wm/fvwm x11-wm/sawfish x11-wm/windowmaker )
 SLOT=0
 SRC_URI=mirror://github/Razor-qt/razor-qt/razorqt-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=198472e3da9ea1327faa4967ae174d34
diff --git a/metadata/md5-cache/x11-wm/razorqt-0.4.1-r2 b/metadata/md5-cache/x11-wm/razorqt-0.4.1-r2
index d28977e8e6ae..2f1613c3ad0a 100644
--- a/metadata/md5-cache/x11-wm/razorqt-0.4.1-r2
+++ b/metadata/md5-cache/x11-wm/razorqt-0.4.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/file policykit? ( dev-libs/glib:2 sys-auth/polkit-qt ) sys-libs/zlib x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-script:4 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319 || ( x11-wm/openbox kde-base/kwin x11-wm/metacity xfce-base/xfwm4 x11-wm/enlightenment x11-wm/fvwm x11-wm/sawfish x11-wm/windowmaker )
 SLOT=0
 SRC_URI=mirror://github/Razor-qt/razor-qt/razorqt-0.4.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e65db546f320c1806d684caa7554bc96
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.6 b/metadata/md5-cache/x11-wm/twm-1.0.6
index ac77ac6229c3..0dcd7c25f45d 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.6
+++ b/metadata/md5-cache/x11-wm/twm-1.0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/twm-1.0.6.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=148cf7f11c3b78efb39903e334cf891f
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.7 b/metadata/md5-cache/x11-wm/twm-1.0.7
index 2bf1045f4f8f..83d4332010d6 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.7
+++ b/metadata/md5-cache/x11-wm/twm-1.0.7
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/twm-1.0.7.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
 _md5_=5154f5a6712c9bbd6daa64ff80cd78c6
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11 b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
index 6d9e3a17b2d0..1528fd8be048 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.92.0-r11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) nls? ( >=sys-devel/gettext-0.10.39 )
 SLOT=0
 SRC_URI=ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.gz http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz mirror://gentoo/windowmaker-0.92.0-patchset-5.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6c682d776e6e7e5941a9e9a341c70092
diff --git a/metadata/md5-cache/x11-wm/wmii-3.9.2-r2 b/metadata/md5-cache/x11-wm/wmii-3.9.2-r2
index 43de2cade089..b2e0f9bebaf0 100644
--- a/metadata/md5-cache/x11-wm/wmii-3.9.2-r2
+++ b/metadata/md5-cache/x11-wm/wmii-3.9.2-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/libixp-0.5_p20110208-r2 x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 x11-apps/xmessage x11-apps/xsetroot media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24f550918ffebbd5396547095b605bbc
diff --git a/metadata/md5-cache/x11-wm/wmii-3.9.2-r3 b/metadata/md5-cache/x11-wm/wmii-3.9.2-r3
index 8f84b770ee63..41bfc8e816e3 100644
--- a/metadata/md5-cache/x11-wm/wmii-3.9.2-r3
+++ b/metadata/md5-cache/x11-wm/wmii-3.9.2-r3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 x11-apps/xmessage x11-apps/xsetroot media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	c560ee28222213c7fe3374094a2e1624	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2326f3a72718830f74cd3cbd7bdcec24
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0
index 13af94787bed..1f2e2294a77d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 >=sys-power/upower-0.9.15 >=x11-libs/gtk+-2.20:2 >=x11-libs/libnotify-0.7 >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext >=xfce-base/xfconf-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 kernel_linux? ( sys-fs/udisks:0 ) policykit? ( >=sys-auth/polkit-0.104-r1 ) xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.2/xfce4-power-manager-1.2.0.tar.bz2
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c560ee28222213c7fe3374094a2e1624	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	706fbad47e8ea196d3c986b61c7669ce
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xfconf	706fbad47e8ea196d3c986b61c7669ce
 _md5_=365733ccf24b126d92a4583171a19324
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ec4561f69883..e5af830932b3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Jun 2012 17:07:25 +0000
+Sun, 24 Jun 2012 19:37:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f445ae725ff7..7c8ed503456c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jun 23 17:07:23 UTC 2012
+Sun Jun 24 19:37:44 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2530751c2dcc..7934bcddc45b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 23 Jun 2012 17:30:01 +0000
+Sun, 24 Jun 2012 20:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9e51c4820e39..778e61294b13 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1340471101 Sat Jun 23 17:05:01 2012 UTC
+1340566501 Sun Jun 24 19:35:01 2012 UTC
diff --git a/net-dns/dnssec-check/Manifest b/net-dns/dnssec-check/Manifest
index 84bf62832901..5580fdcebdf0 100644
--- a/net-dns/dnssec-check/Manifest
+++ b/net-dns/dnssec-check/Manifest
@@ -1 +1,2 @@
 DIST dnssec-check-1.12.3.tar.gz 169749 RMD160 c0b316232393e35afe06ccfcd8744a619d7ac538 SHA1 5b810becdb298cdbabe91303fdc842a0e6a79459 SHA256 05210ad023cde9b6042d22351e33031c19410d6a5f1816eecb00317f17914437
+DIST dnssec-check-1.13.tar.gz 174175 RMD160 22cef1de6803fbd83be446ecc005a55200dc692d SHA1 425489875d3b194ae21c2b3e2cbe5de50838ba6c SHA256 1c1d751aa39007736708930599b72236fc3abf2341e679cf1b44bf6a6395422b
diff --git a/net-dns/dnssec-check/dnssec-check-1.12.3.ebuild b/net-dns/dnssec-check/dnssec-check-1.12.3-r1.ebuild
similarity index 89%
rename from net-dns/dnssec-check/dnssec-check-1.12.3.ebuild
rename to net-dns/dnssec-check/dnssec-check-1.12.3-r1.ebuild
index b37e4a12f934..1b565bb77e0e 100644
--- a/net-dns/dnssec-check/dnssec-check-1.12.3.ebuild
+++ b/net-dns/dnssec-check/dnssec-check-1.12.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/net-dns/dnssec-check/dnssec-check-1.12.3.ebuild,v 1.1 2012/05/22 21:26:41 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-check/dnssec-check-1.12.3-r1.ebuild,v 1.1 2012/06/23 20:24:13 xmw Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-dns/dnssec-tools
+RDEPEND="net-dns/dnssec-tools[threads]
 	x11-libs/qt-declarative:4"
 DEPEND="${RDEPEND}"
 
diff --git a/net-dns/dnssec-check/dnssec-check-1.13.ebuild b/net-dns/dnssec-check/dnssec-check-1.13.ebuild
new file mode 100644
index 000000000000..ca73aa8ebe14
--- /dev/null
+++ b/net-dns/dnssec-check/dnssec-check-1.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-check/dnssec-check-1.13.ebuild,v 1.1 2012/06/23 22:25:05 xmw Exp $
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="tests local resolver for support of DNSSEC validation"
+HOMEPAGE="http://www.dnssec-tools.org"
+SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-dns/dnssec-validator[threads]
+	x11-libs/qt-declarative:4 "
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e '/installPrefix = /s: = .*: = /usr:' \
+		-i qmlapplicationviewer/qmlapplicationviewer.pri deployment.pri || die
+	sed -e '/Exec=/s:/opt::' \
+		-i ${PN}.desktop || die
+}
+
+src_configure() {
+	eqmake4 ${PN}.pro
+}
diff --git a/net-dns/dnssec-lookup/Manifest b/net-dns/dnssec-lookup/Manifest
index 83d87aaa166c..3f8f04f57c65 100644
--- a/net-dns/dnssec-lookup/Manifest
+++ b/net-dns/dnssec-lookup/Manifest
@@ -1 +1,2 @@
 DIST lookup-1.12.tar.gz 36771 RMD160 784d3743097097e4c07a1ae9fb80d66eac5005bc SHA1 1c5cac4d7166a2732a29bae5b39220da1b29a5e3 SHA256 095f253abca8fbec53ed9ca1bae672e135c861ffe8fa8942b8334fd32f087d00
+DIST lookup-1.13.tar.gz 37986 RMD160 5b0419a8f36955bea62c114d93b53d2a81ebbe46 SHA1 fe344669c68092d1844cd25a17b76377f6bac6cb SHA256 08f0777a79ec3c32e2db0026341c16509a798b6b89f1a49443b5e685ebfa51e3
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-1.13.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-1.13.ebuild
new file mode 100644
index 000000000000..ece9692f412f
--- /dev/null
+++ b/net-dns/dnssec-lookup/dnssec-lookup-1.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-lookup/dnssec-lookup-1.13.ebuild,v 1.1 2012/06/23 22:35:00 xmw Exp $
+
+EAPI=4
+
+inherit qt4-r2
+
+MY_PN=${PN/dnssec-/}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="DNS lookup utility that supports DNSSEC validation"
+HOMEPAGE="http://www.dnssec-tools.org"
+SRC_URI="http://www.dnssec-tools.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="net-dns/dnssec-validator[threads]
+	x11-libs/qt-gui"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro PREFIX=/usr
+}
+
+src_install() {
+	newbin src/build/${MY_PN} ${PN}
+
+	newicon data/64x64/${MY_PN}.png ${PN}.png
+	newicon data/maemo/${MY_PN}.xpm ${PN}.xpm
+	make_desktop_entry ${PN}
+
+	newman man/${MY_PN}.1 ${PN}.1
+}
diff --git a/net-dns/dnssec-nodes/Manifest b/net-dns/dnssec-nodes/Manifest
index e86b0e265c73..268600e7be2f 100644
--- a/net-dns/dnssec-nodes/Manifest
+++ b/net-dns/dnssec-nodes/Manifest
@@ -1 +1,2 @@
 DIST dnssec-nodes-1.12.tar.gz 72850 RMD160 64b0aa1f6054e955f86ad8c085a6bba29896eb88 SHA1 9fabc7a2ee867612136ed2345102fe34f618abd6 SHA256 5bf46dd84501caa6a392441e09b98a1ee0339170e0a31e536b687900b8f5f3bb
+DIST dnssec-nodes-1.13.tar.gz 72392 RMD160 f7ac1548ad5edaab1ac29eaaf7c422422e1a80d7 SHA1 e6ebbac6c5d73404e8733cd1c7a9f968aaef3d0e SHA256 8d3d2c92a9f66d18a46e8fba2d2a87f468b6dcfe7e9866d8df822e08ad910311
diff --git a/net-dns/dnssec-nodes/dnssec-nodes-1.12.ebuild b/net-dns/dnssec-nodes/dnssec-nodes-1.12-r1.ebuild
similarity index 86%
rename from net-dns/dnssec-nodes/dnssec-nodes-1.12.ebuild
rename to net-dns/dnssec-nodes/dnssec-nodes-1.12-r1.ebuild
index bae3d3dead05..1385f0014af4 100644
--- a/net-dns/dnssec-nodes/dnssec-nodes-1.12.ebuild
+++ b/net-dns/dnssec-nodes/dnssec-nodes-1.12-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-dns/dnssec-nodes/dnssec-nodes-1.12.ebuild,v 1.1 2012/05/22 21:50:16 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-nodes/dnssec-nodes-1.12-r1.ebuild,v 1.1 2012/06/23 20:21:48 xmw Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-dns/dnssec-tools"
+RDEPEND="net-dns/dnssec-tools[threads]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/net-dns/dnssec-nodes/dnssec-nodes-1.13.ebuild b/net-dns/dnssec-nodes/dnssec-nodes-1.13.ebuild
new file mode 100644
index 000000000000..8ba1b398af01
--- /dev/null
+++ b/net-dns/dnssec-nodes/dnssec-nodes-1.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-nodes/dnssec-nodes-1.13.ebuild,v 1.1 2012/06/23 22:28:55 xmw Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="graphically depicts the DNSSEC results from a lookup via logfiles"
+HOMEPAGE="http://www.dnssec-tools.org"
+SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-dns/dnssec-validator[threads]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake4 ${PN}.pro PREFIX=/usr
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	doicon icons/dnssec-nodes.*
+	make_desktop_entry ${PN}
+
+	doman man/${PN}.1
+}
diff --git a/net-dns/dnssec-system-tray/Manifest b/net-dns/dnssec-system-tray/Manifest
index 459510ace014..1095a7ac73af 100644
--- a/net-dns/dnssec-system-tray/Manifest
+++ b/net-dns/dnssec-system-tray/Manifest
@@ -1 +1,2 @@
 DIST dnssec-system-tray-1.12.tar.gz 15362 RMD160 36493e7a896862cda339c3c8d84db467ec8805b7 SHA1 f18b84fedcf1f57669f2550300046a4780e54f1b SHA256 fc07d85b6119581906cf1f67f4e49b1eadcf92a6c72b4c30d8dec7b4e52e029b
+DIST dnssec-system-tray-1.13.tar.gz 15101 RMD160 76febbe3a1efb583cc29a0f936ea669ed510c56e SHA1 581c11dfebfb8ecc281754c9062956b36b5a636c SHA256 8f1c88cb7f52d04e1e2df44f5d4aa15143c16bc7f3ee5c2a3d7df7b557ae39d6
diff --git a/net-dns/dnssec-system-tray/dnssec-system-tray-1.13.ebuild b/net-dns/dnssec-system-tray/dnssec-system-tray-1.13.ebuild
new file mode 100644
index 000000000000..04b2b799f4d7
--- /dev/null
+++ b/net-dns/dnssec-system-tray/dnssec-system-tray-1.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-system-tray/dnssec-system-tray-1.13.ebuild,v 1.1 2012/06/23 22:39:21 xmw Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="display DNSSEC resolver logs in system tray"
+HOMEPAGE="http://www.dnssec-tools.org"
+SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qt-gui"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake4 ${PN}.pro PREFIX=/usr
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	newicon	images/justlock.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	doman man/${PN}.1
+}
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 783faf419480..7b7bf7a5f2a4 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -1 +1,2 @@
 DIST dnssec-tools-1.12.2.tar.gz 3140018 RMD160 2a077c2ef74a4d0427932d8a806cdc32e185211a SHA1 e9912249fae3ec6bd5ad4ee1d73dea28acbefd0d SHA256 d7536e00c63e780f4cc4f6b3d4925078da36f2595682eaebdb936e5903711b60
+DIST dnssec-tools-1.13.tar.gz 3299592 RMD160 801534b539d30fc25620b88c436639ff989eb7c4 SHA1 67722968b65f497d256017c6daa944651b5cf305 SHA256 ac2caba324f96170406c202724344315371c3ef83815236e95b48a6021b2be91
diff --git a/net-dns/dnssec-tools/dnssec-tools-1.13.ebuild b/net-dns/dnssec-tools/dnssec-tools-1.13.ebuild
new file mode 100644
index 000000000000..276d54be7e6c
--- /dev/null
+++ b/net-dns/dnssec-tools/dnssec-tools-1.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-tools/dnssec-tools-1.13.ebuild,v 1.1 2012/06/23 21:44:18 xmw Exp $
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
+HOMEPAGE="http://www.dnssec-tools.org/"
+SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Getopt-GUI-Long
+	dev-perl/GraphViz
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/XML-Simple"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
+		-i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-bind-checks \
+		--without-validator \
+		--with-perl-build-args=INSTALLDIRS=vendor \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please run 'dtinitconf' in order to set up the required"
+	elog "/etc/dnssec-tools/dnssec-tools.conf file"
+	einfo
+	elog "DNSSEC Validator has been split into net-dns/dnsval"
+	einfo
+}
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
new file mode 100644
index 000000000000..c0cb22bcc258
--- /dev/null
+++ b/net-dns/dnssec-validator/Manifest
@@ -0,0 +1 @@
+DIST dnsval-1.13.tar.gz 986029 RMD160 ab1197dba9857f680867883f107bdf191fb30e18 SHA1 3fe9eede41a5e6b7704df951632abfa35780a395 SHA256 84477a5bb92f4ab5d0ef45d301d1eb908561f24fa5f047196b3067a3880fd698
diff --git a/net-dns/dnssec-validator/dnssec-validator-1.13.ebuild b/net-dns/dnssec-validator/dnssec-validator-1.13.ebuild
new file mode 100644
index 000000000000..47b17f3fb946
--- /dev/null
+++ b/net-dns/dnssec-validator/dnssec-validator-1.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnssec-validator/dnssec-validator-1.13.ebuild,v 1.1 2012/06/23 22:23:38 xmw Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="DNSSEC validator (dnsval)"
+HOMEPAGE="http://www.dnssec-tools.org/"
+SRC_URI="http://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 static-libs +threads"
+
+RDEPEND="dev-libs/openssl
+	!<net-dns/dnssec-tools-1.13
+	!net-dns/dnsval"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/dnsval-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
+}
+
+src_configure() {
+	econf \
+		--with-nsec3 \
+		--with-dlv \
+		$(use_with ipv6) \
+		$(use_with threads)
+}
+
+src_install() {
+	dodir /usr/bin /usr/include/validator
+	default
+
+	insinto /etc/dnssec-tools
+	doins etc/{dnsval.conf,root.hints}
+	elog "Creating /etc/dnssec-tools/resolv.conf as symlink to /etc/resolv.conf"
+	dosym ../resolv.conf /etc/dnssec-tools/resolv.conf
+
+
+	use static-libs || find "${D}" -name "*.a" -delete
+	prune_libtool_files
+}
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-1.13-respect-LDFLAGS.patch b/net-dns/dnssec-validator/files/dnssec-validator-1.13-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..dc7525909c23
--- /dev/null
+++ b/net-dns/dnssec-validator/files/dnssec-validator-1.13-respect-LDFLAGS.patch
@@ -0,0 +1,22 @@
+--- dnsval-1.13/libsres/Makefile.in
++++ dnsval-1.13/libsres/Makefile.in
+@@ -63,7 +63,7 @@
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBRES): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) 
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+--- dnsval-1.13/libval/Makefile.in
++++ dnsval-1.13/libval/Makefile.in
+@@ -60,7 +60,7 @@
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
diff --git a/app-arch/hardlink++/metadata.xml b/net-dns/dnssec-validator/metadata.xml
similarity index 74%
rename from app-arch/hardlink++/metadata.xml
rename to net-dns/dnssec-validator/metadata.xml
index c6d862855eb5..59acc2cc580e 100644
--- a/app-arch/hardlink++/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -2,6 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>robbat2@gentoo.org</email>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
+
diff --git a/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch b/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch
new file mode 100644
index 000000000000..e0bb11aa10bc
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch
@@ -0,0 +1,11 @@
+diff -Nur a/include/inspircd.h b/include/inspircd.h
+--- a/include/inspircd.h	2012-04-09 15:38:53.000000000 +0200
++++ b/include/inspircd.h	2012-06-23 18:05:15.059901531 +0200
+@@ -43,6 +43,7 @@
+ #include <cstring>
+ #include <climits>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #include <sstream>
+ #include <string>
diff --git a/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild b/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
index df4cae4a8778..055c38b919f4 100644
--- a/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.6_rc1.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-irc/inspircd/inspircd-2.0.6_rc1.ebuild,v 1.1 2012/04/12 20:17:22 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild,v 1.2 2012/06/23 17:16:04 nimiux Exp $
 
 EAPI=4
 
@@ -8,17 +8,18 @@ inherit eutils flag-o-matic multilib versionator
 
 MY_PV="$(delete_version_separator 3)"
 DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="http://www.inspircd.org/"
+HOMEPAGE="http://inspircd.github.com/"
 SRC_URI="http://github.com/inspircd/inspircd/downloads/InspIRCd-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ipv6 ldap mysql postgres sqlite ssl"
+IUSE="geoip gnutls ipv6 ldap mysql postgres sqlite ssl"
 
 RDEPEND="
 	dev-lang/perl
 	ssl? ( dev-libs/openssl )
+	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
@@ -38,6 +39,7 @@ src_prepare() {
 	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
 
 	epatch "${FILESDIR}/${PF}-fix-path-builds.patch"
+	epatch "${FILESDIR}/${PF}-gcc-4.7.patch"
 }
 
 src_configure() {
@@ -46,12 +48,13 @@ src_configure() {
 	local egnutls="--enable-gnutls"
 	local dipv6="--disable-ipv6"
 
-	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+	use geoip && extras="${extras}m_geoip.cpp,"
 	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
 	use ldap && extras="${extras}m_ldapauth.cpp,"
 	use mysql && extras="${extras}m_mysql.cpp,"
 	use postgres && extras="${extras}m_pgsql.cpp,"
 	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
 
 	# allow inspircd to be built by root
 	touch .force-root-ok || die
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 771c8e57f2a1..993327eb9bf2 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
+	<maintainer>
 		<email>nimiux@gentoo.org</email>
 		<name>Chema Alonso</name>
 	</maintainer>
-    <maintainer>
-        <email>brain@brainbox.cc</email>
+	<maintainer>
+		<email>brain@brainbox.cc</email>
 		<name>Craig Edwards</name>
-		<description>Formerly indirectly maintaining through hansmi@gentoo.org -
-looking for a new proxy maintainer</description>
-    </maintainer>
+		<description>Proxy-Maintainer</description>
+	</maintainer>
+	<longdescription lang="en">
+		InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
+		for Linux, BSD, Windows and Mac OS X systems which was created from
+		scratch to be stable, modern and lightweight.
+	</longdescription>
+	<longdescription lang="es">
+		InspIRCd es un servidor Internet Relay Chat (IRC) escrito en C++
+		para sistemas Linux, BSD, Windows y Mac OS X que se creó desde cero
+		para ser estable, moderno y ligero.
+	</longdescription>
 	<use>
-		<flag name='gnutls'>Enable TLS support</flag>
-		<flag name='ipv6'>Enable support for IP version 6</flag>
-		<flag name='ldap'>Enable LDAP support</flag>
-		<flag name='mysql'>Enable MySQL database backend</flag>
-		<flag name='openssl'>Enable SSL support</flag>
-		<flag name='postgres'>Enable PostgreSQL database backend</flag>
-		<flag name='sqlite'>Enable Sqlite database backend</flag>
-		<flag name='ssl'>Enable SSL support</flag>
+		<flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
+		<flag name="gnutls">Enable TLS support</flag>
+		<flag name="ipv6">Enable support for IP version 6</flag>
+		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="mysql">Enable MySQL database backend</flag>
+		<flag name="openssl">Enable SSL support (obsolete)</flag>
+		<flag name="postgres">Enable PostgreSQL database backend</flag>
+		<flag name="sqlite">Enable Sqlite database backend</flag>
+		<flag name="ssl">Enable SSL support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/enet/enet-1.3.4.ebuild b/net-libs/enet/enet-1.3.4.ebuild
index 3e99739c75dd..63cf2cd4419a 100644
--- a/net-libs/enet/enet-1.3.4.ebuild
+++ b/net-libs/enet/enet-1.3.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-libs/enet/enet-1.3.4.ebuild,v 1.1 2012/06/22 07:23:17 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/enet/enet-1.3.4.ebuild,v 1.2 2012/06/24 10:54:39 ago Exp $
 
 EAPI=3
 inherit base
@@ -11,7 +11,7 @@ SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="!${CATEGORY}/${PN}:0"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 609ec5faf2f8..ccf573895574 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,3 +1,2 @@
-DIST telepathy-qt-0.9.0.tar.gz 4120044 RMD160 f9cf24c8ab0043f404f39ed46cdff54a9d5ec75d SHA1 6d977a76b9854ceec933444507c6a11a0333af39 SHA256 cf2ae8d2cf75c1cf40a3faff263d3f36b88d637eddfec0724a5fcc51ffb6706c
 DIST telepathy-qt-0.9.1.tar.gz 4624632 RMD160 85e844bd99484b92b0ce7488e7f23ace25b5beba SHA1 c2a8e6d36f75b871919b08688cc10c5567d6c103 SHA256 d097b49a3912fed0e9ef0f295740b4002aedf2c1013cbdeb20d91063a6ec9e67
 DIST telepathy-qt4-0.8.0.tar.gz 4014194 RMD160 e6850de7d57c8c6bab57f381667209bfac4d3ea7 SHA1 ba34bf78b7e1b6d7bb087780d8e1709a3cf4775b SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
deleted file mode 100644
index 4b28be1722b1..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- telepathy-qt-0.9.0.orig/CMakeLists.txt	2011-12-20 21:33:46.000000000 +0100
-+++ telepathy-qt-0.9.0/CMakeLists.txt	2012-01-24 23:32:57.000000000 +0100
-@@ -73,6 +73,12 @@
- 
- include(MacroLogFeature)
- 
-+# options
-+option(WITH_Glib "Enable building with glib features" ON)
-+option(WITH_Farsight "Enable building with farsight features" ON)
-+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
-+option(WITH_Test "Enable test suite" ON)
-+
- # external dependencies
- 
- # Required dependencies
-@@ -108,31 +114,9 @@
- 
- add_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
--set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
--if (ENABLE_DEBUG_OUTPUT)
-+if(ENABLE_DEBUG_OUTPUT)
-     add_definitions(-DENABLE_DEBUG)
--endif (ENABLE_DEBUG_OUTPUT)
--
--# Check for Qt Glib support
--include(CheckCXXSourceCompiles)
--set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
--set(CMAKE_REQUIRED_DEFINITIONS "")
--set(CMAKE_REQUIRED_FLAGS "")
--
--CHECK_CXX_SOURCE_COMPILES("
--#include <QtCore/QtGlobal>
--int main()
--{
--#if defined(QT_NO_GLIB)
--#error \"Qt was compiled with Glib disabled\"
--#endif
--return 0;
--}"
--QT_GLIB_SUPPORT)
--macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
--                  "QtCore library using Glib's main event loop"
--                  "http://qt.nokia.com/" FALSE ""
--                  "Needed, together with Telepathy-Glib, to build most of the unit tests")
-+endif(ENABLE_DEBUG_OUTPUT)
- 
- # Find python version >= 2.5
- find_package(PythonLibrary REQUIRED)
-@@ -158,63 +142,100 @@
- 
- # Find GLib2, GObject, DBus and LibXml2
- # Those are needed for the insane include dir dependency hell
--find_package(GLIB2)
--find_package(GObject)
--find_package(GIO)
--find_package(GIOUnix)
--find_package(DBus)
--find_package(DBusGLib)
--find_package(LibXml2)
--
--# Find tp-farsight
--set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
--find_package(TelepathyFarsight)
--macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
--                  "A Framework for dealing with audio/video conferencing protocols"
--                  "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
--                  "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
--
--# Find GStreamer
--find_package(GStreamer)
--macro_log_feature(GSTREAMER_FOUND "GStreamer"
--                  "An open source multimedia framework"
--                  "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
--                  "http://www.gstreamer.net/" FALSE)
--
--# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
--if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
--    set (FARSIGHT_COMPONENTS_FOUND 1)
--else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+if (WITH_Farsight)
-+    find_package(GLIB2)
-+    find_package(GObject)
-+    find_package(DBus)
-+    find_package(DBusGLib)
-+    find_package(LibXml2)
-+
-+    # Find tp-farsight
-+    set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
-+    find_package(TelepathyFarsight)
-+    macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-+		      "A Framework for dealing with audio/video conferencing protocols"
-+		      "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
-+		      "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
-+
-+    # Find GStreamer
-+    find_package(GStreamer)
-+    macro_log_feature(GSTREAMER_FOUND "GStreamer"
-+		      "An open source multimedia framework"
-+		      "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
-+		      "http://www.gstreamer.net/" FALSE)
-+
-+    # Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
-+    if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+	set (FARSIGHT_COMPONENTS_FOUND 1)
-+    else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+	set (FARSIGHT_COMPONENTS_FOUND 0)
-+    endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+else(WITH_Farsight)
-     set (FARSIGHT_COMPONENTS_FOUND 0)
--endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+endif(WITH_Farsight)
- 
- # Find telepathy-glib
--set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
--find_package(TelepathyGlib)
--macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
--                  "Glib bindings for Telepathy"
--                  "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
--                  "Needed, together with Qt Glib integration, to build most of the unit tests")
--
--find_program(GLIB_GENMARSHAL glib-genmarshal)
--
--# Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found
--if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
--    set(ENABLE_TP_GLIB_TESTS 1)
--    if(GIO_FOUND AND GIOUNIX_FOUND)
--        set(ENABLE_TP_GLIB_GIO_TESTS 1)
--    else(GIO_FOUND AND GIOUNIX_FOUND)
--        set(ENABLE_TP_GLIB_GIO_TESTS 0)
--    endif(GIO_FOUND AND GIOUNIX_FOUND)
--else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+if(WITH_Glib)
-+    # Check for Qt Glib support
-+    include(CheckCXXSourceCompiles)
-+    set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
-+    set(CMAKE_REQUIRED_DEFINITIONS "")
-+    set(CMAKE_REQUIRED_FLAGS "")
-+
-+    CHECK_CXX_SOURCE_COMPILES("E_TP
-+    #include <QtCore/QtGlobal>
-+    int main()
-+    {
-+    #if defined(QT_NO_GLIB)
-+    #error \"Qt was compiled with Glib disabled\"
-+    #endif
-+    return 0;
-+    }"
-+    QT_GLIB_SUPPORT)
-+    macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
-+		      "QtCore library using Glib's main event loop"
-+		      "http://qt.nokia.com/" FALSE ""
-+		      "Needed, together with Telepathy-Glib, to build most of the unit tests")
-+
-+    find_package(GLIB2 REQUIRED)
-+    find_package(GIO)
-+    find_package(GIOUnix)
-+    find_package(DBus REQUIRED)
-+
-+    # Find telepathy-glib
-+    set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
-+    find_package(TelepathyGlib)
-+    macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-+		      "Glib bindings for Telepathy"
-+		      "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
-+		      "Needed, together with Qt Glib integration, to build most of the unit tests")
-+
-+    find_program(GLIB_GENMARSHAL glib-genmarshal)
-+
-+    # Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found
-+    if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+	set(ENABLE_TP_GLIB_TESTS 1)
-+	if(GIO_FOUND AND GIOUNIX_FOUND)
-+	    set(ENABLE_TP_GLIB_GIO_TESTS 1)
-+	else(GIO_FOUND AND GIOUNIX_FOUND)
-+	    set(ENABLE_TP_GLIB_GIO_TESTS 0)
-+	endif(GIO_FOUND AND GIOUNIX_FOUND)
-+    else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+	set(ENABLE_TP_GLIB_TESTS 0)
-+	set(ENABLE_TP_GLIB_GIO_TESTS 0)
-+    endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+else(WITH_Glib)
-     set(ENABLE_TP_GLIB_TESTS 0)
-     set(ENABLE_TP_GLIB_GIO_TESTS 0)
--endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+endif(WITH_Glib)
-+
- 
- # Add the source subdirectories
- add_subdirectory(TelepathyQt)
- add_subdirectory(examples)
--add_subdirectory(tests)
-+if(WITH_Test)
-+  add_subdirectory(tests)
-+endif(WITH_Test)
- add_subdirectory(tools)
- 
- # Generate config.h and config-version.h
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
index 345fa1e7d433..7b24ff35b03a 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.8.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/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.3 2012/05/05 02:54:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.5 2012/06/24 15:15:08 ago Exp $
 
 EAPI=4
 
@@ -14,9 +14,11 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug farsight glib test"
 
+RESTRICT="test" #423089
+
 RDEPEND="
 	dev-python/dbus-python
 	x11-libs/qt-core:4[glib?]
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild
deleted file mode 100644
index 5e733be77834..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild,v 1.3 2012/05/05 02:54:26 jdhore Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-inherit python base cmake-utils
-
-DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="http://telepathy.freedesktop.org/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug farsight glib test"
-
-RDEPEND="
-	dev-python/dbus-python
-	x11-libs/qt-core:4[glib?]
-	x11-libs/qt-dbus:4
-	farsight? (
-		dev-libs/dbus-glib
-		dev-libs/libxml2
-		media-libs/gstreamer
-		net-libs/telepathy-farsight
-	)
-	glib? (
-		dev-libs/glib:2
-		>=net-libs/telepathy-glib-0.17.2
-	)
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( x11-libs/qt-test:4 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_with glib)
-		$(cmake-utils_use_with farsight)
-		$(cmake-utils_use_with test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-misc/corkscrew/corkscrew-2.0.ebuild
index a3f9919f0a3a..b6a1acdc777e 100644
--- a/net-misc/corkscrew/corkscrew-2.0.ebuild
+++ b/net-misc/corkscrew/corkscrew-2.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.12 2012/03/31 03:00:27 vapier Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.13 2012/06/24 14:23:33 ssuominen Exp $
 
+EAPI=4
 inherit autotools
 
 DESCRIPTION="a tool for tunneling SSH through HTTP proxies"
@@ -15,16 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
+DOCS="AUTHORS ChangeLog README TODO"
+
 src_prepare() {
 	# Christoph Mende <angelos@gentoo.org (23 Jun 2010)
 	# Shipped configure doesn't work with some locales (bug #305771)
 	# Shipped missing doesn't work with new configure, so we'll force
 	# regeneration
 	rm -f install-sh missing mkinstalldirs || die
-	eautoreconf
-}
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
+	# Samuli Suominen <ssuominen@gentoo.org> (24 Jun 2012)
+	# AC_HEADER_STDC is called separately and #include <string.h> is
+	# without #ifdef in corkscrew.c. Instead of using AC_C_PROTOTYPES,
+	# remove the call entirely as unused wrt bug #423193
+	sed -i -e 's:AM_C_PROTOTYPES:dnl &:' configure.in || die
+
+	eautoreconf
 }
diff --git a/perl-core/Archive-Tar/metadata.xml b/perl-core/Archive-Tar/metadata.xml
index 9b129eedbb98..e9c576849595 100644
--- a/perl-core/Archive-Tar/metadata.xml
+++ b/perl-core/Archive-Tar/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Archive-Tar</remote-id>
+    <remote-id type="cpan-module">Archive::Tar</remote-id>
+    <remote-id type="cpan-module">Archive::Tar::Constant</remote-id>
+    <remote-id type="cpan-module">Archive::Tar::File</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Attribute-Handlers/metadata.xml b/perl-core/Attribute-Handlers/metadata.xml
index b79df731c72e..a969392d1276 100644
--- a/perl-core/Attribute-Handlers/metadata.xml
+++ b/perl-core/Attribute-Handlers/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Attribute-Handlers</remote-id>
+    <remote-id type="cpan-module">Attribute::Handlers</remote-id>
+    <remote-id type="cpan-module">Demo</remote-id>
+    <remote-id type="cpan-module">Descriptions</remote-id>
+    <remote-id type="cpan-module">MyClass</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/AutoLoader/metadata.xml b/perl-core/AutoLoader/metadata.xml
index 591a48f1e9c7..4dd73e4806d9 100644
--- a/perl-core/AutoLoader/metadata.xml
+++ b/perl-core/AutoLoader/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">AutoLoader</remote-id>
+    <remote-id type="cpan-module">AutoLoader</remote-id>
+    <remote-id type="cpan-module">AutoSplit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/CGI/metadata.xml b/perl-core/CGI/metadata.xml
index 4960016aa09a..6c8ef312317c 100644
--- a/perl-core/CGI/metadata.xml
+++ b/perl-core/CGI/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">CGI</remote-id>
+    <remote-id type="cpan-module">CGI</remote-id>
+    <remote-id type="cpan-module">CGI::Apache</remote-id>
+    <remote-id type="cpan-module">CGI::Carp</remote-id>
+    <remote-id type="cpan-module">CGI::Cookie</remote-id>
+    <remote-id type="cpan-module">CGI::Fast</remote-id>
+    <remote-id type="cpan-module">CGI::Pretty</remote-id>
+    <remote-id type="cpan-module">CGI::Push</remote-id>
+    <remote-id type="cpan-module">CGI::Switch</remote-id>
+    <remote-id type="cpan-module">CGI::Util</remote-id>
+    <remote-id type="cpan-module">CGITempFile</remote-id>
+    <remote-id type="cpan-module">Fh</remote-id>
+    <remote-id type="cpan-module">MultipartBuffer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/CPAN-Meta-Requirements/metadata.xml b/perl-core/CPAN-Meta-Requirements/metadata.xml
index ca8c7ff6f858..5556b1fc335e 100644
--- a/perl-core/CPAN-Meta-Requirements/metadata.xml
+++ b/perl-core/CPAN-Meta-Requirements/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">CPAN-Meta-Requirements</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Requirements</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/perl-core/CPAN-Meta-YAML/metadata.xml b/perl-core/CPAN-Meta-YAML/metadata.xml
index 8be92891e0ab..4a320687ed8d 100644
--- a/perl-core/CPAN-Meta-YAML/metadata.xml
+++ b/perl-core/CPAN-Meta-YAML/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">CPAN-Meta-YAML</remote-id>
+		<remote-id type="cpan-module">CPAN::Meta::YAML</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/perl-core/CPAN-Meta/metadata.xml b/perl-core/CPAN-Meta/metadata.xml
index 3cf1eff243dc..09194b0d531e 100644
--- a/perl-core/CPAN-Meta/metadata.xml
+++ b/perl-core/CPAN-Meta/metadata.xml
@@ -4,5 +4,12 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">CPAN-Meta</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Converter</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Feature</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::History</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Prereqs</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Spec</remote-id>
+        <remote-id type="cpan-module">CPAN::Meta::Validator</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/perl-core/Class-ISA/metadata.xml b/perl-core/Class-ISA/metadata.xml
index 161d55043e69..0a714d78ca8b 100644
--- a/perl-core/Class-ISA/metadata.xml
+++ b/perl-core/Class-ISA/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Class-ISA</remote-id>
+    <remote-id type="cpan-module">Class::ISA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Compress-Raw-Bzip2/metadata.xml b/perl-core/Compress-Raw-Bzip2/metadata.xml
index 4170498e802d..c887ffb6444f 100644
--- a/perl-core/Compress-Raw-Bzip2/metadata.xml
+++ b/perl-core/Compress-Raw-Bzip2/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Compress-Raw-Bzip2</remote-id>
+    <remote-id type="cpan-module">Compress::Raw::Bzip2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Compress-Raw-Zlib/metadata.xml b/perl-core/Compress-Raw-Zlib/metadata.xml
index 84f04a6a2c8f..1406265ec3b4 100644
--- a/perl-core/Compress-Raw-Zlib/metadata.xml
+++ b/perl-core/Compress-Raw-Zlib/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Compress-Raw-Zlib</remote-id>
+    <remote-id type="cpan-module">Compress::Raw::Zlib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/DB_File/metadata.xml b/perl-core/DB_File/metadata.xml
index 550a08493edf..b7a8b53e8690 100644
--- a/perl-core/DB_File/metadata.xml
+++ b/perl-core/DB_File/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">DB_File</remote-id>
+    <remote-id type="cpan-module">DB_File</remote-id>
+    <remote-id type="cpan-module">DB_File::BTREEINFO</remote-id>
+    <remote-id type="cpan-module">DB_File::HASHINFO</remote-id>
+    <remote-id type="cpan-module">DB_File::RECNOINFO</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Data-Dumper/metadata.xml b/perl-core/Data-Dumper/metadata.xml
index 5b781616f1af..6002b1a3b749 100644
--- a/perl-core/Data-Dumper/metadata.xml
+++ b/perl-core/Data-Dumper/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Data-Dumper</remote-id>
+        <remote-id type="cpan-module">Data::Dumper</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/perl-core/Digest-MD5/metadata.xml b/perl-core/Digest-MD5/metadata.xml
index 0bd3a001cc00..badded201922 100644
--- a/perl-core/Digest-MD5/metadata.xml
+++ b/perl-core/Digest-MD5/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-MD5</remote-id>
+    <remote-id type="cpan-module">Digest::MD5</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Digest-SHA/metadata.xml b/perl-core/Digest-SHA/metadata.xml
index d0e7ae20acb0..910736553634 100644
--- a/perl-core/Digest-SHA/metadata.xml
+++ b/perl-core/Digest-SHA/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest-SHA</remote-id>
+    <remote-id type="cpan-module">Digest::SHA</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Encode/metadata.xml b/perl-core/Encode/metadata.xml
index 676517b8f8fb..33a7fc2b3ef4 100644
--- a/perl-core/Encode/metadata.xml
+++ b/perl-core/Encode/metadata.xml
@@ -4,5 +4,33 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Encode</remote-id>
+    <remote-id type="cpan-module">Encode</remote-id>
+    <remote-id type="cpan-module">Encode::Alias</remote-id>
+    <remote-id type="cpan-module">Encode::Byte</remote-id>
+    <remote-id type="cpan-module">Encode::CJKConstants</remote-id>
+    <remote-id type="cpan-module">Encode::CN</remote-id>
+    <remote-id type="cpan-module">Encode::CN::HZ</remote-id>
+    <remote-id type="cpan-module">Encode::Config</remote-id>
+    <remote-id type="cpan-module">Encode::EBCDIC</remote-id>
+    <remote-id type="cpan-module">Encode::Encoder</remote-id>
+    <remote-id type="cpan-module">Encode::Encoding</remote-id>
+    <remote-id type="cpan-module">Encode::GSM0338</remote-id>
+    <remote-id type="cpan-module">Encode::Guess</remote-id>
+    <remote-id type="cpan-module">Encode::Internal</remote-id>
+    <remote-id type="cpan-module">Encode::JP</remote-id>
+    <remote-id type="cpan-module">Encode::JP::H2Z</remote-id>
+    <remote-id type="cpan-module">Encode::JP::JIS7</remote-id>
+    <remote-id type="cpan-module">Encode::KR</remote-id>
+    <remote-id type="cpan-module">Encode::KR::2022_KR</remote-id>
+    <remote-id type="cpan-module">Encode::MIME::Header</remote-id>
+    <remote-id type="cpan-module">Encode::MIME::Header::ISO_2022_JP</remote-id>
+    <remote-id type="cpan-module">Encode::MIME::Name</remote-id>
+    <remote-id type="cpan-module">Encode::Symbol</remote-id>
+    <remote-id type="cpan-module">Encode::TW</remote-id>
+    <remote-id type="cpan-module">Encode::UTF_EBCDIC</remote-id>
+    <remote-id type="cpan-module">Encode::Unicode</remote-id>
+    <remote-id type="cpan-module">Encode::Unicode::UTF7</remote-id>
+    <remote-id type="cpan-module">Encode::utf8</remote-id>
+    <remote-id type="cpan-module">encoding</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-CBuilder/metadata.xml b/perl-core/ExtUtils-CBuilder/metadata.xml
index ac839a315d42..f190af480f82 100644
--- a/perl-core/ExtUtils-CBuilder/metadata.xml
+++ b/perl-core/ExtUtils-CBuilder/metadata.xml
@@ -4,5 +4,18 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-CBuilder</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Base</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::Unix</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::VMS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::Windows</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::Windows::BCC</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::Windows::GCC</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::Windows::MSVC</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::aix</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::cygwin</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::darwin</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::dec_osf</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CBuilder::Platform::os2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Command/metadata.xml b/perl-core/ExtUtils-Command/metadata.xml
index c8bc33bb9ff3..c111bfd5a68b 100644
--- a/perl-core/ExtUtils-Command/metadata.xml
+++ b/perl-core/ExtUtils-Command/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-Command</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Command</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Constant/metadata.xml b/perl-core/ExtUtils-Constant/metadata.xml
index 77a089f7e613..0e11fa898bc4 100644
--- a/perl-core/ExtUtils-Constant/metadata.xml
+++ b/perl-core/ExtUtils-Constant/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
   <herd>perl</herd>
   <upstream>
+    <remote-id type="cpan">ExtUtils-Constant</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant::Aaargh56Hash</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant::Base</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant::ProxySubs</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant::Utils</remote-id>
     <remote-id type="cpan-module">ExtUtils::Constant::XS</remote-id>
-    <remote-id type="cpan">ExtUtils-Constant</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Install/metadata.xml b/perl-core/ExtUtils-Install/metadata.xml
index 48d223dd3fa7..ddda957bb781 100644
--- a/perl-core/ExtUtils-Install/metadata.xml
+++ b/perl-core/ExtUtils-Install/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-Install</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Install</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Install::Warn</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Installed</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Packlist</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-MakeMaker/metadata.xml b/perl-core/ExtUtils-MakeMaker/metadata.xml
index a2f68d0dff5a..61cc819ccab5 100644
--- a/perl-core/ExtUtils-MakeMaker/metadata.xml
+++ b/perl-core/ExtUtils-MakeMaker/metadata.xml
@@ -4,5 +4,35 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-MakeMaker</remote-id>
+    <remote-id type="cpan-module">DynaLoader</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Command::MM</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Liblist</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Liblist::Kid</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_AIX</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Any</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_BeOS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Cygwin</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_DOS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Darwin</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_MacOS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_NW5</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_OS2</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_QNX</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_UWIN</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Unix</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_VMS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_VOS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Win32</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MM_Win95</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MY</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MakeMaker</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MakeMaker::Config</remote-id>
+    <remote-id type="cpan-module">ExtUtils::MakeMaker::_version</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Mkbootstrap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Mksymlists</remote-id>
+    <remote-id type="cpan-module">ExtUtils::testlib</remote-id>
+    <remote-id type="cpan-module">MM</remote-id>
+    <remote-id type="cpan-module">MY</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-Manifest/metadata.xml b/perl-core/ExtUtils-Manifest/metadata.xml
index 973a86bcfc08..eba770824586 100644
--- a/perl-core/ExtUtils-Manifest/metadata.xml
+++ b/perl-core/ExtUtils-Manifest/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-Manifest</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Manifest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/ExtUtils-ParseXS/metadata.xml b/perl-core/ExtUtils-ParseXS/metadata.xml
index 26740f8fd857..a3eb67374ae1 100644
--- a/perl-core/ExtUtils-ParseXS/metadata.xml
+++ b/perl-core/ExtUtils-ParseXS/metadata.xml
@@ -4,5 +4,14 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">ExtUtils-ParseXS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::ParseXS</remote-id>
+    <remote-id type="cpan-module">ExtUtils::ParseXS::Constants</remote-id>
+    <remote-id type="cpan-module">ExtUtils::ParseXS::CountLines</remote-id>
+    <remote-id type="cpan-module">ExtUtils::ParseXS::Utilities</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Typemaps</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Typemaps::Cmd</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Typemaps::InputMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Typemaps::OutputMap</remote-id>
+    <remote-id type="cpan-module">ExtUtils::Typemaps::Type</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Path/metadata.xml b/perl-core/File-Path/metadata.xml
index 9b6b2236aaa9..dc337c8bb290 100644
--- a/perl-core/File-Path/metadata.xml
+++ b/perl-core/File-Path/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Path</remote-id>
+    <remote-id type="cpan-module">File::Path</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Spec/metadata.xml b/perl-core/File-Spec/metadata.xml
index 4f3520e4a450..b62bc1a960df 100644
--- a/perl-core/File-Spec/metadata.xml
+++ b/perl-core/File-Spec/metadata.xml
@@ -9,5 +9,15 @@
 	interim.</longdescription>
   <upstream>
     <remote-id type="cpan">PathTools</remote-id>
+    <remote-id type="cpan-module">Cwd</remote-id>
+    <remote-id type="cpan-module">File::Spec</remote-id>
+    <remote-id type="cpan-module">File::Spec::Cygwin</remote-id>
+    <remote-id type="cpan-module">File::Spec::Epoc</remote-id>
+    <remote-id type="cpan-module">File::Spec::Functions</remote-id>
+    <remote-id type="cpan-module">File::Spec::Mac</remote-id>
+    <remote-id type="cpan-module">File::Spec::OS2</remote-id>
+    <remote-id type="cpan-module">File::Spec::Unix</remote-id>
+    <remote-id type="cpan-module">File::Spec::VMS</remote-id>
+    <remote-id type="cpan-module">File::Spec::Win32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/File-Temp/metadata.xml b/perl-core/File-Temp/metadata.xml
index da38534a4a7a..d84a9188238f 100644
--- a/perl-core/File-Temp/metadata.xml
+++ b/perl-core/File-Temp/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">File-Temp</remote-id>
+    <remote-id type="cpan-module">File::Temp</remote-id>
+    <remote-id type="cpan-module">File::Temp::Dir</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Filter/metadata.xml b/perl-core/Filter/metadata.xml
index bd5920569da8..4271e4a413fa 100644
--- a/perl-core/Filter/metadata.xml
+++ b/perl-core/Filter/metadata.xml
@@ -4,5 +4,12 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Filter</remote-id>
+    <remote-id type="cpan-module">Filter::Util::Call</remote-id>
+    <remote-id type="cpan-module">Filter::Util::Exec</remote-id>
+    <remote-id type="cpan-module">Filter::cpp</remote-id>
+    <remote-id type="cpan-module">Filter::decrypt</remote-id>
+    <remote-id type="cpan-module">Filter::exec</remote-id>
+    <remote-id type="cpan-module">Filter::sh</remote-id>
+    <remote-id type="cpan-module">Filter::tee</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Getopt-Long/metadata.xml b/perl-core/Getopt-Long/metadata.xml
index 8d12000f34d3..2a8bb97ea48f 100644
--- a/perl-core/Getopt-Long/metadata.xml
+++ b/perl-core/Getopt-Long/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Getopt-Long</remote-id>
+    <remote-id type="cpan-module">Getopt::Long</remote-id>
+    <remote-id type="cpan-module">Getopt::Long::CallBack</remote-id>
+    <remote-id type="cpan-module">Getopt::Long::Parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO-Compress/metadata.xml b/perl-core/IO-Compress/metadata.xml
index 5a09d5eb4720..a85bae80eb95 100644
--- a/perl-core/IO-Compress/metadata.xml
+++ b/perl-core/IO-Compress/metadata.xml
@@ -4,5 +4,35 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Compress</remote-id>
+    <remote-id type="cpan-module">Compress::Zlib</remote-id>
+    <remote-id type="cpan-module">File::GlobMapper</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Adapter::Bzip2</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Adapter::Deflate</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Adapter::Identity</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Base</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Base::Common</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Bzip2</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Deflate</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Gzip</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Gzip::Constants</remote-id>
+    <remote-id type="cpan-module">IO::Compress::RawDeflate</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Zip</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Zip::Constants</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Zlib::Constants</remote-id>
+    <remote-id type="cpan-module">IO::Compress::Zlib::Extra</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Adapter::Bunzip2</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Adapter::Identity</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Adapter::Inflate</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::AnyInflate</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::AnyUncompress</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Base</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Bunzip2</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Gunzip</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Inflate</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::RawInflate</remote-id>
+    <remote-id type="cpan-module">IO::Uncompress::Unzip</remote-id>
+    <remote-id type="cpan-module">U64</remote-id>
+    <remote-id type="cpan-module">Zlib::OldDeflate</remote-id>
+    <remote-id type="cpan-module">Zlib::OldInflate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO-Zlib/metadata.xml b/perl-core/IO-Zlib/metadata.xml
index b7af0849f8d5..bbac0ab87135 100644
--- a/perl-core/IO-Zlib/metadata.xml
+++ b/perl-core/IO-Zlib/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO-Zlib</remote-id>
+    <remote-id type="cpan-module">IO::Zlib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/IO/metadata.xml b/perl-core/IO/metadata.xml
index 0723c222379d..15d90b0a86ea 100644
--- a/perl-core/IO/metadata.xml
+++ b/perl-core/IO/metadata.xml
@@ -4,5 +4,17 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IO</remote-id>
+    <remote-id type="cpan-module">IO</remote-id>
+    <remote-id type="cpan-module">IO::Dir</remote-id>
+    <remote-id type="cpan-module">IO::File</remote-id>
+    <remote-id type="cpan-module">IO::Handle</remote-id>
+    <remote-id type="cpan-module">IO::Pipe</remote-id>
+    <remote-id type="cpan-module">IO::Pipe::End</remote-id>
+    <remote-id type="cpan-module">IO::Poll</remote-id>
+    <remote-id type="cpan-module">IO::Seekable</remote-id>
+    <remote-id type="cpan-module">IO::Select</remote-id>
+    <remote-id type="cpan-module">IO::Socket</remote-id>
+    <remote-id type="cpan-module">IO::Socket::INET</remote-id>
+    <remote-id type="cpan-module">IO::Socket::UNIX</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/IPC-Cmd/metadata.xml b/perl-core/IPC-Cmd/metadata.xml
index 2d09a8d91212..3aada5a1d476 100644
--- a/perl-core/IPC-Cmd/metadata.xml
+++ b/perl-core/IPC-Cmd/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">IPC-Cmd</remote-id>
+    <remote-id type="cpan-module">IPC::Cmd</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/JSON-PP/metadata.xml b/perl-core/JSON-PP/metadata.xml
index 903ed229ccda..cf3fd43c762b 100644
--- a/perl-core/JSON-PP/metadata.xml
+++ b/perl-core/JSON-PP/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">JSON-PP</remote-id>
+		<remote-id type="cpan-module">JSON::PP</remote-id>
+		<remote-id type="cpan-module">JSON::PP::Boolean</remote-id>
+		<remote-id type="cpan-module">JSON::PP::IncrParser</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/perl-core/Locale-Maketext-Simple/metadata.xml b/perl-core/Locale-Maketext-Simple/metadata.xml
index ad2daee64a18..b8b9b1d90287 100644
--- a/perl-core/Locale-Maketext-Simple/metadata.xml
+++ b/perl-core/Locale-Maketext-Simple/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-Maketext-Simple</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/MIME-Base64/metadata.xml b/perl-core/MIME-Base64/metadata.xml
index b886d6eaa392..c9f79bc24625 100644
--- a/perl-core/MIME-Base64/metadata.xml
+++ b/perl-core/MIME-Base64/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">MIME-Base64</remote-id>
+    <remote-id type="cpan-module">MIME::Base64</remote-id>
+    <remote-id type="cpan-module">MIME::QuotedPrint</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Math-BigInt-FastCalc/metadata.xml b/perl-core/Math-BigInt-FastCalc/metadata.xml
index 7272b97c0589..058e67a9b6c9 100644
--- a/perl-core/Math-BigInt-FastCalc/metadata.xml
+++ b/perl-core/Math-BigInt-FastCalc/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-BigInt-FastCalc</remote-id>
+    <remote-id type="cpan-module">Math::BigInt::FastCalc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Math-BigInt/metadata.xml b/perl-core/Math-BigInt/metadata.xml
index 9161a3df0ac0..62f2a74a972c 100644
--- a/perl-core/Math-BigInt/metadata.xml
+++ b/perl-core/Math-BigInt/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-BigInt</remote-id>
+    <remote-id type="cpan-module">Math::BigFloat</remote-id>
+    <remote-id type="cpan-module">Math::BigInt</remote-id>
+    <remote-id type="cpan-module">Math::BigInt::Calc</remote-id>
+    <remote-id type="cpan-module">Math::BigInt::CalcEmu</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Math-BigRat/metadata.xml b/perl-core/Math-BigRat/metadata.xml
index ece54301763d..685253fd299f 100644
--- a/perl-core/Math-BigRat/metadata.xml
+++ b/perl-core/Math-BigRat/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Math-BigRat</remote-id>
+    <remote-id type="cpan-module">Math::BigRat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Memoize/metadata.xml b/perl-core/Memoize/metadata.xml
index 5d7851158bb5..ea0939c0d36c 100644
--- a/perl-core/Memoize/metadata.xml
+++ b/perl-core/Memoize/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Memoize</remote-id>
+    <remote-id type="cpan-module">Memoize</remote-id>
+    <remote-id type="cpan-module">Memoize::AnyDBM_File</remote-id>
+    <remote-id type="cpan-module">Memoize::Expire</remote-id>
+    <remote-id type="cpan-module">Memoize::ExpireFile</remote-id>
+    <remote-id type="cpan-module">Memoize::ExpireTest</remote-id>
+    <remote-id type="cpan-module">Memoize::NDBM_File</remote-id>
+    <remote-id type="cpan-module">Memoize::SDBM_File</remote-id>
+    <remote-id type="cpan-module">Memoize::Storable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Build/metadata.xml b/perl-core/Module-Build/metadata.xml
index 1dd4bf677fde..526d38762096 100644
--- a/perl-core/Module-Build/metadata.xml
+++ b/perl-core/Module-Build/metadata.xml
@@ -4,5 +4,33 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Build</remote-id>
+    <remote-id type="cpan-module">Module::Build</remote-id>
+    <remote-id type="cpan-module">Module::Build::Base</remote-id>
+    <remote-id type="cpan-module">Module::Build::Compat</remote-id>
+    <remote-id type="cpan-module">Module::Build::Config</remote-id>
+    <remote-id type="cpan-module">Module::Build::Cookbook</remote-id>
+    <remote-id type="cpan-module">Module::Build::Dumper</remote-id>
+    <remote-id type="cpan-module">Module::Build::ModuleInfo</remote-id>
+    <remote-id type="cpan-module">Module::Build::Notes</remote-id>
+    <remote-id type="cpan-module">Module::Build::PPMMaker</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::Amiga</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::Default</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::EBCDIC</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::MPEiX</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::MacOS</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::RiscOS</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::Unix</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::VMS</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::VOS</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::Windows</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::aix</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::cygwin</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::darwin</remote-id>
+    <remote-id type="cpan-module">Module::Build::Platform::os2</remote-id>
+    <remote-id type="cpan-module">Module::Build::PodParser</remote-id>
+    <remote-id type="cpan-module">Module::Build::Version</remote-id>
+    <remote-id type="cpan-module">Module::Build::YAML</remote-id>
+    <remote-id type="cpan-module">inc::latest</remote-id>
+    <remote-id type="cpan-module">inc::latest::private</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-CoreList/metadata.xml b/perl-core/Module-CoreList/metadata.xml
index 89f580ce1991..6815dd09f2e2 100644
--- a/perl-core/Module-CoreList/metadata.xml
+++ b/perl-core/Module-CoreList/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Module-CoreList</remote-id>
+    <remote-id type="cpan-module">Module::CoreList</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Load-Conditional/metadata.xml b/perl-core/Module-Load-Conditional/metadata.xml
index 2f28ebc8ce29..5dace0338d1d 100644
--- a/perl-core/Module-Load-Conditional/metadata.xml
+++ b/perl-core/Module-Load-Conditional/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Load-Conditional</remote-id>
+    <remote-id type="cpan-module">Module::Load::Conditional</remote-id>
+    <remote-id type="cpan-module">Module::Load::Conditional::_version</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Load/metadata.xml b/perl-core/Module-Load/metadata.xml
index 2e368657fbd3..e912af8d51f6 100644
--- a/perl-core/Module-Load/metadata.xml
+++ b/perl-core/Module-Load/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Load</remote-id>
+    <remote-id type="cpan-module">Module::Load</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Loaded/metadata.xml b/perl-core/Module-Loaded/metadata.xml
index a6d01e16bb31..e15571b9b29c 100644
--- a/perl-core/Module-Loaded/metadata.xml
+++ b/perl-core/Module-Loaded/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Loaded</remote-id>
+    <remote-id type="cpan-module">Module::Loaded</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Metadata/metadata.xml b/perl-core/Module-Metadata/metadata.xml
index 8f511a4a47d5..e5c5365a3cd6 100644
--- a/perl-core/Module-Metadata/metadata.xml
+++ b/perl-core/Module-Metadata/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Metadata</remote-id>
+    <remote-id type="cpan-module">Module::Metadata</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Module-Pluggable/metadata.xml b/perl-core/Module-Pluggable/metadata.xml
index 577e7196ee54..5a08a6299f3d 100644
--- a/perl-core/Module-Pluggable/metadata.xml
+++ b/perl-core/Module-Pluggable/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Module-Pluggable</remote-id>
+    <remote-id type="cpan-module">Devel::InnerPackage</remote-id>
+    <remote-id type="cpan-module">Module::Pluggable</remote-id>
+    <remote-id type="cpan-module">Module::Pluggable::Object</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Package-Constants/metadata.xml b/perl-core/Package-Constants/metadata.xml
index d9208c172d74..7b8283033fc1 100644
--- a/perl-core/Package-Constants/metadata.xml
+++ b/perl-core/Package-Constants/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Package-Constants</remote-id>
+    <remote-id type="cpan-module">Package::Constants</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Params-Check/metadata.xml b/perl-core/Params-Check/metadata.xml
index 893cb8d55660..6baa8244a37c 100644
--- a/perl-core/Params-Check/metadata.xml
+++ b/perl-core/Params-Check/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Params-Check</remote-id>
+    <remote-id type="cpan-module">Params::Check</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Parse-CPAN-Meta/metadata.xml b/perl-core/Parse-CPAN-Meta/metadata.xml
index e0a1bd390b7f..9a471a1d4dc0 100644
--- a/perl-core/Parse-CPAN-Meta/metadata.xml
+++ b/perl-core/Parse-CPAN-Meta/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Parse-CPAN-Meta</remote-id>
+    <remote-id type="cpan-module">Parse::CPAN::Meta</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Perl-OSType/metadata.xml b/perl-core/Perl-OSType/metadata.xml
index 7e49a470c6b9..d572bf044573 100644
--- a/perl-core/Perl-OSType/metadata.xml
+++ b/perl-core/Perl-OSType/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Perl-OSType</remote-id>
+    <remote-id type="cpan-module">Perl::OSType</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Pod-Simple/metadata.xml b/perl-core/Pod-Simple/metadata.xml
index 11b4b01e8cef..cfb870fc6af2 100644
--- a/perl-core/Pod-Simple/metadata.xml
+++ b/perl-core/Pod-Simple/metadata.xml
@@ -4,5 +4,33 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-Simple</remote-id>
+    <remote-id type="cpan-module">Pod::Simple</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::BlackBox</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Checker</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Debug</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::DumpAsText</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::DumpAsXML</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::HTML</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::HTMLBatch</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::HTMLLegacy</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::LinkSection</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Methody</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Progress</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::PullParser</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::PullParserEndToken</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::PullParserStartToken</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::PullParserTextToken</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::PullParserToken</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::RTF</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Search</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::SimpleTree</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Text</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::TextContent</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::TiedOutFH</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::Transcode</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::TranscodeDumb</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::TranscodeSmart</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::XHTML</remote-id>
+    <remote-id type="cpan-module">Pod::Simple::XMLOutStream</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/PodParser/metadata.xml b/perl-core/PodParser/metadata.xml
index be4b5fde12d4..7dfe68c90e7c 100644
--- a/perl-core/PodParser/metadata.xml
+++ b/perl-core/PodParser/metadata.xml
@@ -4,5 +4,21 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Pod-Parser</remote-id>
+    <remote-id type="cpan-module">Pod::Cache</remote-id>
+    <remote-id type="cpan-module">Pod::Cache::Item</remote-id>
+    <remote-id type="cpan-module">Pod::Checker</remote-id>
+    <remote-id type="cpan-module">Pod::Find</remote-id>
+    <remote-id type="cpan-module">Pod::Hyperlink</remote-id>
+    <remote-id type="cpan-module">Pod::InputObjects</remote-id>
+    <remote-id type="cpan-module">Pod::InputSource</remote-id>
+    <remote-id type="cpan-module">Pod::InteriorSequence</remote-id>
+    <remote-id type="cpan-module">Pod::List</remote-id>
+    <remote-id type="cpan-module">Pod::Paragraph</remote-id>
+    <remote-id type="cpan-module">Pod::ParseTree</remote-id>
+    <remote-id type="cpan-module">Pod::ParseUtils</remote-id>
+    <remote-id type="cpan-module">Pod::Parser</remote-id>
+    <remote-id type="cpan-module">Pod::PlainText</remote-id>
+    <remote-id type="cpan-module">Pod::Select</remote-id>
+    <remote-id type="cpan-module">Pod::Usage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Safe/metadata.xml b/perl-core/Safe/metadata.xml
index 76a218af7e36..1cdbe0cdf81b 100644
--- a/perl-core/Safe/metadata.xml
+++ b/perl-core/Safe/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Safe</remote-id>
+    <remote-id type="cpan-module">Safe</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Scalar-List-Utils/metadata.xml b/perl-core/Scalar-List-Utils/metadata.xml
index 9f9af3cde0b8..31f81fd15908 100644
--- a/perl-core/Scalar-List-Utils/metadata.xml
+++ b/perl-core/Scalar-List-Utils/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Scalar-List-Utils</remote-id>
+    <remote-id type="cpan-module">List::Util</remote-id>
+    <remote-id type="cpan-module">List::Util::XS</remote-id>
+    <remote-id type="cpan-module">Scalar::Util</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Socket/metadata.xml b/perl-core/Socket/metadata.xml
index d36e8dd2420b..cc9a039a4e8a 100644
--- a/perl-core/Socket/metadata.xml
+++ b/perl-core/Socket/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>perl</herd>
   <upstream>
-    <remote-id type="cpan-module">Socket</remote-id>
     <remote-id type="cpan">Socket</remote-id>
+    <remote-id type="cpan-module">Socket</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Storable/metadata.xml b/perl-core/Storable/metadata.xml
index 4c935d9e5916..178dcc3ea345 100644
--- a/perl-core/Storable/metadata.xml
+++ b/perl-core/Storable/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Storable</remote-id>
+    <remote-id type="cpan-module">Storable</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Switch/metadata.xml b/perl-core/Switch/metadata.xml
index 3315a8185566..43572bee0b13 100644
--- a/perl-core/Switch/metadata.xml
+++ b/perl-core/Switch/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">Switch</remote-id>
+		<remote-id type="cpan-module">Switch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/perl-core/Sys-Syslog/metadata.xml b/perl-core/Sys-Syslog/metadata.xml
index 994434ae78fd..62970526ee14 100644
--- a/perl-core/Sys-Syslog/metadata.xml
+++ b/perl-core/Sys-Syslog/metadata.xml
@@ -8,5 +8,7 @@
 	benefit from the ebuild.</longdescription>
   <upstream>
     <remote-id type="cpan">Sys-Syslog</remote-id>
+    <remote-id type="cpan-module">Sys::Syslog</remote-id>
+    <remote-id type="cpan-module">Sys::Syslog::Win32</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Term-ANSIColor/metadata.xml b/perl-core/Term-ANSIColor/metadata.xml
index 67fa70ef2fc0..018db1eed6fd 100644
--- a/perl-core/Term-ANSIColor/metadata.xml
+++ b/perl-core/Term-ANSIColor/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Term-ANSIColor</remote-id>
+    <remote-id type="cpan-module">Term::ANSIColor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test-Harness/metadata.xml b/perl-core/Test-Harness/metadata.xml
index dd7c10e4e78e..6884ccffc9d9 100644
--- a/perl-core/Test-Harness/metadata.xml
+++ b/perl-core/Test-Harness/metadata.xml
@@ -4,5 +4,53 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Harness</remote-id>
+    <remote-id type="cpan-module">App::Prove</remote-id>
+    <remote-id type="cpan-module">App::Prove::State</remote-id>
+    <remote-id type="cpan-module">App::Prove::State::Result</remote-id>
+    <remote-id type="cpan-module">App::Prove::State::Result::Test</remote-id>
+    <remote-id type="cpan-module">TAP::Base</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Base</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Color</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Console</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Console::ParallelSession</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Console::Session</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::File</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::File::Session</remote-id>
+    <remote-id type="cpan-module">TAP::Formatter::Session</remote-id>
+    <remote-id type="cpan-module">TAP::Harness</remote-id>
+    <remote-id type="cpan-module">TAP::Object</remote-id>
+    <remote-id type="cpan-module">TAP::Parser</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Aggregator</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Grammar</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Iterator</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Iterator::Array</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Iterator::Process</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Iterator::Stream</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::IteratorFactory</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Multiplexer</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Bailout</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Comment</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Plan</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Pragma</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Test</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Unknown</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::Version</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Result::YAML</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::ResultFactory</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Scheduler</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Scheduler::Job</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Scheduler::Spinner</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Source</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler::Executable</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler::File</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler::Handle</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler::Perl</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::SourceHandler::RawTAP</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::Utils</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::YAMLish::Reader</remote-id>
+    <remote-id type="cpan-module">TAP::Parser::YAMLish::Writer</remote-id>
+    <remote-id type="cpan-module">Test::Harness</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test-Simple/metadata.xml b/perl-core/Test-Simple/metadata.xml
index 91d153e11d43..05212b08c752 100644
--- a/perl-core/Test-Simple/metadata.xml
+++ b/perl-core/Test-Simple/metadata.xml
@@ -4,5 +4,13 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test-Simple</remote-id>
+    <remote-id type="cpan-module">Test::Builder</remote-id>
+    <remote-id type="cpan-module">Test::Builder::IO::Scalar</remote-id>
+    <remote-id type="cpan-module">Test::Builder::Module</remote-id>
+    <remote-id type="cpan-module">Test::Builder::Tester</remote-id>
+    <remote-id type="cpan-module">Test::Builder::Tester::Color</remote-id>
+    <remote-id type="cpan-module">Test::Builder::Tester::Tie</remote-id>
+    <remote-id type="cpan-module">Test::More</remote-id>
+    <remote-id type="cpan-module">Test::Simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Test/metadata.xml b/perl-core/Test/metadata.xml
index 351b52ff0447..b96a92398cbf 100644
--- a/perl-core/Test/metadata.xml
+++ b/perl-core/Test/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Test</remote-id>
+    <remote-id type="cpan-module">Test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Text-Balanced/metadata.xml b/perl-core/Text-Balanced/metadata.xml
index e4da9c13e0df..ba1b7d39475a 100644
--- a/perl-core/Text-Balanced/metadata.xml
+++ b/perl-core/Text-Balanced/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Balanced</remote-id>
+    <remote-id type="cpan-module">Text::Balanced</remote-id>
+    <remote-id type="cpan-module">Text::Balanced::ErrorMsg</remote-id>
+    <remote-id type="cpan-module">Text::Balanced::Extractor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Text-ParseWords/Manifest b/perl-core/Text-ParseWords/Manifest
new file mode 100644
index 000000000000..6219202ddbd8
--- /dev/null
+++ b/perl-core/Text-ParseWords/Manifest
@@ -0,0 +1 @@
+DIST Text-ParseWords-3.27.zip 9740 RMD160 0c3344087a5b8fe0270a9d6c8133358bacd5c99e SHA1 12ef6ce2a82cd595a0f50333b8beb9357a5efae2 SHA256 4d4bceae6a957941c758ebd5a47b680f0f8964934b766d13ba2adc3e62b6676d
diff --git a/perl-core/Text-ParseWords/Text-ParseWords-3.270.0.ebuild b/perl-core/Text-ParseWords/Text-ParseWords-3.270.0.ebuild
new file mode 100644
index 000000000000..486171c00ff2
--- /dev/null
+++ b/perl-core/Text-ParseWords/Text-ParseWords-3.270.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/perl-core/Text-ParseWords/Text-ParseWords-3.270.0.ebuild,v 1.2 2012/06/24 06:56:34 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR="CHORNY"
+MODULE_A_EXT="zip"
+MODULE_VERSION=3.27
+
+inherit perl-module
+
+DESCRIPTION="Parse strings containing shell-style quoting"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+SRC_TEST="do"
diff --git a/perl-core/Text-ParseWords/metadata.xml b/perl-core/Text-ParseWords/metadata.xml
new file mode 100644
index 000000000000..d501eaccc5b3
--- /dev/null
+++ b/perl-core/Text-ParseWords/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+	<upstream>
+		<remote-id type="cpan">Text-ParseWords</remote-id>
+		<remote-id type="cpan-module">Text::ParseWords</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/perl-core/Text-Tabs+Wrap/metadata.xml b/perl-core/Text-Tabs+Wrap/metadata.xml
index 0c24f8b8e2c8..a4d24f3b9cd3 100644
--- a/perl-core/Text-Tabs+Wrap/metadata.xml
+++ b/perl-core/Text-Tabs+Wrap/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Text-Tabs+Wrap</remote-id>
+    <remote-id type="cpan-module">Text::Tabs</remote-id>
+    <remote-id type="cpan-module">Text::Wrap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Thread-Queue/metadata.xml b/perl-core/Thread-Queue/metadata.xml
index 3b9a06271b02..43e3ccc4dd16 100644
--- a/perl-core/Thread-Queue/metadata.xml
+++ b/perl-core/Thread-Queue/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Thread-Queue</remote-id>
+    <remote-id type="cpan-module">Thread::Queue</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Thread-Semaphore/metadata.xml b/perl-core/Thread-Semaphore/metadata.xml
index 69908225a9b8..18e937e60ca7 100644
--- a/perl-core/Thread-Semaphore/metadata.xml
+++ b/perl-core/Thread-Semaphore/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Thread-Semaphore</remote-id>
+    <remote-id type="cpan-module">Thread::Semaphore</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-HiRes/metadata.xml b/perl-core/Time-HiRes/metadata.xml
index 13a9a75e8cda..c3abed162a81 100644
--- a/perl-core/Time-HiRes/metadata.xml
+++ b/perl-core/Time-HiRes/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-HiRes</remote-id>
+    <remote-id type="cpan-module">Time::HiRes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-Local/metadata.xml b/perl-core/Time-Local/metadata.xml
index a9c2140ccc23..248e347039b3 100644
--- a/perl-core/Time-Local/metadata.xml
+++ b/perl-core/Time-Local/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Local</remote-id>
+    <remote-id type="cpan-module">Time::Local</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Time-Piece/metadata.xml b/perl-core/Time-Piece/metadata.xml
index 54ad2008003a..119abad94475 100644
--- a/perl-core/Time-Piece/metadata.xml
+++ b/perl-core/Time-Piece/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Time-Piece</remote-id>
+    <remote-id type="cpan-module">Time::Piece</remote-id>
+    <remote-id type="cpan-module">Time::Seconds</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/Version-Requirements/metadata.xml b/perl-core/Version-Requirements/metadata.xml
index f922884fff4d..3212cecaa6f2 100644
--- a/perl-core/Version-Requirements/metadata.xml
+++ b/perl-core/Version-Requirements/metadata.xml
@@ -4,5 +4,6 @@
     <herd>perl</herd>
     <upstream>
         <remote-id type="cpan">Version-Requirements</remote-id>
+        <remote-id type="cpan-module">Version::Requirements</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/perl-core/XSLoader/metadata.xml b/perl-core/XSLoader/metadata.xml
index aca53eaf4966..2b02664cec2f 100644
--- a/perl-core/XSLoader/metadata.xml
+++ b/perl-core/XSLoader/metadata.xml
@@ -4,5 +4,7 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">XSLoader</remote-id>
+    <remote-id type="cpan-module">DynaLoader</remote-id>
+    <remote-id type="cpan-module">XSLoader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/bignum/metadata.xml b/perl-core/bignum/metadata.xml
index 761129085bf8..3a1faa568a42 100644
--- a/perl-core/bignum/metadata.xml
+++ b/perl-core/bignum/metadata.xml
@@ -4,5 +4,10 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">bignum</remote-id>
+    <remote-id type="cpan-module">Math::BigFloat::Trace</remote-id>
+    <remote-id type="cpan-module">Math::BigInt::Trace</remote-id>
+    <remote-id type="cpan-module">bigint</remote-id>
+    <remote-id type="cpan-module">bignum</remote-id>
+    <remote-id type="cpan-module">bigrat</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/digest-base/metadata.xml b/perl-core/digest-base/metadata.xml
index 6d1229e31bf5..15d31f151f4b 100644
--- a/perl-core/digest-base/metadata.xml
+++ b/perl-core/digest-base/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Digest</remote-id>
+    <remote-id type="cpan-module">Digest</remote-id>
+    <remote-id type="cpan-module">Digest::base</remote-id>
+    <remote-id type="cpan-module">Digest::file</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/libnet/metadata.xml b/perl-core/libnet/metadata.xml
index 1890b7b78bd3..84daf2b67a7e 100644
--- a/perl-core/libnet/metadata.xml
+++ b/perl-core/libnet/metadata.xml
@@ -5,5 +5,19 @@
   <longdescription>dev-perl/libnet provides the suite of basic Net:: modules (Net::Cmd, Net::Config, Net::Domain, Net::FTP, Net::NNTP, Net::Netrc, Net::POP3, Net::SMTP, and Net::Time as the key ones)</longdescription>
   <upstream>
     <remote-id type="cpan">libnet</remote-id>
+    <remote-id type="cpan-module">Net::Cmd</remote-id>
+    <remote-id type="cpan-module">Net::Config</remote-id>
+    <remote-id type="cpan-module">Net::Domain</remote-id>
+    <remote-id type="cpan-module">Net::FTP</remote-id>
+    <remote-id type="cpan-module">Net::FTP::A</remote-id>
+    <remote-id type="cpan-module">Net::FTP::E</remote-id>
+    <remote-id type="cpan-module">Net::FTP::I</remote-id>
+    <remote-id type="cpan-module">Net::FTP::L</remote-id>
+    <remote-id type="cpan-module">Net::FTP::dataconn</remote-id>
+    <remote-id type="cpan-module">Net::NNTP</remote-id>
+    <remote-id type="cpan-module">Net::Netrc</remote-id>
+    <remote-id type="cpan-module">Net::POP3</remote-id>
+    <remote-id type="cpan-module">Net::SMTP</remote-id>
+    <remote-id type="cpan-module">Net::Time</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/locale-maketext/metadata.xml b/perl-core/locale-maketext/metadata.xml
index 1c60be9ba90c..e5c58d34c2e4 100644
--- a/perl-core/locale-maketext/metadata.xml
+++ b/perl-core/locale-maketext/metadata.xml
@@ -4,5 +4,8 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Locale-Maketext</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::Guts</remote-id>
+    <remote-id type="cpan-module">Locale::Maketext::GutsLoader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/net-ping/metadata.xml b/perl-core/net-ping/metadata.xml
index 79957d6b9159..92c36869134b 100644
--- a/perl-core/net-ping/metadata.xml
+++ b/perl-core/net-ping/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">Net-Ping</remote-id>
+    <remote-id type="cpan-module">Net::Ping</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/parent/metadata.xml b/perl-core/parent/metadata.xml
index 54b67fe47e86..985c27a24212 100644
--- a/perl-core/parent/metadata.xml
+++ b/perl-core/parent/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">parent</remote-id>
+    <remote-id type="cpan-module">parent</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/podlators/metadata.xml b/perl-core/podlators/metadata.xml
index 3197e204feb6..27deff23298d 100644
--- a/perl-core/podlators/metadata.xml
+++ b/perl-core/podlators/metadata.xml
@@ -4,5 +4,11 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">podlators</remote-id>
+    <remote-id type="cpan-module">Pod::Man</remote-id>
+    <remote-id type="cpan-module">Pod::ParseLink</remote-id>
+    <remote-id type="cpan-module">Pod::Text</remote-id>
+    <remote-id type="cpan-module">Pod::Text::Color</remote-id>
+    <remote-id type="cpan-module">Pod::Text::Overstrike</remote-id>
+    <remote-id type="cpan-module">Pod::Text::Termcap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/threads-shared/metadata.xml b/perl-core/threads-shared/metadata.xml
index f67472b0f3d9..fb8e58c2bc64 100644
--- a/perl-core/threads-shared/metadata.xml
+++ b/perl-core/threads-shared/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">threads-shared</remote-id>
+    <remote-id type="cpan-module">threads::shared</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/threads/metadata.xml b/perl-core/threads/metadata.xml
index 40b433c9c742..fa44d30a033c 100644
--- a/perl-core/threads/metadata.xml
+++ b/perl-core/threads/metadata.xml
@@ -4,5 +4,6 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">threads</remote-id>
+    <remote-id type="cpan-module">threads</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/perl-core/version/metadata.xml b/perl-core/version/metadata.xml
index 933a75042292..78581ae7129e 100644
--- a/perl-core/version/metadata.xml
+++ b/perl-core/version/metadata.xml
@@ -4,5 +4,9 @@
   <herd>perl</herd>
   <upstream>
     <remote-id type="cpan">version</remote-id>
+    <remote-id type="cpan-module">charstar</remote-id>
+    <remote-id type="cpan-module">version</remote-id>
+    <remote-id type="cpan-module">version::vpp</remote-id>
+    <remote-id type="cpan-module">version::vxs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0c793610d9f0..5a48109fd31e 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.105 2012/06/15 04:16:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.106 2012/06/24 16:40:30 flameeyes Exp $
+
+# Diego Elio Pettenò <flameeyes@gentoo.org> (24 Jun 2012)
+# Requires libpcre with jit
+www-apache/mod_security jit
 
 # Ben de Groot <yngwin@gentoo.org> (14 Jun 2012)
 # Since x11-libs/qt-* will no longer be available for sparc, we need
diff --git a/profiles/package.mask b/profiles/package.mask
index 6cb1791e3654..f9eed9896626 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13883 2012/06/22 22:02:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13887 2012/06/24 13:45:32 dilfridge 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,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Huettel <dilfridge@gentoo.org> (25 Jun 2012)
+# Mask live ebuild
+=net-print/cups-9999
+
+# Matti Bickel <mabi@gentoo.org> (24 Jun 2012)
+# Replaced by eGroupware, removal on 23th Jul 2012
+www-apps/phpgroupware
+
 # Doug Goldstein <cardoe@gentoo.org> (21 Jun 2012)
 # A stab at a MythTV 0.25 series ebuild
 =media-tv/mythtv-0.25.1
@@ -349,24 +357,6 @@ x11-terms/cxterm
 # Masked for removal on 20120630
 games-util/nforenum
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2012)
-# The successor of KOffice, Calligra, has now become stable
-# and we are removing KOffice soon from the portage tree.
-# Please upgrade; you can do that with the following commands:
-#  emerge --deselect karbon kexi koffice-data koffice-l10n koffice-libs koffice-meta kplato kpresenter krita kspread kword
-#  emerge app-office/calligra app-office/calligra-l10n
-app-office/karbon
-app-office/kexi
-app-office/koffice-data
-app-office/koffice-l10n
-app-office/koffice-libs
-app-office/koffice-meta
-app-office/kplato
-app-office/kpresenter
-app-office/krita
-app-office/kspread
-app-office/kword
-
 # Markos Chandras <hwoarang@getnoo.org> (27 May 2012)
 # Mask alpha release
 =sci-electronics/qelectrotech-0.30_alpha*
@@ -419,12 +409,6 @@ sys-cluster/lam-mpi
 # Replaced by x11-wm/xpra.
 x11-wm/parti
 
-# Samuli Suominen <ssuominen@gentoo.org> (20 May 2012)
-# Still using vulnerable net-libs/xulrunner wrt bug 412341
-# Build problems wrt bug 390325
-# Version 0.9_beta5 will be removed in approx. 30 days
-~app-text/kiwix-0.9_beta5
-
 # Benda Xu <heroxbd@gentoo.org> (20 May 2012)
 # geant-4.9.5_p01 has a major class declaration change that renders
 # geant-python (g4py upstream) unable to compile
@@ -442,12 +426,6 @@ x11-wm/parti
 # bug #416683
 >=games-board/aisleriot-3.3.1
 
-# Samuli Suominen <ssuominen@gentoo.org> (19 May 2012)
-# Dead project wrt http://bugs.gentoo.org/416613
-# Use app-arch/hardlink or app-arch/hardlink-fedora instead
-# Removal in 30 days
-app-arch/hardlink++
-
 # Maciej Mrozowski <reavertm@gentoo.org> (18 May 2012)
 # Masked for testing, luatex compilation fails due to API change.
 =app-text/poppler-0.20.0
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
index 4c83e4e2b815..4debdc21cc18 100644
--- a/profiles/updates/2Q-2012
+++ b/profiles/updates/2Q-2012
@@ -20,3 +20,4 @@ move media-video/leechcraft-lmp media-sound/leechcraft-lmp
 move x11-themes/gtk-engines-nimbus x11-themes/nimbus
 move media-gfx/iscan-plugin-gt-s80 media-gfx/esci-interpreter-gt-s80
 move x11-libs/libPropList x11-libs/libproplist
+move dev-perl/Text-ParseWords perl-core/Text-ParseWords
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 792814d3e8ba..e930f0a633cc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -749,6 +749,7 @@ app-office/calligra:marble - Enable displaying of maps using Marble
 app-office/calligra:mso - Enable support for various MS Office TM file formats
 app-office/calligra:okular - Enable bindings for kde-base/okular
 app-office/calligra:openctl - Enable support for transformation algorithms via media-libs/opengtl
+app-office/calligra:opengtl - Enable support for transformation algorithms via media-libs/opengtl
 app-office/calligra:word-perfect - Enable support for various WordPerfect file formats
 app-office/calligra:xbase - Enable support for xbase compatible database formats
 app-office/calligra:xslt - Enable xslt and exslt support format support
@@ -760,18 +761,8 @@ app-office/gnucash:webkit - Use net-libs/webkit-gtk for rendering rather than gn
 app-office/gnumeric:perl - Enable perl plugin loader.
 app-office/gnumeric:python - Enable python plugin loader.
 app-office/imposter:iksemel - Enable external dev-libs/iksemel parsing support
-app-office/karbon:pstoedit - Build support for PDF and PS import.
-app-office/karbon:wpg - Build wordperfect image support.
-app-office/kexi:reports - Enable the reports koffice module in kchart, also used by kplato and kexi
-app-office/kexi:xbase - Build support for xbase db types.
 app-office/kmymoney:hbci - Enable HBCI support using net-libs/aqbanking
 app-office/kmymoney:quotes - Enable Online Stock Quote retrieval
-app-office/koffice-libs:reports - Enable the reports koffice module in kchart, also used by kplato and kexi
-app-office/koffice-meta:reports - Enable the reports koffice module in kchart, also used by kplato and kexi
-app-office/krita:gmm - Enable library for sparse, dense and skyline matrices.
-app-office/krita:kdcraw - Enable KDE image manipulating interface.
-app-office/kspread:solver - Use solver extension for solving lingebra and others.
-app-office/kword:wpd - Build wordperfect document support.
 app-office/libreoffice:binfilter - Enable support for legacy StarOffice 5.x and earlier file formats
 app-office/libreoffice:binfilterdebug - Generate debug info for binfilter code (not recommended, huge files result)
 app-office/libreoffice:graphite - Enable support for non-Roman fonts via media-gfx/graphite2
@@ -3858,11 +3849,12 @@ net-irc/charybdis:largenet - Enable support/tweaks for large networks
 net-irc/epic5:archive - Use app-arch/libarchive to use zip and tar archives from scripts.
 net-irc/epic5:valgrind - Compile against dev-util/valgrind headers to improve memory-leak checking when running epic5 under valgrind.
 net-irc/ezbounce:boost - Compile against dev-libs/boost libraries
+net-irc/inspircd:geoip - Add geoip support for country and city lookup based on IPs
 net-irc/inspircd:gnutls - Enable TLS support
 net-irc/inspircd:ipv6 - Enable support for IP version 6
 net-irc/inspircd:ldap - Enable LDAP support
 net-irc/inspircd:mysql - Enable MySQL database backend
-net-irc/inspircd:openssl - Enable SSL support
+net-irc/inspircd:openssl - Enable SSL support (obsolete)
 net-irc/inspircd:postgres - Enable PostgreSQL database backend
 net-irc/inspircd:sqlite - Enable Sqlite database backend
 net-irc/inspircd:ssl - Enable SSL support
@@ -5399,8 +5391,7 @@ www-apache/mod_extract_forwarded:mod_proxy - Enable support for Apache's interna
 www-apache/mod_nss:ecc - enable Elliptical Curve Cyptography
 www-apache/mod_security:curl - Build the ModSecurity Audit Log Collector (mlogc) that depends on net-misc/curl.
 www-apache/mod_security:geoip - Configure ModSecurity to query the GeoIP database from MaxMind, provided by dev-libs/geoip. This flag only controls the default configuration, as the GeoIP query code is part of ModSecurity's source code.
-www-apache/mod_security:perl - Add a dependency upon Perl and install the script to update the Core Rule Set. Please note that this script will use the original Core Rule Set, and it's currently mostly untested.
-www-apache/mod_security:vanilla - Provide the original ModSecurity Core Rule Set without Gentoo-specific relaxation. When this flag is enabled, we install the unadulterated Core Rule Set. Warning! The original Core Rule Set is draconic and most likely will break your web applications, including Rails-based web applications and Bugzilla.
+www-apache/mod_security:jit - Add support for the PCRE Just-in-Time optimisation, as enabled by dev-libs/libpcre with jit USE flag enabled. Might not be available on hardened systems.
 www-apache/mod_suphp:checkpath - Check if script resides in DOCUMENT_ROOT
 www-apache/mod_suphp:mode-force - Run scripts with UID/GID specified in Apache configuration
 www-apache/mod_suphp:mode-owner - Run scripts with owner UID/GID
diff --git a/sci-biology/mira/mira-3.2.1.ebuild b/sci-biology/mira/mira-3.2.1.ebuild
index cd93a08bbd5b..df573f844f01 100644
--- a/sci-biology/mira/mira-3.2.1.ebuild
+++ b/sci-biology/mira/mira-3.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/mira/mira-3.2.1.ebuild,v 1.2 2012/06/23 11:17:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.2.1.ebuild,v 1.3 2012/06/24 10:37:43 ago Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/mira-assembler/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 CDEPEND=">=dev-libs/boost-1.41.0-r3
 	dev-util/google-perftools"
diff --git a/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch b/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
new file mode 100644
index 000000000000..41ddf01df5f8
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
@@ -0,0 +1,54 @@
+ CMakeLists.txt                        |   12 ++++++------
+ libmolsketch/src/stereocenteritem.cpp |    2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4b5d29..f472b40 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,10 +12,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ # compiler issues are fixed and more warnings are issued. #
+ ###########################################################
+ if (CMAKE_COMPILER_IS_GNUCXX)
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
++#   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
++#   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
++#   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
++#   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align") 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-check-new -fno-common")
+@@ -32,7 +32,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build;/.git")
+ include(CPack)
+ 
+ # Unit testing, mainly useful for developers and so defaults to off
+-option(ENABLE_TESTS "Enable unit testing" ON)
++option(ENABLE_TESTS "Enable unit testing" OFF)
+ if(ENABLE_TESTS)
+   set(QT_USE_QTTEST TRUE)
+   enable_testing()
+@@ -48,7 +48,7 @@ configure_file("${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
+ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ 
+ # Enabling debugging symbols
+-set(CMAKE_BUILD_TYPE Debug)
++# set(CMAKE_BUILD_TYPE Debug)
+ 
+ # Enabling shared libraries
+ set(BUILD_SHARED_LIBS OFF)
+diff --git a/libmolsketch/src/stereocenteritem.cpp b/libmolsketch/src/stereocenteritem.cpp
+index 44a8015..20f2a4a 100644
+--- a/libmolsketch/src/stereocenteritem.cpp
++++ b/libmolsketch/src/stereocenteritem.cpp
+@@ -63,7 +63,7 @@ namespace Molsketch {
+     graphsym.GetSymmetry(symmetry_classes);
+ 
+     //std::vector<unsigned long> atomIds = FindTetrahedralAtoms(obmol, symmetry_classes);
+-    std::vector<OpenBabel::StereogenicUnit> units = FindStereogenicUnits(obmol, symmetry_classes);
++    OpenBabel::OBStereoUnitSet units = FindStereogenicUnits(obmol, symmetry_classes);
+     
+     for (unsigned int i = 0; i < units.size(); ++i) {
+       if (units.at(i).type == OpenBabel::OBStereo::Tetrahedral) {
diff --git a/sci-chemistry/molsketch/metadata.xml b/sci-chemistry/molsketch/metadata.xml
index 26890e8db91c..1439f1205607 100644
--- a/sci-chemistry/molsketch/metadata.xml
+++ b/sci-chemistry/molsketch/metadata.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-	<email>jlec@gentoo.org</email>
-	<description>Tree Proxy for Max</description>
-</maintainer>
-<maintainer>
-	<email>max-braeu@gmx.de</email>
-	<description></description>
-</maintainer>
-<longdescription lang="en">
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 	Molsketch is a 2D molecular editing tool. Its goal is to help you draw 
 	molecules quick and easily. Of course you're creation can be exported 
 	afterwards in high quality in a number of vector and bitmap formats. 
diff --git a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
index 6d39a1d2022a..f222c647e645 100644
--- a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.2.0-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/molsketch/molsketch-0.2.0-r1.ebuild,v 1.2 2011/03/26 22:26:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild,v 1.3 2012/06/24 08:13:25 jlec Exp $
 
 EAPI=3
 
@@ -28,11 +28,16 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-openbabel-231.patch
+	)
+
 src_prepare() {
 	sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \
 		-i libmolsketch/src/CMakeLists.txt || die #351246
 	sed -e "s:doc/molsketch:doc/${PF}:g" \
 		-i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die
+	base_src_prepare
 }
 
 src_configure() {
diff --git a/sci-chemistry/pdb-extract/Manifest b/sci-chemistry/pdb-extract/Manifest
index db9d651f4f31..328a586d96cd 100644
--- a/sci-chemistry/pdb-extract/Manifest
+++ b/sci-chemistry/pdb-extract/Manifest
@@ -1 +1,2 @@
 DIST pdb-extract-v3.004-prod-src.tar.gz 942450 RMD160 3d5d46e668a52109678fdf59afbe664dac1643f9 SHA1 7b5d7ce200d33e68fa352cd3658e382bc37e9768 SHA256 58bef2aba4869cdd16a79ddc588da5596a2ccd1f5c925f300b63b6d8299bb953
+DIST pdb-extract-v3.11-prod-src.tar.gz 1016140 RMD160 8845b8ec69b398c22fc398df34d056ed11c1f085 SHA1 4fb471068c220cbae9cbf0a8116fcb288c28b36b SHA256 cc56ab58e4b4f0914dcd61834cae673ade5b12688861ea5f0197a33f5939d131
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch
new file mode 100644
index 000000000000..7383811b5bfd
--- /dev/null
+++ b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch
@@ -0,0 +1,207 @@
+ Makefile                  |    2 +-
+ etc/make.platform.darwin3 |    4 ++--
+ etc/make.platform.darwin4 |    4 ++--
+ etc/make.platform.gnu3    |   20 +++++++++++---------
+ etc/make.platform.gnu4    |   20 +++++++++++---------
+ 5 files changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 627d256..72c7e59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ compile:
+ 		echo "------------------------------------------------------------"; \
+ 		echo "**** Making $$libdir ****"; \
+ 		echo "------------------------------------------------------------"; \
+-		(cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
++		(cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \
+ 	done
+ 
+ beta:
+diff --git a/etc/make.platform.darwin3 b/etc/make.platform.darwin3
+index c5f7b06..4c1c97c 100644
+--- a/etc/make.platform.darwin3
++++ b/etc/make.platform.darwin3
+@@ -91,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
+ DEFINES=$(GDEFINES) $(LDEFINES)
+ 
+ ## Global include directories
+-GINCLUDES= 
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
+ 
+ # Collect all include directories from global include directories and
+ # include directories specified in module makefile
+@@ -159,7 +159,7 @@ F77LIBS=
+ STATIC_LINKING=
+ 
+ # Linker flags
+-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
++LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
+ 
+ # Fortran linker
+ F77_LINKER=f77
+diff --git a/etc/make.platform.darwin4 b/etc/make.platform.darwin4
+index 4619b34..f481fdb 100644
+--- a/etc/make.platform.darwin4
++++ b/etc/make.platform.darwin4
+@@ -92,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
+ DEFINES=$(GDEFINES) $(LDEFINES)
+ 
+ ## Global include directories
+-GINCLUDES= 
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
+ 
+ # Collect all include directories from global include directories and
+ # include directories specified in module makefile
+@@ -160,7 +160,7 @@ F77LIBS=
+ STATIC_LINKING=
+ 
+ # Linker flags
+-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
++LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
+ 
+ # Fortran linker
+ F77_LINKER=f77
+diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3
+index 7fd442e..9bec4dc 100644
+--- a/etc/make.platform.gnu3
++++ b/etc/make.platform.gnu3
+@@ -6,6 +6,8 @@
+ ##
+ ##########################################################################
+ 
++LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
++
+ #-----Lexer and Parser section-------------------------------------------#
+ 
+ # Lexer executable
+@@ -89,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
+ DEFINES=$(GDEFINES) $(LDEFINES)
+ 
+ ## Global include directories
+-GINCLUDES= 
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
+ 
+ # Collect all include directories from global include directories and
+ # include directories specified in module makefile
+@@ -107,8 +109,8 @@ NON_ANSI_C_FLAG=
+ C_WARNINGS=$(WARNINGS)
+ 
+ # C compiler flags
+-CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+-CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
++CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
++CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
+                $(INCLUDES) 
+ 
+ ## C++ compiler
+@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
+ EXT=C
+ 
+ # C++ compiler flags
+-C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
++C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
+         $(INCLUDES)
+-C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
++C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+                  $(DEFINES) $(INCLUDES)
+ # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
+ # source code that is not maintained by PDB
+@@ -144,7 +146,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
+ F77=f77
+ 
+ # Fortran compiler flags
+-FFLAGS=-O -u
++FFLAGS=$(F_OPT)
+ 
+ # Additional Fortran libraries
+ F77LIBS=
+@@ -154,11 +156,11 @@ F77LIBS=
+ #-----Linkers section----------------------------------------------------#
+ 
+ # Static linking option. If not defined, dynamic linking is used.
+-STATIC_LINKING=-static
++STATIC_LINKING= 
+ 
+ # Linker flags
+-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
+-LDFLAGS_NO_STATIC=$(ABI) -w
++LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
++LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
+ 
+ # Fortran linker
+ F77_LINKER=f77
+diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4
+index 78a0007..bc85308 100644
+--- a/etc/make.platform.gnu4
++++ b/etc/make.platform.gnu4
+@@ -6,6 +6,8 @@
+ ##
+ ##########################################################################
+ 
++LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
++
+ #-----Lexer and Parser section-------------------------------------------#
+ 
+ # Lexer executable
+@@ -34,7 +36,7 @@ ABI=
+ 
+ # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all
+ # warnings as errors.
+-WARNINGS_AS_ERRORS=-Werror
++WARNINGS_AS_ERRORS=
+ 
+ # ALL_WARNINGS defines flags to instruct all compilers to report all
+ # warnings.
+@@ -90,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
+ DEFINES=$(GDEFINES) $(LDEFINES)
+ 
+ ## Global include directories
+-GINCLUDES= 
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
+ 
+ # Collect all include directories from global include directories and
+ # include directories specified in module makefile
+@@ -108,8 +110,8 @@ NON_ANSI_C_FLAG=
+ C_WARNINGS=$(WARNINGS)
+ 
+ # C compiler flags
+-CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+-CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) 
++CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
++CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES) 
+ 
+ ## C++ compiler
+ ## This part defines C++ compiler information
+@@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
+ EXT=C
+ 
+ # C++ compiler flags
+-C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
++C++FLAGS=$(CCC_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+   $(DEFINES) $(INCLUDES)
+-C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
++C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
+   $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES)
+ 
+ # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
+@@ -145,7 +147,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
+ F77=f77
+ 
+ # Fortran compiler flags
+-FFLAGS=-O -u
++FFLAGS=$(F_OPT)
+ 
+ # Additional Fortran libraries
+ F77LIBS=
+@@ -158,8 +160,8 @@ F77LIBS=
+ STATIC_LINKING=
+ 
+ # Linker flags
+-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
+-LDFLAGS_NO_STATIC=$(ABI) -w
++LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
++LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
+ 
+ # Fortran linker
+ F77_LINKER=f77
diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
new file mode 100644
index 000000000000..5284bd745d53
--- /dev/null
+++ b/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
@@ -0,0 +1,64 @@
+ common-v4.5/src/mapped_ptr_vector.C |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
+index d7c61f3..e20a236 100644
+--- a/common-v4.5/src/mapped_ptr_vector.C
++++ b/common-v4.5/src/mapped_ptr_vector.C
+@@ -263,12 +263,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
+     _vector.push_back(inP);
+ 
+     typename tIndex::value_type valuePair(inP->GetName(),
+-      make_pair(_vector.size() - 1, fileIndex));
++      std::make_pair(_vector.size() - 1, fileIndex));
+ 
+     _index.insert(valuePair);
+ 
+     _currentName = inP->GetName();
+-    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
++    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
+ 
+ }
+ 
+@@ -281,12 +281,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
+     _vector.push_back(NULL);
+ 
+     typename tIndex::value_type valuePair(name,
+-      make_pair(_vector.size() - 1, fileIndex));
++      std::make_pair(_vector.size() - 1, fileIndex));
+ 
+     _index.insert(valuePair);
+ 
+     _currentName = name;
+-    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
++    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
+ }
+ 
+ 
+@@ -454,7 +454,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
+     if (is_equal(_currentName, name, keyComp))
+     {
+         _currentName.clear();
+-        _currentIndices = make_pair(_vector.size(), (unsigned int)0);
++        _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
+     }
+ 
+ }
+@@ -539,7 +539,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
+     if (_vector.empty())
+     {
+         // Empty container. Return invalid index.
+-        return(make_pair(_vector.size(), (unsigned int)0));
++        return(std::make_pair(_vector.size(), (unsigned int)0));
+     }
+ 
+     typename tIndex::key_compare keyComp = _index.key_comp();
+@@ -563,7 +563,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
+         else
+         {
+             // Not found. Return invalid index.
+-            return(make_pair(_vector.size(), (unsigned int)0));
++            return(std::make_pair(_vector.size(), (unsigned int)0));
+         } 
+     }
+     
diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild
new file mode 100644
index 000000000000..48ee2c1ed3f2
--- /dev/null
+++ b/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-3.11.ebuild,v 1.1 2012/06/23 18:57:05 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib prefix
+
+MY_P="${PN}-v${PV}-prod-src"
+
+DESCRIPTION="Tools for extracting mmCIF data from structure determination applications"
+HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html"
+SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz"
+
+LICENSE="PDB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!<app-text/html-xml-utils-5.3"
+DEPEND="${RDEPEND}
+	>=sci-libs/cifparse-obj-7.025"
+
+S="${WORKDIR}/${MY_P}"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-cflags-install.patch \
+		"${FILESDIR}"/${P}-gcc-4.7.patch \
+		"${FILESDIR}"/${PN}-3.004-env.patch
+
+	sed -i \
+		-e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
+		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \
+		-e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \
+		-e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+		"${S}"/etc/make.* \
+		|| die "Failed to fix makefiles"
+
+	eprefixify pdb-extract-v3.0/Makefile etc/*
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin
+	doexe bin/pdb_extract{,_sf} bin/extract
+	insinto /usr/include/rcsb
+	doins include/*
+	dodoc README*
+	insinto /usr/share/rcsb/
+	doins -r pdb-extract-data
+
+	cat >> "${T}"/envd <<- EOF
+	PDB_EXTRACT="${EPREFIX}/usr/share/rcsb/"
+	PDB_EXTRACT_ROOT="${EPREFIX}/usr/"
+	EOF
+
+	newenvd "${T}"/envd 20pdb-extract
+}
diff --git a/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch b/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch
new file mode 100644
index 000000000000..c73fb9f0d809
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch
@@ -0,0 +1,16 @@
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 51e1722..5275025 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,8 @@ AC_CONFIG_HEADER([src/include/ngspice/config.h])
+ dnl Initialise automake stuff
+ AM_INIT_AUTOMAKE([-Wall -Werror nostdinc])
+ 
++AM_PROG_AR
++
+ AC_SUBST([AM_CPPFLAGS],['-I. -I$(srcdir) -I$(top_builddir)/src/include'])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index 97cd3908e320..9725005c2320 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/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-electronics</herd>
-  <longdescription>
+	<herd>sci-electronics</herd>
+	<longdescription>
   Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on
   three open source software packages: Spice3f5, Cider1b1 and Xspice.
   </longdescription>
diff --git a/sci-electronics/ngspice/ngspice-24.ebuild b/sci-electronics/ngspice/ngspice-24.ebuild
index 4409a03b6ae3..b9d0959c068a 100644
--- a/sci-electronics/ngspice/ngspice-24.ebuild
+++ b/sci-electronics/ngspice/ngspice-24.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-electronics/ngspice/ngspice-24.ebuild,v 1.1 2012/05/23 18:43:02 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ngspice-24.ebuild,v 1.2 2012/06/24 08:55:11 jlec Exp $
 
 EAPI="3"
 
@@ -27,6 +27,7 @@ RDEPEND="$DEPEND"
 src_prepare() {
 	sed -e 's/_CFLAGS -O2/_CFLAGS/' -i configure.ac || die "sed failed"
 	sed -e 's/LDFLAGS =/LDFLAGS +=/' -i src/xspice/icm/makedefs.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-automake-1.12.patch
 	eautoreconf
 }
 
diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch
new file mode 100644
index 000000000000..633c9d50cf94
--- /dev/null
+++ b/sci-libs/libcmatrix/files/3.2.1-gcc4.7.patch
@@ -0,0 +1,227 @@
+ include/MultiMatrix.h    |   14 +++++++-------
+ include/UnionHolder.h    |   40 ++++++++++++++++++++--------------------
+ include/basedefs.h       |   22 ++++++++++++----------
+ utils/Fork_controller.cc |    3 +++
+ utils/ttyio.cc           |    2 ++
+ 5 files changed, 44 insertions(+), 37 deletions(-)
+
+diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h
+index b6fec33..2d54db5 100755
+--- a/include/MultiMatrix.h
++++ b/include/MultiMatrix.h
+@@ -254,19 +254,19 @@ namespace libcmatrix {
+     }
+ 
+     size_t operator()(size_t r) const
+-    { check_bounds_open(dim,r);
++    { this->check_bounds_open(dim,r);
+       return r*mults[0]; }
+ 
+     size_t operator()(size_t r,size_t s) const
+-    { check_bounds_open(dim,r,s);
++    { this->check_bounds_open(dim,r,s);
+       return r*mults[0]+s*mults[1]; }
+ 
+     size_t operator()(size_t r,size_t s,size_t t) const
+-    { check_bounds_open(dim,r,s,t); 
++    { this->check_bounds_open(dim,r,s,t); 
+       return r*mults[0]+s*mults[1]+t*mults[2]; }
+ 
+     size_t operator()(size_t r,size_t s,size_t t,size_t u) const
+-    { check_bounds_open(dim,r,s,t,u);
++    { this->check_bounds_open(dim,r,s,t,u);
+       return r*mults[0]+s*mults[1]+t*mults[2]+u*mults[3]; }
+     
+     size_t index(size_t r) const
+@@ -293,14 +293,14 @@ namespace libcmatrix {
+ 
+     void reverse(size_t& r, size_t& s, size_t ind) const {
+       LCM_STATIC_CHECK(N==2, Indexer_non2D_object);
+-      check(ind<size(),"Indexer::reverse");
++      this->check(ind<size(),"Indexer::reverse");
+       r=ind / mults[0];
+       s=ind-r*mults[0];
+     }
+ 
+     void reverse(size_t& r, size_t& s, size_t& t, size_t ind) const {
+       LCM_STATIC_CHECK(N==3, Indexer_non3D_object);
+-      check(ind<size(),"Indexer::reverse");
++      this->check(ind<size(),"Indexer::reverse");
+       r=ind / mults[0];
+       ind-=r*mults[0];
+       s=ind / mults[1];
+@@ -309,7 +309,7 @@ namespace libcmatrix {
+ 
+     void reverse(size_t& r, size_t& s, size_t& t, size_t& u, size_t ind) const {
+       LCM_STATIC_CHECK(N==4, Indexer_non4D_object);
+-      check(ind<size(),"Indexer::reverse");
++      this->check(ind<size(),"Indexer::reverse");
+       r=ind / mults[0];
+       ind-=r*mults[0];
+       s=ind / mults[1];
+diff --git a/include/UnionHolder.h b/include/UnionHolder.h
+index f447501..3157330 100755
+--- a/include/UnionHolder.h
++++ b/include/UnionHolder.h
+@@ -359,21 +359,21 @@ namespace libcmatrix {
+     //! overrides ::clear method from ::CommonHolder
+     void clear() {
+       switch (type_) {
+-      case 1: clear_(first_); break;
+-      case 2: clear_(second_); break;
+-      case 3: clear_(third_); break;
+-      case 4: clear_(fourth_); break;
+-      case 5: clear_(fifth_); break;
+-      case 6: clear_(sixth_); break;
+-      case 7: clear_(seventh_); break;
+-      case 8: clear_(eighth_); break;
+-      case 9: clear_(nineth_); break;
++      case 1: this->clear_(first_); break;
++      case 2: this->clear_(second_); break;
++      case 3: this->clear_(third_); break;
++      case 4: this->clear_(fourth_); break;
++      case 5: this->clear_(fifth_); break;
++      case 6: this->clear_(sixth_); break;
++      case 7: this->clear_(seventh_); break;
++      case 8: this->clear_(eighth_); break;
++      case 9: this->clear_(nineth_); break;
+       }
+       type_=0;
+     }
+ 
+     template<class T> UnionHolder& operator= (const T& v) {
+-      get(Type2Type<T>())=v;
++      this->get(Type2Type<T>())=v;
+       type(Type2Type<T>()); //only change type if assignment was successful
+       return *this;
+     }
+@@ -399,12 +399,12 @@ namespace libcmatrix {
+ 
+     template<class T> T& set(Type2Type<T> in) {
+       type(in);
+-      return get(in);
++      return this->get(in);
+     }
+ 
+     template<int M> typename reverse<M>::type& set(Int2Type<M> in) {
+       type(in);
+-      return get(Type2Type<typename reverse<M>::type>());
++      return this->get(Type2Type<typename reverse<M>::type>());
+     }
+ 
+     template<class T> T& operator()(Type2Type<T> in) {
+@@ -429,12 +429,12 @@ namespace libcmatrix {
+ 
+     template<int M> typename reverse<M>::type& operator()(Int2Type<M> in) {
+       verify(in);
+-      return get(Type2Type<typename reverse<M>::type>());
++      return this->get(Type2Type<typename reverse<M>::type>());
+     }
+ 
+     template<int M> const typename reverse<M>::type& operator()(Int2Type<M> in) const {
+       verify(in);
+-      return get(Type2Type<typename reverse<M>::type>());
++      return this->get(Type2Type<typename reverse<M>::type>());
+     }
+   };
+   
+@@ -482,12 +482,12 @@ namespace libcmatrix {
+     bool iscomplex() const { return (this->type()==COMPLEX); }
+     bool isreal() const { return (this->type()==REAL); }
+     
+-    C& set_complex() { return set(Int2Type<COMPLEX>()); }
+-    R& set_real() { return set(Int2Type<REAL>()); }
+-    const C& get_complex() const { return get(Type2Type<C>()); }
+-    const R& get_real() const { return get(Type2Type<R>()); }
+-    C& get_complex() { return get(Type2Type<C>()); }
+-    R& get_real() { return get(Type2Type<R>()); }
++    C& set_complex() { return this->set(Int2Type<COMPLEX>()); }
++    R& set_real() { return this->set(Int2Type<REAL>()); }
++    const C& get_complex() const { return this->get(Type2Type<C>()); }
++    const R& get_real() const { return this->get(Type2Type<R>()); }
++    C& get_complex() { return this->get(Type2Type<C>()); }
++    R& get_real() { return this->get(Type2Type<R>()); }
+   };
+ 
+ } //namespace libcmatrix
+diff --git a/include/basedefs.h b/include/basedefs.h
+index 420b341..80d47e3 100755
+--- a/include/basedefs.h
++++ b/include/basedefs.h
+@@ -13,6 +13,8 @@
+ #include <functional>
+ #include <iterator>
+ #include <algorithm>
++#include <math.h>
++//#include "BlockedMatrix.h"
+ //#include <complex>
+ 
+ // #ifdef LCM_DEBUG_ALLOCATOR
+@@ -1703,6 +1705,16 @@ template<size_t N> struct Multiply_<N,N,0> {
+   }
+ };
+ 
++template<size_t,size_t,size_t> struct Mla_ {
++  template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) {
++    LCM_STATIC_ERROR( mla_incompatible_dimensionalities );
++  }
++};
++
++template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) {
++  Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
++}
++
+ template<> struct Multiply_<2,2,2> {
+   template<class T1,class T2,class T3> static void func(T1& dest,const T2& a,const T3& b)
+   {
+@@ -1875,12 +1887,6 @@ template<> struct Multiply_<0,0,0> {
+    Multiply_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
+  }
+ 
+-template<size_t,size_t,size_t> struct Mla_ {
+-  template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) {
+-    LCM_STATIC_ERROR( mla_incompatible_dimensionalities );
+-  }
+-};
+-
+ template<size_t N> struct Mla_<N,0,N> {
+   template<class T1,class T2,class T3> LCM_INLINE static void func(T1& d, const T2& a, const T3& b) {
+     if (d.empty())
+@@ -1940,10 +1946,6 @@ template<> struct Mla_<0,0,0> {
+   }
+ };
+ 
+-template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) {
+-  Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b);
+-}
+-
+ template<class T,size_t N> struct Print_ {
+   static void print(const T& a,std::ostream& ostr) {
+     ostr << '[';
+diff --git a/utils/Fork_controller.cc b/utils/Fork_controller.cc
+index 5f6b913..08ec942 100755
+--- a/utils/Fork_controller.cc
++++ b/utils/Fork_controller.cc
+@@ -3,6 +3,9 @@
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <cstdio>
++#include <sys/types.h>
++#include <unistd.h>
++
+ 
+ namespace libcmatrix {
+ 
+diff --git a/utils/ttyio.cc b/utils/ttyio.cc
+index 17e4eb3..bbeac81 100755
+--- a/utils/ttyio.cc
++++ b/utils/ttyio.cc
+@@ -17,6 +17,8 @@
+ #include "args_iter.h"
+ #endif
+ 
++#include <unistd.h>
++
+ namespace libcmatrix {
+ 
+   namespace {
diff --git a/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild b/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild
index af66637eb1e6..c86f94135834 100644
--- a/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild
+++ b/sci-libs/libcmatrix/libcmatrix-3.9.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/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild,v 1.2 2012/05/04 09:03:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.9.0.ebuild,v 1.3 2012/06/24 07:43:11 jlec Exp $
 
 EAPI="3"
 
@@ -31,6 +31,7 @@ src_prepare() {
 		"${FILESDIR}"/3.2.1-minuit2.patch \
 		"${FILESDIR}"/3.2.1-gcc4.4.patch \
 		"${FILESDIR}"/3.2.1-gcc4.6.patch \
+		"${FILESDIR}"/3.2.1-gcc4.7.patch \
 		"${FILESDIR}"/${PV}-atlas.patch
 	eautoreconf
 }
diff --git a/sci-libs/superlu/superlu-4.3.ebuild b/sci-libs/superlu/superlu-4.3.ebuild
index b577f4ffb48b..a70404b3b78a 100644
--- a/sci-libs/superlu/superlu-4.3.ebuild
+++ b/sci-libs/superlu/superlu-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/sci-libs/superlu/superlu-4.3.ebuild,v 1.3 2012/05/04 08:22:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.4 2012/06/24 08:28:25 jlec Exp $
 
 EAPI=4
 
@@ -30,6 +30,10 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
+pkg_setup() {
+	unset VERBOSE
+}
+
 src_configure() {
 	local myeconfargs=( --with-blas="$(pkg-config --libs blas)" )
 	autotools-utils_src_configure
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dc55bf48dd5f..20fc803b7dd0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,13 @@
 DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4ecce9e SHA1 11322e216b6d6a2f753f45a150c3f618e4bf0c45 SHA256 b50cdbb4ececba27cddfe24d63517c73a32b905bcf3b7d55b692f6661247590e
 DIST portage-2.1.10.65.tar.bz2 826100 RMD160 b3481229954b67d73c027d5e8ca0398e71836033 SHA1 0ec3daf9aa4909939a2c840a570a42add7bea369 SHA256 aaeba4789b05864e8ca142752dc31c017d47976332394c1bf533aba6b3748f8c
-DIST portage-2.1.11.tar.bz2 835967 RMD160 672112a8395ebda901fc34623d19f94bf8a9e4be SHA1 14fcec742720f4bd52fda94c0e4781ad591cb9e5 SHA256 a8f98db61899f88e398c91e2d0301069d884712d5d5a644271ca393d65f81374
+DIST portage-2.1.11.1.tar.bz2 836138 RMD160 f23290b7a41e53356e1c80083a54f1991b64f8b7 SHA1 bd390bdcdb934b7362bfbf26d40699b4bfa1fad8 SHA256 5f50b27c1fe5059874ed69c4f58bb9e3c52442fa80316f802c722bd0398f5c85
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
 DIST portage-2.1.6.7_p1.patch.bz2 4741 RMD160 ae3607d5c04f24d0ccd36931c91f45a77d44a81a SHA1 e49768be303baff919da458c0dea066c32a45a04 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
 DIST portage-2.2.0_alpha108.tar.bz2 821498 RMD160 9a5beedfc71db0b88f0929d43a894ee43401e751 SHA1 da4cf6d0ce5ab5d31f344c0e378ecade9452acb2 SHA256 c5ffc4abe03696319bfd89082b5a5bbb8f427acc92a8557f29a585fc8f2b6f9a
 DIST portage-2.2.0_alpha110.patch.bz2 14215 RMD160 d07d2d35a5fb20777ac54fe069705409e1a74029 SHA1 3fd7539f037b7930e1b5c7ca04c418c2b364360e SHA256 af73f05b918634835a0d99a914502b6d0870f3a59a7af0f2aa3b3e2aa0f52c88
 DIST portage-2.2.0_alpha111.tar.bz2 836193 RMD160 80cf9bad52e8b5c9ea23a5f3ec5ec6f85211aeba SHA1 32b0fa6e9c7eb25bec3f7760b256d0762dddfcf3 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df
+DIST portage-2.2.0_alpha112.patch.bz2 866 RMD160 576306101f3806b6713b11a802559c58c344dce3 SHA1 7d720649db4b6c24f40a4a318a144a86ee1ccad5 SHA256 ff61a4294874ddb3223f9eab63809bba2f9d4403edefd58359eff4ce97888213
 DIST portage-2.2.0_alpha88.tar.bz2 803852 RMD160 9c6a87c2a8de996286e74245faeaacf89fab0aea SHA1 d2f698470f0df250f51f937d78ea484d27ad0068 SHA256 75b74a87c4f4b1a13857f62aeb42522b491b06b66fe686ef4036993f55125130
 DIST portage-2.2.0_alpha89.patch.bz2 4205 RMD160 ff17958771ee571ccc45604682882356d2d54e5e SHA1 bf5ed24e13f89bcad128e8773f40ceea8bbd8ed2 SHA256 677bc5cce25723cefbdb8f147ac6fc7162d541eb0a149fbd1b96d79f4b2a07d1
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
diff --git a/sys-apps/portage/portage-2.1.11.ebuild b/sys-apps/portage/portage-2.1.11.1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.1.11.ebuild
rename to sys-apps/portage/portage-2.1.11.1.ebuild
index e7ca00a0af15..0257a588f81c 100644
--- a/sys-apps/portage/portage-2.1.11.ebuild
+++ b/sys-apps/portage/portage-2.1.11.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/sys-apps/portage/portage-2.1.11.ebuild,v 1.1 2012/06/23 07:19:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.1.ebuild,v 1.1 2012/06/23 21:08:20 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
diff --git a/sys-apps/portage/portage-2.2.0_alpha111.ebuild b/sys-apps/portage/portage-2.2.0_alpha112.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.0_alpha111.ebuild
rename to sys-apps/portage/portage-2.2.0_alpha112.ebuild
index 680849bc964a..73fc0b4dee47 100644
--- a/sys-apps/portage/portage-2.2.0_alpha111.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha112.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-apps/portage/portage-2.2.0_alpha111.ebuild,v 1.1 2012/06/23 07:29:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha112.ebuild,v 1.1 2012/06/23 21:09:43 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild
index be4fe93547f4..88f8d379cf56 100644
--- a/sys-apps/sandbox/sandbox-2.5.ebuild
+++ b/sys-apps/sandbox/sandbox-2.5.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/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.9 2012/02/05 04:50:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.10 2012/06/24 05:35:02 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,45 +33,62 @@ sandbox_death_notice() {
 
 sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
 
-src_compile() {
-	filter-lfs-flags #90228
-
+sb_foreach_abi() {
 	local OABI=${ABI}
 	for ABI in $(sb_get_install_abis) ; do
-		mkdir "${WORKDIR}/build-${ABI}"
 		cd "${WORKDIR}/build-${ABI}"
-
-		use multilib && multilib_toolchain_setup ${ABI}
-
-		einfo "Configuring sandbox for ABI=${ABI}..."
-		ECONF_SOURCE="../${P}/" \
-		econf ${myconf} || die
-		einfo "Building sandbox for ABI=${ABI}..."
-		emake || die
+		einfo "Running $1 for ABI=${ABI}..."
+		"$@"
 	done
 	ABI=${OABI}
 }
 
-src_test() {
+sb_configure() {
+	mkdir "${WORKDIR}/build-${ABI}"
+	cd "${WORKDIR}/build-${ABI}"
+
+	use multilib && multilib_toolchain_setup ${ABI}
+
+	einfo "Configuring sandbox for ABI=${ABI}..."
+	ECONF_SOURCE="../${P}/" \
+	econf ${myconf} || die
+}
+
+sb_compile() {
+	emake || die
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	# Run configures in parallel!
+	multijob_init
 	local OABI=${ABI}
 	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Checking sandbox for ABI=${ABI}..."
-		emake check || die "make check failed for ${ABI}"
+		multijob_child_init sb_configure
 	done
 	ABI=${OABI}
+	multijob_finish
+
+	sb_foreach_abi sb_compile
+}
+
+sb_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+}
+
+src_test() {
+	sb_foreach_abi sb_test
+}
+
+sb_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /etc/sandbox.d #333131
+	doins etc/sandbox.d/00default || die
 }
 
 src_install() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Installing sandbox for ABI=${ABI}..."
-		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
-		insinto /etc/sandbox.d #333131
-		doins etc/sandbox.d/00default || die
-	done
-	ABI=${OABI}
+	sb_foreach_abi sb_install
 
 	doenvd "${FILESDIR}"/09sandbox
 
diff --git a/sys-apps/xinetd/xinetd-2.3.15.ebuild b/sys-apps/xinetd/xinetd-2.3.15.ebuild
index 51e578e4f814..0c1b0c473865 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.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/sys-apps/xinetd/xinetd-2.3.15.ebuild,v 1.5 2012/06/21 04:40:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.15.ebuild,v 1.6 2012/06/23 17:11:32 armin76 Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.xinetd.org/${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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-auth/libyubikey/Manifest b/sys-auth/libyubikey/Manifest
index 66fe098abab5..47f9bc6227bd 100644
--- a/sys-auth/libyubikey/Manifest
+++ b/sys-auth/libyubikey/Manifest
@@ -1 +1 @@
-DIST libyubikey-1.6.tar.gz 295778 RMD160 8a7f06b55ac66e443d1c234f4ede1d5800e2cf99 SHA1 151ea1eba21b9f3137c6d8d7dc30566923c01139 SHA256 0a3e3778eec87065d46f931c09e38b8e7a89af7bda92d6d63cd058caa3aeb60a
+DIST libyubikey-1.9.tar.gz 321889 RMD160 73973d67d4ba74d03d07bff58b2e2fee5d0004fd SHA1 340789bee32d8c0f2f8b2dfdc1b0be428e3140c8 SHA256 fb720bd683dd37968904e1ff3d4486307d3d5933f6c6cdc96f81ab27a19c46a6
diff --git a/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch b/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch
deleted file mode 100644
index 9c6432cc9e6e..000000000000
--- a/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libyubikey-1.6/Makefile.am
-===================================================================
---- libyubikey-1.6.orig/Makefile.am
-+++ libyubikey-1.6/Makefile.am
-@@ -59,7 +59,6 @@ ykgenerate_LDADD = ./libyubikey.la
- 
- # Self tests.
- 
--AM_LDFLAGS = -no-install
- LDADD = libyubikey.la
- 
- check_PROGRAMS = selftest
diff --git a/sys-auth/libyubikey/libyubikey-1.6.ebuild b/sys-auth/libyubikey/libyubikey-1.6.ebuild
deleted file mode 100644
index 9c3c3fe21c03..000000000000
--- a/sys-auth/libyubikey/libyubikey-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/libyubikey-1.6.ebuild,v 1.1 2010/10/23 16:38:54 flameeyes Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Yubico C low-level library"
-SRC_URI="http://yubico-c.googlecode.com/files/${P}.tar.gz"
-HOMEPAGE="http://code.google.com/p/yubico-c/"
-
-KEYWORDS="~amd64"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rpath.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/libyubikey/libyubikey-1.9.ebuild b/sys-auth/libyubikey/libyubikey-1.9.ebuild
new file mode 100644
index 000000000000..2308844096c3
--- /dev/null
+++ b/sys-auth/libyubikey/libyubikey-1.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/libyubikey-1.9.ebuild,v 1.1 2012/06/24 10:32:19 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Yubico C low-level library"
+HOMEPAGE="https://github.com/Yubico/yubico-c"
+SRC_URI="http://yubico-c.googlecode.com/files/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="static-libs"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_test() {
+	emake check
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/sys-auth/ykclient/Manifest b/sys-auth/ykclient/Manifest
index 2128e5c3594f..64345e9a6060 100644
--- a/sys-auth/ykclient/Manifest
+++ b/sys-auth/ykclient/Manifest
@@ -1 +1 @@
-DIST ykclient-2.3.tar.gz 308790 RMD160 9e1d5702982adbbf574977fad10412a11f83b693 SHA1 214816c242a9cf4ab2aae12ded843ebc3aa7d9e3 SHA256 aa652ed6e7baaeb292e8f55247a5772dddf85d7155805069d72b2a0af8b8c5ec
+DIST ykclient-2.8.tar.gz 347487 RMD160 f0d3f404861cc7d69107c6677e541925d71fb348 SHA1 91aefae12d7e13360d8c03ccd66ef1d26d1b04f9 SHA256 bf99e88b831dce994dd596900d5ed5e37c9e1de7291c69b011bdcd60b72a50ef
diff --git a/sys-auth/ykclient/files/ykclient-2.3-rpath.patch b/sys-auth/ykclient/files/ykclient-2.3-rpath.patch
deleted file mode 100644
index 56e196a961c1..000000000000
--- a/sys-auth/ykclient/files/ykclient-2.3-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ykclient-2.3/Makefile.am
-===================================================================
---- ykclient-2.3.orig/Makefile.am
-+++ ykclient-2.3/Makefile.am
-@@ -54,7 +54,6 @@ ykclient_LDADD = ./libykclient.la
- 
- # Self tests.
- 
--AM_LDFLAGS = -no-install
- LDADD = libykclient.la
- 
- check_PROGRAMS = selftest
diff --git a/sys-auth/ykclient/ykclient-2.3.ebuild b/sys-auth/ykclient/ykclient-2.8.ebuild
similarity index 54%
rename from sys-auth/ykclient/ykclient-2.3.ebuild
rename to sys-auth/ykclient/ykclient-2.8.ebuild
index 24ca736f151a..a8a001b804e9 100644
--- a/sys-auth/ykclient/ykclient-2.3.ebuild
+++ b/sys-auth/ykclient/ykclient-2.8.ebuild
@@ -1,18 +1,19 @@
-# 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-auth/ykclient/ykclient-2.3.ebuild,v 1.1 2010/11/20 00:28:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/ykclient/ykclient-2.8.ebuild,v 1.1 2012/06/24 10:32:39 flameeyes Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="Yubico C client library"
 SRC_URI="http://yubico-c-client.googlecode.com/files/${P}.tar.gz"
-HOMEPAGE="http://code.google.com/p/yubico-c-client/"
+HOMEPAGE="https://github.com/Yubico/yubico-c-client"
 
 KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="BSD-2"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=">=net-misc/curl-7.21.1"
 DEPEND="${RDEPEND}"
@@ -20,13 +21,13 @@ DEPEND="${RDEPEND}"
 # Tests require an active network connection, we don't want to run them
 RESTRICT="test"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rpath.patch
-	eautoreconf
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
+DOCS=( AUTHORS ChangeLog NEWS README )
+
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-	find "${D}" -name '*.la' -delete || die
+	default
+	prune_libtool_files
 }
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 6652a79a4dc9..62fe0ebed1ae 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1 +1 @@
-DIST ykpers-1.3.4.tar.gz 368776 RMD160 366cf09e946f2a38ff3ccf4433fcd2c0adefc9dc SHA1 f616e025503dba89b83b1bb9df6d0ee3fbe97a55 SHA256 5a0d2201e927e5e7ae8d1144b31cdd48718f82db48c946a9b57b1f8991bf171c
+DIST ykpers-1.7.0.tar.gz 433901 RMD160 cc3b1c14ab9e9446b72d48615d7d921cf81a9058 SHA1 de325107c1d6e9d3a61199cad5eeac69b98a36d7 SHA256 70a2a303c2b1dc2852ab1fbc9461646c79e3829ae4b7c419c4e432433e412ed4
diff --git a/sys-auth/ykpers/files/ykpers-1.3.4-rpath.patch b/sys-auth/ykpers/files/ykpers-1.3.4-rpath.patch
deleted file mode 100644
index 5e78e52e0daa..000000000000
--- a/sys-auth/ykpers/files/ykpers-1.3.4-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ykpers-1.3.4/Makefile.am
-===================================================================
---- ykpers-1.3.4.orig/Makefile.am
-+++ ykpers-1.3.4/Makefile.am
-@@ -69,7 +69,6 @@ dist_man1_MANS = ykpersonalize.1
- 
- # Self tests.
- 
--AM_LDFLAGS = -no-install
- LDADD = ./libykpers-1.la
- 
- ctests = selftest$(EXEEXT)
diff --git a/sys-auth/ykpers/ykpers-1.3.4.ebuild b/sys-auth/ykpers/ykpers-1.7.0.ebuild
similarity index 50%
rename from sys-auth/ykpers/ykpers-1.3.4.ebuild
rename to sys-auth/ykpers/ykpers-1.7.0.ebuild
index 0f072527a51f..9e339d421659 100644
--- a/sys-auth/ykpers/ykpers-1.3.4.ebuild
+++ b/sys-auth/ykpers/ykpers-1.7.0.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/ykpers/ykpers-1.3.4.ebuild,v 1.4 2012/06/12 11:52:06 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/ykpers/ykpers-1.7.0.ebuild,v 1.1 2012/06/24 10:32:57 flameeyes Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="http://yubikey-personalization.googlecode.com/files/${P}.tar.gz"
-HOMEPAGE="http://code.google.com/p/yubikey-personalization"
+HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
 KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="BSD-2"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=">=sys-auth/libyubikey-1.6
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rpath.patch
-	eautoreconf
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
+DOCS=( AUTHORS ChangeLog NEWS README )
+
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README doc/* || die
-	find "${D}" -name '*.la' -delete || die
+	default
+	dodoc doc/*
+	prune_libtool_files
 }
diff --git a/sys-devel/automake-wrapper/automake-wrapper-7.ebuild b/sys-devel/automake-wrapper/automake-wrapper-7.ebuild
index 0cccc09b27c4..bea3ef250e0f 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-7.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-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/sys-devel/automake-wrapper/automake-wrapper-7.ebuild,v 1.2 2012/05/04 14:51:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-7.ebuild,v 1.3 2012/06/24 10:41:45 ago Exp $
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 70b0b2a8c57a..cf142aff2cb3 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-3.0-25.base.tar.bz2 668582 RMD160 4b55a05ee93524fc52685b4893797b
 DIST genpatches-3.0-25.extras.tar.bz2 17200 RMD160 74dd8384f2e1e9741b547a59eb15dd8fd87f935a SHA1 94f26f6a8876e340965c65ad1204c1b911d42498 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b
 DIST genpatches-3.0-26.base.tar.bz2 687952 RMD160 66920d2f757aaf5bf527dc7eb082d66db4cdfb07 SHA1 991c627b76dacb016bd414a785b0508502273845 SHA256 56974f956d582714b06bdc51f183ee6bae47a352c0c6ae0dd47de0b1f61f3764
 DIST genpatches-3.0-26.extras.tar.bz2 17200 RMD160 74dd8384f2e1e9741b547a59eb15dd8fd87f935a SHA1 94f26f6a8876e340965c65ad1204c1b911d42498 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b
+DIST genpatches-3.0-27.base.tar.bz2 692593 RMD160 5598205fc03d7376c3fc57af061a459fa4f873cd SHA1 7efe7ed54500b7011b137c54b2ba47a883deca39 SHA256 5d42f37a0ed68cb65f3c5cdfb566e1cef737145b11e4a26edc48928e07f11635
+DIST genpatches-3.0-27.extras.tar.bz2 17200 RMD160 74dd8384f2e1e9741b547a59eb15dd8fd87f935a SHA1 94f26f6a8876e340965c65ad1204c1b911d42498 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b
 DIST genpatches-3.1-14.base.tar.bz2 240075 RMD160 23f16ae73e228ae144ace05299fa41c2aec4f9a1 SHA1 8fd750c3958b9142c0ad64e5cab55c36d67f3e25 SHA256 fb83da313f48f4adb2955230921e9221696894db711d11a04b91939787a711e4
 DIST genpatches-3.1-14.extras.tar.bz2 17197 RMD160 a275874317e13fc9f372eb6cdb08b79d67df5201 SHA1 85ed96b1602df0f1f68bc8c88de905cf5d1b0a5e SHA256 aee5dcccb9abc251d31caa0d565b78800cbc8e111cfa02b433cf6ebbdf04d4ea
 DIST genpatches-3.2-12.base.tar.bz2 223146 RMD160 b650dea35607e1659c35a54aa2ad1def7e6c5dcc SHA1 541d7391fb34e2ebd634f959df362cccbfaf49bd SHA256 30ffca62f196810c5eb714698bf41e7bede7c42e1ab33924e0f0bd425c3f31c8
@@ -40,6 +42,8 @@ DIST genpatches-3.4-3.base.tar.bz2 54926 RMD160 b6057be44281c561c7c57adfd1eab75e
 DIST genpatches-3.4-3.extras.tar.bz2 17502 RMD160 c5b834a28335f9a173e8e863b377aff513c791e5 SHA1 7278ac0434a59c1981c585e6a49305351b60573c SHA256 2b537431a408445cd1091562755234e840016f26ad63ab3a73812ac7f7e1c8d9
 DIST genpatches-3.4-4.base.tar.bz2 68493 RMD160 3f629902fff824dba23d0e3e249cac15be5815b4 SHA1 5ee444849a92e332ac02243ccf155a68d8f5bea8 SHA256 df8fb89fe764c4bcb0be658a5e87369aa4f236c7779146a3eaeb2ee8cf044300
 DIST genpatches-3.4-4.extras.tar.bz2 17508 RMD160 b8b83573526b50f38768bb9b51d9ed0941de2dfd SHA1 413a4d2cb7adaab147488a69941f9c4a4731a3c1 SHA256 be8e087b3a0508e88bd36d2d4bec07e0756a3e7f7b31de4dbfd51d79412c2a96
+DIST genpatches-3.4-5.base.tar.bz2 83423 RMD160 5b774777acf009610c8782b469ab938e2733ed99 SHA1 4c954b522a4dafa2be203edd2cbf9d159c557ee1 SHA256 4ee8ef2834f0993536188ad2de8f6d3eddac963cc935c1d77eac4f98b99199eb
+DIST genpatches-3.4-5.extras.tar.bz2 17502 RMD160 c5b834a28335f9a173e8e863b377aff513c791e5 SHA1 7278ac0434a59c1981c585e6a49305351b60573c SHA256 2b537431a408445cd1091562755234e840016f26ad63ab3a73812ac7f7e1c8d9
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
 DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.36.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.36.ebuild
new file mode 100644
index 000000000000..988ecb723202
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.0.36.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.36.ebuild,v 1.1 2012/06/23 19:45:09 mpagano Exp $
+
+EAPI="2"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="27"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.4.ebuild
new file mode 100644
index 000000000000..ac8317e27431
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.4.4.ebuild,v 1.1 2012/06/23 17:53:46 mpagano Exp $
+
+EAPI="3"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="5"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/mtdev/mtdev-1.1.2.ebuild b/sys-libs/mtdev/mtdev-1.1.2.ebuild
index 7179dbe403ec..03f63e2a6073 100644
--- a/sys-libs/mtdev/mtdev-1.1.2.ebuild
+++ b/sys-libs/mtdev/mtdev-1.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/sys-libs/mtdev/mtdev-1.1.2.ebuild,v 1.4 2012/06/22 20:20:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.2.ebuild,v 1.5 2012/06/24 18:40:56 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://bitmath.org/code/mtdev/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=sys-kernel/linux-headers-2.6"
diff --git a/sys-libs/ncurses/ncurses-5.7-r7.ebuild b/sys-libs/ncurses/ncurses-5.7-r7.ebuild
index ea8bee57cac0..1c57c5f4f271 100644
--- a/sys-libs/ncurses/ncurses-5.7-r7.ebuild
+++ b/sys-libs/ncurses/ncurses-5.7-r7.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/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 1.9 2011/05/22 18:19:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 1.10 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -131,7 +131,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9-r1.ebuild b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
index 0da4732aac14..63df0808e82f 100644
--- a/sys-libs/ncurses/ncurses-5.9-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-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/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 1.1 2011/11/21 22:08:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 1.2 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -136,7 +136,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index f6e25b7b6585..c52751b18029 100644
--- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-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/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.13 2012/06/14 03:39:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.14 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -138,7 +138,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-libs/ncurses/ncurses-5.9.ebuild b/sys-libs/ncurses/ncurses-5.9.ebuild
index 4e8b35faf9dd..82e4cb10d1ca 100644
--- a/sys-libs/ncurses/ncurses-5.9.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9.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/sys-libs/ncurses/ncurses-5.9.ebuild,v 1.7 2011/12/28 19:26:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9.ebuild,v 1.8 2012/06/24 00:24:08 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -127,7 +127,7 @@ src_install() {
 	gen_usr_ldscript -a ncurses
 	use unicode && gen_usr_ldscript -a ncursesw
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
 
 #	if ! use berkdb ; then
 		# We need the basic terminfo files in /etc, bug #37026
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 61cef27b91dd..c11eda9e74ec 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,2 +1,3 @@
 DIST parallel-20120422.tar.bz2 224881 RMD160 81101d138752be6c9d24d422cf249b3f0cea3dc6 SHA1 1f0e9bdca7271fa6932a570980b8a3b335b2eaa5 SHA256 29210b77f0729486b7dda51ba54ac9b5e6aa2e57305f3d661259c99e8cc1937c
 DIST parallel-20120522.tar.bz2 226625 RMD160 f1bff4bff0585e06c43d3827e2c9dc141979863d SHA1 bc8118949f900c05ef232c6946c4ebfa779cafed SHA256 697cd39b089d5b302fe8965650c5c6d9e8a6653f59e90a6c1a297aba0df31471
+DIST parallel-20120622.tar.bz2 228881 RMD160 a317c74ca3947cdbba3a72814118d9e3eaf6ce31 SHA1 b184a55674ce10e8bf7c65790c2806552eb79577 SHA256 bfdbb4a66835eacce2bffde23f5e0f12b4e99ced5e348b5f69b7aa97d0123869
diff --git a/sys-process/parallel/parallel-20120522.ebuild b/sys-process/parallel/parallel-20120522.ebuild
index a9bc7fe216b5..8f9305de5e19 100644
--- a/sys-process/parallel/parallel-20120522.ebuild
+++ b/sys-process/parallel/parallel-20120522.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-process/parallel/parallel-20120522.ebuild,v 1.1 2012/05/23 06:34:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20120522.ebuild,v 1.2 2012/06/24 10:40:11 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-process/parallel/parallel-20120622.ebuild b/sys-process/parallel/parallel-20120622.ebuild
new file mode 100644
index 000000000000..24d8922b743e
--- /dev/null
+++ b/sys-process/parallel/parallel-20120622.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20120622.ebuild,v 1.1 2012/06/23 21:05:03 radhermit Exp $
+
+EAPI=4
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="http://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+# moreutils for `parallel` and grass for 'sql.1' manpage
+DEPEND="${RDEPEND}
+	!<sys-apps/moreutils-0.45-r1
+	!<sci-geosciences/grass-6.4.1-r1"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"usr/bin/sem
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/app-office/koffice-meta/Manifest b/virtual/perl-Text-ParseWords/Manifest
similarity index 100%
rename from app-office/koffice-meta/Manifest
rename to virtual/perl-Text-ParseWords/Manifest
diff --git a/app-office/koffice-l10n/metadata.xml b/virtual/perl-Text-ParseWords/metadata.xml
similarity index 64%
rename from app-office/koffice-l10n/metadata.xml
rename to virtual/perl-Text-ParseWords/metadata.xml
index 78a6d6197b06..36ee0f08c67c 100644
--- a/app-office/koffice-l10n/metadata.xml
+++ b/virtual/perl-Text-ParseWords/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+  <herd>perl</herd>
 </pkgmetadata>
diff --git a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.270.0.ebuild b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.270.0.ebuild
new file mode 100644
index 000000000000..dd2c4d5f9ef6
--- /dev/null
+++ b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.270.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.270.0.ebuild,v 1.1 2012/06/24 06:57:29 tove Exp $
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* =dev-lang/perl-5.12* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 978d53461520..c7c1eb830c35 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,2 +1,3 @@
 DIST modsecurity-apache_2.6.3.tar.gz 780896 RMD160 102ce304bda05e6d0fd83ebeba27a88b5e0388fe SHA1 d21b8eab268f2614204323720159f7dfe3d9a205 SHA256 6ae9339623e582c965e6a188f7f61f540402a5af8c37cc7a8d22daa4565ca71b
 DIST modsecurity-apache_2.6.6.tar.gz 781984 RMD160 ac27b5d2da5a3b90b97714914592a8f7c3828b26 SHA1 18f3eba967d60abfe117e0e7866b68f763da711f SHA256 a0cb075d5898230d17da5805eb102d1bbba07fe0748dcc32920990c4711b7708
+DIST modsecurity-apache_2.7.0-rc2.tar.gz 812245 RMD160 f99421a47336bd87908d2315c600f0858b439873 SHA1 02f1becaca27284c09fc01fb3f580d86f590ef8e SHA256 7518afd6d2cdc55ab2b2ecf06c3a21f5b9f52790ae04e05c5644379224a97b45
diff --git a/www-apache/mod_security/files/2.5.10/99_mod_security.conf b/www-apache/mod_security/files/2.5.10/99_mod_security.conf
deleted file mode 100644
index d5ed8fa8b96d..000000000000
--- a/www-apache/mod_security/files/2.5.10/99_mod_security.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<IfDefine SECURITY>
-LoadModule security2_module modules/mod_security2.so
-
-# this is only useful with either no core-rule-set, or with crs
-# version 2.0.5 or later, as it doesn't set it.
-SecDataDir /var/cache/mod_security
-
-# use Core Rule Set by default:
-Include /etc/apache2/modules.d/mod_security/*.conf
-
-# Optionally use the other rules as well
-# Include /etc/apache2/modules.d/mod_security/optional_rules/*.conf
-
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch b/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch
deleted file mode 100644
index f664d35efb54..000000000000
--- a/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naurp -Naurp modsecurity-apache_2.5.9.old/apache2/Makefile.in modsecurity-apache_2.5.9/apache2/Makefile.in
---- modsecurity-apache_2.5.9.old/apache2/Makefile.in	2009-07-02 19:18:31.000000000 +0200
-+++ modsecurity-apache_2.5.9/apache2/Makefile.in	2009-07-02 19:48:23.000000000 +0200
-@@ -52,11 +52,11 @@ APU_LIBS = @APU_LIBS@
- APU_LINK_LD = @APU_LINK_LD@
- 
- CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML2_CFLAGS) $(LUA_CFLAGS) 
--LIBS = @LIBS@ $(PCRE_LIBS) $(LIBXML2_LIBS) $(LUA_LIBS)
-+LIBS = @LIBS@ $(PCRE_LIBS) $(LIBXML2_LIBS) $(LUA_LIBS) $(APXS_LIBS) $(APR_LIBS) $(APR_LINK_LD) $(APU_LIBS) $(APU_LINK_LD)
- LDFLAGS = @LDFLAGS@
- CFLAGS = @CFLAGS@
- 
--COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS)
-+COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS)
- 
- INSTALL_MOD_SHARED = $(APXS_WRAPPER) -i
- 
-@@ -93,7 +93,7 @@ mod_security2.la: $(MOD_SECURITY2_H) *.c
- 		src="$$src $$f.c"; \
- 	done; \
- 	rm -f msc_test msc_test.o msc_test.lo msc_test.slo; \
--	$(COMPILE_APACHE_MOD) $(APXS_EXTRA_CFLAGS) $(MODSEC_APXS_EXTRA_CFLAGS) $$src
-+	$(COMPILE_APACHE_MOD) $(APXS_EXTRA_CFLAGS) $(MODSEC_APXS_EXTRA_CFLAGS) $$src $(LIBS)
- 
- ### MLogC
- mlogc:
diff --git a/www-apache/mod_security/files/modsecurity-2.7.conf b/www-apache/mod_security/files/modsecurity-2.7.conf
new file mode 100644
index 000000000000..43508bca635f
--- /dev/null
+++ b/www-apache/mod_security/files/modsecurity-2.7.conf
@@ -0,0 +1,15 @@
+<IfDefine SECURITY>
+LoadModule security2_module modules/mod_security2.so
+
+# Enable looking up geolocation data from MaxMind's GeoIP database
+SecGeoLookupDb /usr/share/GeoIP/GeoIP.dat
+
+SecDataDir /var/cache/modsecurity
+
+# Define here your http:BL API key if any
+# see http://www.projecthoneypot.org/httpbl_api.php
+#SecHttpBlKey xxxxxxxx
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
index d1365071f721..78e6f6ff644f 100644
--- a/www-apache/mod_security/metadata.xml
+++ b/www-apache/mod_security/metadata.xml
@@ -7,20 +7,6 @@
     <name>Diego E. Pettenò</name>
   </maintainer>
   <use>
-    <flag name="perl">
-      Add a dependency upon Perl and install the script to update the
-      Core Rule Set. Please note that this script will use the
-      original Core Rule Set, and it's currently mostly untested.
-    </flag>
-    <flag name="vanilla">
-      Provide the original ModSecurity Core Rule Set without
-      Gentoo-specific relaxation. When this flag is enabled, we
-      install the unadulterated Core Rule Set. Warning! The original
-      Core Rule Set is draconic and most likely will break your web
-      applications, including Rails-based web applications and
-      Bugzilla.
-    </flag>
-
     <flag name='geoip'>
       Configure ModSecurity to query the GeoIP database from MaxMind,
       provided by <pkg>dev-libs/geoip</pkg>. This flag only controls
@@ -32,5 +18,11 @@
       Build the ModSecurity Audit Log Collector (mlogc) that depends
       on <pkg>net-misc/curl</pkg>.
     </flag>
+
+    <flag name='jit'>
+      Add support for the PCRE Just-in-Time optimisation, as enabled
+      by <pkg>dev-libs/libpcre</pkg> with jit USE flag enabled. Might
+      not be available on hardened systems.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/www-apache/mod_security/mod_security-2.7.0_rc2.ebuild b/www-apache/mod_security/mod_security-2.7.0_rc2.ebuild
new file mode 100644
index 000000000000..3797907f4f36
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.7.0_rc2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.7.0_rc2.ebuild,v 1.2 2012/06/24 16:41:44 flameeyes Exp $
+
+EAPI=4
+
+inherit apache-module
+
+MY_PN=modsecurity-apache
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
+HOMEPAGE="http://www.modsecurity.org/"
+SRC_URI="mirror://sourceforge/project/mod-security/${MY_PN}/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="geoip curl lua jit"
+
+DEPEND=">=dev-libs/libxml2-2.7.8
+	dev-libs/libpcre[jit?]
+	lua? ( >=dev-lang/lua-5.1 )
+	curl? ( >=net-misc/curl-7.15.1 )
+	www-servers/apache[apache2_modules_unique_id]"
+RDEPEND="${DEPEND}
+	geoip? ( dev-libs/geoip )"
+PDEPEND=">=www-apache/modsecurity-crs-2.2.5"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_DEFINE="SECURITY"
+
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
+need_apache2
+
+src_prepare() {
+	cp "${FILESDIR}"/modsecurity-2.7.conf "${T}"/79_modsecurity.conf || die
+}
+
+src_configure() {
+	econf \
+		--enable-shared --disable-static \
+		--with-apxs="${APXS}" \
+		--enable-request-early \
+		$(use_enable curl mlogc) \
+		$(use_with lua) \
+		$(use_enable jit pcre jit) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if ! use geoip; then
+		sed -i -e '/SecGeoLookupDb/s:^:#:' \
+			"${T}"/79_modsecurity.conf || die
+	fi
+
+	emake || die
+}
+
+src_test() {
+	emake check || die
+}
+
+src_install() {
+	apache-module_src_install
+
+	# install manually rather than by using the APACHE2_MOD_CONF
+	# variable since we have to edit it to set things up properly.
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${T}"/79_modsecurity.conf
+
+	dodoc CHANGES NOTICE README.TXT README_WINDOWS.TXT
+
+	dohtml -r doc/*
+
+	keepdir /var/cache/modsecurity
+	fowners apache:apache /var/cache/modsecurity
+	fperms 0770 /var/cache/modsecurity
+}
+
+pkg_postinst() {
+	if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
+		ewarn "You still have the configuration file 99_mod_security.conf."
+		ewarn "Please make sure to remove that and keep only 79_modsecurity.conf."
+		ewarn ""
+	fi
+	elog "The base configuration file has been renamed 79_modsecurity.conf"
+	elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
+	elog "equivalent."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
+}
diff --git a/www-apps/gnopaste/gnopaste-0.5.5.ebuild b/www-apps/gnopaste/gnopaste-0.5.5.ebuild
index 1653e1eff877..8db381cbb202 100644
--- a/www-apps/gnopaste/gnopaste-0.5.5.ebuild
+++ b/www-apps/gnopaste/gnopaste-0.5.5.ebuild
@@ -1,8 +1,10 @@
-# 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/www-apps/gnopaste/gnopaste-0.5.5.ebuild,v 1.5 2008/02/23 22:28:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gnopaste/gnopaste-0.5.5.ebuild,v 1.6 2012/06/24 08:59:57 mabi Exp $
 
-inherit webapp depend.php eutils
+EAPI=4
+
+inherit webapp eutils
 
 DESCRIPTION="gnopaste is a nopaste script based on PHP with MySQL"
 HOMEPAGE="http://gnopaste.sf.net/"
@@ -12,20 +14,15 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
+RDEPEND="virtual/httpd-php
+	dev-lang/php[mysql]"
+
 need_httpd_cgi
-need_php_httpd
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	esvn_clean
 }
 
-pkg_setup() {
-	require_php_with_use mysql
-	webapp_pkg_setup
-}
-
 src_install() {
 	webapp_src_preinst
 
diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
index 16b333652b32..d56eaf77b43c 100644
--- a/www-apps/groupoffice/Manifest
+++ b/www-apps/groupoffice/Manifest
@@ -1,3 +1,3 @@
-DIST groupoffice-com-2.15.tar.gz 7715962 RMD160 b45792c9df15c0574c71f2ed1c46607449df009e SHA1 2787a23ab6aa35eb7040edb7b48473b1bd14282f SHA256 f965e6a68cf798912325b5c8696517fdc32bde9b986fa2e142159811ea3ecdad
-DIST groupoffice-com-2.16-8.tar.gz 9071328 RMD160 3078675575f5cdd685e31056b6dbe89494516b1d SHA1 129f6727a535ea6720ac832cd5dc61c6beb61414 SHA256 a26a4868dbf2278cf32ec9bd18a494f92929ed5b06ae5054d5383604c5380a08
 DIST groupoffice-com-2.18-stable-6.tar.gz 6543817 RMD160 02602d75779afd95813704dd66e278b8c82aa9b3 SHA1 e330b327d4272a3777a9c009049a3eaedce60dff SHA256 be14325adeb9546f0e93f974e00f744a07e4eee1312b27d25fe27695e4eb52f6
+DIST groupoffice-com-3.7.52.tar.gz 12259892 RMD160 9a550f1b6c683ed82525cf7ab1a717a62f7862dd SHA1 caad67f0ba9ccb7c69d56b8d35cb048c8bb5d96f SHA256 af07123e16e9ebeafa4aeeaa7ae3c6dd45bc333ae1588a6c540c5973bb8f64d6
+DIST groupoffice-com-4.0.47.tar.gz 12354456 RMD160 82538bfd6baa64af08142dc50103c995f6c538a8 SHA1 08794dae99eb96dd87123f7795fb0373e3d4b377 SHA256 0a84236d4d2f91d96c5a771a8add945404f3a7eef092dcaac9c2cc013dc6caac
diff --git a/www-apps/groupoffice/groupoffice-2.15.ebuild b/www-apps/groupoffice/groupoffice-2.15.ebuild
deleted file mode 100644
index db029f9e03bf..000000000000
--- a/www-apps/groupoffice/groupoffice-2.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.15.ebuild,v 1.6 2008/08/09 21:42:31 hoffie Exp $
-
-inherit eutils webapp depend.php
-
-S=${WORKDIR}/${PN}-com-${PV}
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${PN}-com-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	elog "PHP needs to be compiled with iconv support"
-	elog "If you are using php-5*, be sure it's compiled with USE=iconv"
-	require_php_with_use imap mysql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG DEVELOPERS FAQ README README.ldap TODO TRANSLATORS"
-
-	dodoc ${docs} RELEASE LICENSE.PRO
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	for doc in ${docs}; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	touch ${D}${MY_HTDOCSDIR}/config.php
-	dodir ${MY_HOSTROOTDIR}/${P}/userdata ${MY_HTDOCSDIR}/local
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HOSTROOTDIR}/${P}/userdata
-	webapp_serverowned ${MY_HTDOCSDIR}/local
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-2.16.8.ebuild b/www-apps/groupoffice/groupoffice-2.16.8.ebuild
deleted file mode 100644
index 7d6e88c16785..000000000000
--- a/www-apps/groupoffice/groupoffice-2.16.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.16.8.ebuild,v 1.4 2008/08/09 21:42:31 hoffie Exp $
-
-inherit eutils webapp depend.php versionator
-
-MY_PV=$(replace_version_separator 2 '-' )
-S=${WORKDIR}/${PN}-com-${MY_PV}
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${PN}-com-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	elog "PHP needs to be compiled with iconv support"
-	elog "If you are using php-5*, be sure it's compiled with USE=iconv"
-	require_php_with_use imap mysql calendar
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG DEVELOPERS FAQ README README.ldap TODO TRANSLATORS"
-
-	dodoc ${docs} RELEASE LICENSE.*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	for doc in ${docs}; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	touch ${D}${MY_HTDOCSDIR}/config.php
-	dodir ${MY_HOSTROOTDIR}/${P}/userdata ${MY_HTDOCSDIR}/local
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned -R ${MY_HOSTROOTDIR}/${P}/userdata
-	webapp_serverowned ${MY_HTDOCSDIR}/local
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-3.7.52.ebuild b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
new file mode 100644
index 000000000000..c32d8d292029
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-3.7.52.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/www-apps/groupoffice/groupoffice-3.7.52.ebuild,v 1.1 2012/06/24 10:06:46 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.0.47.ebuild b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
new file mode 100644
index 000000000000..25f6e55a4651
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.0.47.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/www-apps/groupoffice/groupoffice-4.0.47.ebuild,v 1.1 2012/06/24 10:06:46 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/online-bookmarks/Manifest b/www-apps/online-bookmarks/Manifest
index db2a5b275644..57f11e7403a1 100644
--- a/www-apps/online-bookmarks/Manifest
+++ b/www-apps/online-bookmarks/Manifest
@@ -1 +1,2 @@
 DIST online-bookmarks-0.6.28.tar.gz 60618 RMD160 8b6e19334200055e659a7d5c228459f3556ba88f SHA1 9877b5bf44b4daf2ea8988bfdd52d2ba887676e9 SHA256 627b57caab2907b81d14c6ce99c82f92ecb8e445deba11d2045d6c86534c23c8
+DIST online-bookmarks-0.8.14_beta.tar.gz 115790 RMD160 57ce73c0d15d05cf406aadb8c7f733224019d020 SHA1 d89ed00e03f301ed76c0095b25704ae2bc562af2 SHA256 659cf0bc122b3ad55f5acb023778b1365591c8de8dd6b9d9cd6d76835e2e43d4
diff --git a/www-apps/online-bookmarks/online-bookmarks-0.8.14_beta.ebuild b/www-apps/online-bookmarks/online-bookmarks-0.8.14_beta.ebuild
new file mode 100644
index 000000000000..044ce9ce594b
--- /dev/null
+++ b/www-apps/online-bookmarks/online-bookmarks-0.8.14_beta.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/www-apps/online-bookmarks/online-bookmarks-0.8.14_beta.ebuild,v 1.1 2012/06/24 10:32:20 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="A Bookmark management system to store your Bookmarks, Favorites and Links."
+HOMEPAGE="http://www.frech.ch/online-bookmarks/index.php"
+SRC_URI="http://www.frech.ch/online-bookmarks/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+RDEPEND="virtual/httpd-php
+	dev-lang/php[mysql]
+	dev-php/PEAR-Auth
+	dev-php/PEAR-DB"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGES README
+
+	cp -R * "${D}/${MY_HTDOCSDIR}"
+
+	webapp_serverowned "${MY_HTDOCSDIR}/favicons"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+}
diff --git a/www-apps/phpmp/phpmp-0.11.0-r1.ebuild b/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
index 8ed626e48146..87439bccf741 100644
--- a/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
+++ b/www-apps/phpmp/phpmp-0.11.0-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/www-apps/phpmp/phpmp-0.11.0-r1.ebuild,v 1.3 2010/10/20 14:19:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpmp/phpmp-0.11.0-r1.ebuild,v 1.4 2012/06/24 10:59:25 mabi Exp $
 
 EAPI="2"
 
-inherit webapp depend.php
+inherit webapp
 
 MY_PN="phpMp"
 MY_P="${MY_PN}-${PV}"
@@ -17,10 +17,10 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+RDEPEND="virtual/httpd-php
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
 
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/www-client/lynx/files/lynx-2.8.8_pre12-jobserver.patch b/www-client/lynx/files/lynx-2.8.8_pre12-jobserver.patch
new file mode 100644
index 000000000000..16e3f260ad04
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.8_pre12-jobserver.patch
@@ -0,0 +1,26 @@
+Index: lynx2-8-8/makefile.in
+===================================================================
+--- lynx2-8-8.orig/makefile.in
++++ lynx2-8-8/makefile.in
+@@ -196,9 +196,9 @@ binary_PROG  = $(actual_PROG)$x
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+-	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
++@MSG_DIR_MAKE@	$(MAKE_RECUR) -C $(PO_DIR)
++	$(MAKE_RECUR) -C $(WWW_DIR) $(WWW_CFLAGS)
++	$(MAKE_RECUR) -C $(SRC_DIR) all $(SRC_CFLAGS)
+ 
+ lint:
+ 	cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
+@@ -317,7 +317,7 @@ install-full: install install-help insta
+ 	@echo Full installation complete.
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
++@MSG_DIR_MAKE@	$(MAKE_RECUR) -C $(PO_DIR) install
+ 	@ECHO_CC@$(SHELL) -c \
+ 	'if test -f $(BINDIR)/$(binary_PROG) ; then \
+ 	      mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
diff --git a/www-client/lynx/lynx-2.8.8_pre12.ebuild b/www-client/lynx/lynx-2.8.8_pre12.ebuild
index 9de85adad878..4a86a6adce7a 100644
--- a/www-client/lynx/lynx-2.8.8_pre12.ebuild
+++ b/www-client/lynx/lynx-2.8.8_pre12.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/lynx/lynx-2.8.8_pre12.ebuild,v 1.12 2012/06/17 16:48:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre12.ebuild,v 1.14 2012/06/24 07:32:09 flameeyes Exp $
 
 EAPI=4
 
@@ -32,7 +32,10 @@ RDEPEND="sys-libs/ncurses[unicode?]
 	nls? ( virtual/libintl )
 	ssl? (
 		!gnutls? ( >=dev-libs/openssl-0.9.8 )
-		gnutls? ( >=net-libs/gnutls-2.6.4 )
+		gnutls? (
+			dev-libs/libgcrypt
+			>=net-libs/gnutls-2.6.4
+		)
 	)
 	bzip2? ( app-arch/bzip2 )
 	idn? ( net-dns/libidn )"
@@ -52,6 +55,7 @@ src_prepare() {
 	epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch"
 	epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch
 	epatch "${FILESDIR}"/lynx-2.8.8_pre12-parallel.patch
+	epatch "${FILESDIR}"/lynx-2.8.8_pre12-jobserver.patch
 }
 
 src_configure() {
diff --git a/x11-apps/bitmap/bitmap-1.0.6.ebuild b/x11-apps/bitmap/bitmap-1.0.6.ebuild
index ebf6eaf20b82..f58e1818b738 100644
--- a/x11-apps/bitmap/bitmap-1.0.6.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.6.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/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.3 2012/06/22 20:20:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.4 2012/06/24 18:41:26 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
-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=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
index 0bbe01ed6035..485d0fcbefb8 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-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/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild,v 1.2 2012/06/22 20:20:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild,v 1.3 2012/06/24 18:41:49 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	=media-libs/freetype-2*
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
index 1dc2daca70cd..93be531b40a3 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.4.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/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild,v 1.2 2012/06/22 20:21:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild,v 1.3 2012/06/24 18:42:12 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="list fonts served by X font server"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-proto/xproto
diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
index ce7aa784100e..dad0500f056e 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.5.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/x11-apps/fstobdf/fstobdf-1.0.5.ebuild,v 1.2 2012/06/22 20:21:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.5.ebuild,v 1.3 2012/06/24 18:42:34 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.ebuild
index 22345cdcc352..4668141bdddd 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.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/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.ebuild,v 1.4 2012/06/23 11:14:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.2.ebuild,v 1.5 2012/06/24 18:42:55 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="intel gpu userland tools"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/x11-apps/listres/listres-1.0.3.ebuild b/x11-apps/listres/listres-1.0.3.ebuild
index c60113493b16..de3367db8dff 100644
--- a/x11-apps/listres/listres-1.0.3.ebuild
+++ b/x11-apps/listres/listres-1.0.3.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/x11-apps/listres/listres-1.0.3.ebuild,v 1.2 2012/06/22 20:22:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-1.0.3.ebuild,v 1.3 2012/06/24 18:43:19 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/luit/luit-1.1.1.ebuild b/x11-apps/luit/luit-1.1.1.ebuild
index 5c2479c449d4..1a4a93b93b47 100644
--- a/x11-apps/luit/luit-1.1.1.ebuild
+++ b/x11-apps/luit/luit-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/x11-apps/luit/luit-1.1.1.ebuild,v 1.3 2012/06/22 20:22:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-1.1.1.ebuild,v 1.4 2012/06/24 18:43:48 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="sys-libs/zlib
 	x11-libs/libX11
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
index 4459eec3c7bd..db02eacbf434 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.7.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/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.3 2012/06/22 20:23:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.4 2012/06/24 18:44:16 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="create an index of X font files in a directory"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-apps/mkfontscale"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild
index 0b71179d3541..d97f26af8361 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.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-apps/mkfontscale/mkfontscale-1.1.0.ebuild,v 1.4 2012/06/22 20:23:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild,v 1.5 2012/06/24 18:44:48 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
-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=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/oclock/oclock-1.0.3.ebuild b/x11-apps/oclock/oclock-1.0.3.ebuild
index de70e715e741..3ffaea463b7d 100644
--- a/x11-apps/oclock/oclock-1.0.3.ebuild
+++ b/x11-apps/oclock/oclock-1.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-apps/oclock/oclock-1.0.3.ebuild,v 1.3 2012/06/22 20:24:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-1.0.3.ebuild,v 1.4 2012/06/24 18:45:13 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
index f74eb0cc9941..e982de6b6dd4 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.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/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.3 2012/06/22 20:24:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.4 2012/06/24 18:45:41 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Controls the keyboard layout of a running X server."
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
diff --git a/x11-apps/xauth/xauth-1.0.7.ebuild b/x11-apps/xauth/xauth-1.0.7.ebuild
index 7ed8c4f5b9ef..32b882784c6f 100644
--- a/x11-apps/xauth/xauth-1.0.7.ebuild
+++ b/x11-apps/xauth/xauth-1.0.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/x11-apps/xauth/xauth-1.0.7.ebuild,v 1.3 2012/06/22 20:25:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.7.ebuild,v 1.4 2012/06/24 18:46:11 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
index baab3bbdd7db..8154dfc0a696 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.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/x11-apps/xclipboard/xclipboard-1.1.2.ebuild,v 1.3 2012/06/22 20:25:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-1.1.2.ebuild,v 1.4 2012/06/24 18:46:34 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="interchange between cut buffer and selection"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXaw
 	x11-libs/libxkbfile
diff --git a/x11-apps/xclock/xclock-1.0.6.ebuild b/x11-apps/xclock/xclock-1.0.6.ebuild
index 91f9d21353dc..42813136c750 100644
--- a/x11-apps/xclock/xclock-1.0.6.ebuild
+++ b/x11-apps/xclock/xclock-1.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-apps/xclock/xclock-1.0.6.ebuild,v 1.3 2012/06/22 20:26:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-1.0.6.ebuild,v 1.4 2012/06/24 18:47:06 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
index 163513485c9e..e4c940300599 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.4.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/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.3 2012/06/22 20:26:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.4 2012/06/24 18:47:33 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-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=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
index f7de23228d98..801c34fc2be9 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.5.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/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild,v 1.3 2012/06/22 20:27:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild,v 1.4 2012/06/24 18:48:02 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/xev-1.2.0.ebuild b/x11-apps/xev/xev-1.2.0.ebuild
index 79d0665d4b9c..e066a12fc50b 100644
--- a/x11-apps/xev/xev-1.2.0.ebuild
+++ b/x11-apps/xev/xev-1.2.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-apps/xev/xev-1.2.0.ebuild,v 1.5 2012/06/22 20:27:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-1.2.0.ebuild,v 1.6 2012/06/24 18:48:31 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="print contents of X events"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfd/xfd-1.1.1.ebuild b/x11-apps/xfd/xfd-1.1.1.ebuild
index a82a0dc69d26..ae7c28e6099b 100644
--- a/x11-apps/xfd/xfd-1.1.1.ebuild
+++ b/x11-apps/xfd/xfd-1.1.1.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/x11-apps/xfd/xfd-1.1.1.ebuild,v 1.2 2012/06/22 20:27:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-1.1.1.ebuild,v 1.3 2012/06/24 18:48:55 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org xfd application"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/freetype:2
diff --git a/x11-apps/xfontsel/xfontsel-1.0.4.ebuild b/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
index 23b212b006e8..b20acc4f4468 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.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-apps/xfontsel/xfontsel-1.0.4.ebuild,v 1.2 2012/06/22 20:28:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-1.0.4.ebuild,v 1.3 2012/06/24 18:49:21 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
index 1ad565e39635..72d7fe64521b 100644
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.5.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/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.3 2012/06/22 20:28:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.4 2012/06/24 18:49:49 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="Alter a monitor's gamma correction through the X server"
-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=""
 
 RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xhost/xhost-1.0.5.ebuild b/x11-apps/xhost/xhost-1.0.5.ebuild
index 6f28ff5f9264..48ce4a4ae48c 100644
--- a/x11-apps/xhost/xhost-1.0.5.ebuild
+++ b/x11-apps/xhost/xhost-1.0.5.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-apps/xhost/xhost-1.0.5.ebuild,v 1.3 2012/06/22 20:29:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-1.0.5.ebuild,v 1.4 2012/06/24 18:50:17 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Controls host and/or user access to a running X server."
 
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/xinit-1.3.2.ebuild b/x11-apps/xinit/xinit-1.3.2.ebuild
index 0738b1d806eb..54e36b37c35b 100644
--- a/x11-apps/xinit/xinit-1.3.2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.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-apps/xinit/xinit-1.3.2.ebuild,v 1.3 2012/06/22 20:29:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.4 2012/06/24 18:50:51 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-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="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xinput/xinput-1.6.0.ebuild b/x11-apps/xinput/xinput-1.6.0.ebuild
index 9181e05a4bda..e5cf8eae2e8e 100644
--- a/x11-apps/xinput/xinput-1.6.0.ebuild
+++ b/x11-apps/xinput/xinput-1.6.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/x11-apps/xinput/xinput-1.6.0.ebuild,v 1.3 2012/06/22 20:30:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.6.0.ebuild,v 1.4 2012/06/24 18:51:24 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Utility to set XInput device parameters"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
index 79f9acefdafc..5dc6eee93c34 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.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/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.3 2012/06/22 20:30:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.4 2012/06/24 18:51:52 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="XKB event daemon"
 
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xload/xload-1.1.1.ebuild b/x11-apps/xload/xload-1.1.1.ebuild
index fceaefa8056d..eeae88022823 100644
--- a/x11-apps/xload/xload-1.1.1.ebuild
+++ b/x11-apps/xload/xload-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/x11-apps/xload/xload-1.1.1.ebuild,v 1.2 2012/06/22 20:31:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-1.1.1.ebuild,v 1.3 2012/06/24 18:52:18 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="system load average display for X"
 
-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=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xlogo/xlogo-1.0.4.ebuild b/x11-apps/xlogo/xlogo-1.0.4.ebuild
index 19f11dc220e0..fc6f6d961898 100644
--- a/x11-apps/xlogo/xlogo-1.0.4.ebuild
+++ b/x11-apps/xlogo/xlogo-1.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-apps/xlogo/xlogo-1.0.4.ebuild,v 1.2 2012/06/22 20:31:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-1.0.4.ebuild,v 1.3 2012/06/24 18:52:45 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Window System logo"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix"
 IUSE=""
 
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
index 18a65df27c2c..b45a9d071b32 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.1.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/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.3 2012/06/22 20:31:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.4 2012/06/24 18:53:12 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="list interned atoms defined on server"
-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=""
 
 RDEPEND="x11-libs/libxcb"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
index 84198b8d7da6..5f61c112dc2e 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.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-apps/xlsfonts/xlsfonts-1.0.4.ebuild,v 1.2 2012/06/22 20:32:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild,v 1.3 2012/06/24 18:53:37 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xlsfonts application"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
index 587ed5fc1242..2483e0c791b1 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.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/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.4 2012/06/22 20:32:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.5 2012/06/24 18:54:06 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
index 07d4c62335a8..81968833cb7c 100644
--- a/x11-apps/xpr/xpr-1.0.4.ebuild
+++ b/x11-apps/xpr/xpr-1.0.4.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/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.3 2012/06/22 20:33:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.4 2012/06/24 18:54:34 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org xpr application"
-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=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
index c93e9739a3be..25df840f4351 100644
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.2-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/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild,v 1.2 2012/06/22 20:33:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild,v 1.3 2012/06/24 18:54:57 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXTrap"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
index a96e52fd9de0..138a95024ee0 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.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/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild,v 1.2 2012/06/22 20:33:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild,v 1.3 2012/06/24 18:55:22 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="video mode tuner for Xorg"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xwd/xwd-1.0.5.ebuild b/x11-apps/xwd/xwd-1.0.5.ebuild
index a42a53075ce2..9656e788848d 100644
--- a/x11-apps/xwd/xwd-1.0.5.ebuild
+++ b/x11-apps/xwd/xwd-1.0.5.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-apps/xwd/xwd-1.0.5.ebuild,v 1.5 2012/06/22 20:34:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-1.0.5.ebuild,v 1.6 2012/06/24 18:55:52 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-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=""
 
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
index 3f36eb017937..7ab4dde2ab5c 100644
--- a/x11-apps/xwud/xwud-1.0.4.ebuild
+++ b/x11-apps/xwud/xwud-1.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-apps/xwud/xwud-1.0.4.ebuild,v 1.3 2012/06/22 20:34:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-1.0.4.ebuild,v 1.4 2012/06/24 18:56:19 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="image displayer for X"
 
-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=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
index 73470a746aaa..4c06ce389854 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.12.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-drivers/xorg-drivers-1.12.ebuild,v 1.7 2012/06/22 20:35:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.8 2012/06/24 18:57:20 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
diff --git a/x11-base/xorg-server/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
index 40a42e82062f..3dbe46837054 100644
--- a/x11-base/xorg-server/xorg-server-1.12.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.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-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.3 2012/06/22 20:36:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.4 2012/06/24 18:58:40 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit flag-o-matic 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta.ebuild
index 72f0778b6aa8..d4d5c42413c1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta.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-drivers/ati-drivers/ati-drivers-12.6_beta.ebuild,v 1.4 2012/06/22 20:36:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta.ebuild,v 1.5 2012/06/24 18:59:11 ago Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ fi
 IUSE="debug +modules multilib pax_kernel qt4 static-libs"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="1"
 
 RESTRICT="bindist"
diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20120320.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20120320.ebuild
index 68e648bb2239..e1e86b69cc4b 100644
--- a/x11-drivers/radeon-ucode/radeon-ucode-20120320.ebuild
+++ b/x11-drivers/radeon-ucode/radeon-ucode-20120320.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-drivers/radeon-ucode/radeon-ucode-20120320.ebuild,v 1.2 2012/06/22 20:37:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20120320.ebuild,v 1.3 2012/06/24 18:59:27 ago Exp $
 
 inherit linux-info
 
@@ -67,7 +67,7 @@ SRC_URI="${UCODE_FILES[@]/#/${UCODE_BASE_URI}/}"
 
 LICENSE="radeon-ucode"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_unpack() { :; }
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
index 02d0a7ef5606..32f6f9af603b 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.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/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild,v 1.7 2012/06/22 20:37:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild,v 1.8 2012/06/24 18:59:54 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server[udev]
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
index 266685cf5f92..a244abf1bb45 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.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/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild,v 1.3 2012/06/22 20:37:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild,v 1.4 2012/06/24 19:00:25 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for joystick input devices"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
index 4444f6f5d63b..3c8ee8fce77d 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.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/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild,v 1.3 2012/06/22 20:38:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild,v 1.4 2012/06/24 19:00:56 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Keyboard input driver"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
index c718597e4966..81c204f30a63 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.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/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild,v 1.3 2012/06/22 20:38:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild,v 1.4 2012/06/24 19:01:28 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.5.99.901"
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild
index 8eb5c850e6d1..d1cb5095a9b1 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.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-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild,v 1.3 2012/06/22 20:39:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild,v 1.4 2012/06/24 19:01:47 ago Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/BlueDragonX-xf86-input-mtrack-4d517e7"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="${RDEPEND}
 	>=sys-libs/mtdev-1.0"
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
index 2b25a5cdd0e4..a8e89adef68f 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.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-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild,v 1.2 2012/06/22 20:39:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild,v 1.3 2012/06/24 19:02:12 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/mtdev
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild
index 9c9c102d3764..0d7bb8dfe576 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.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-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild,v 1.2 2012/06/22 20:39:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild,v 1.3 2012/06/24 19:02:37 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="VMWare mouse input driver"
 IUSE=""
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 5d99073617eb..f4847944213a 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -2,3 +2,4 @@ DIST xf86-input-wacom-0.11.0.tar.bz2 490183 RMD160 7c6768eb058b5bc11bae540985c08
 DIST xf86-input-wacom-0.11.1.tar.bz2 505180 RMD160 ec282ff0d203ef70008ba43d8485bbca25e24282 SHA1 e8b0ec91a95a13a897d34c6ebe2af564e1ce3cb2 SHA256 9d32f94610f8faae3214227a8e8f050cd3b469b3fe9d60ef9272a884dcccb6ca
 DIST xf86-input-wacom-0.13.0.tar.bz2 508958 RMD160 23c3600f19fd8c3b51d14e7ad7927f5ee14883df SHA1 67d4b78728ea1474b7d312853cdcd613ff4c7c49 SHA256 3895b87d51c69224b36f7859911fc2b6a6e0017f1c6c620417e35e7083a6c7f4
 DIST xf86-input-wacom-0.14.0.tar.bz2 515278 RMD160 362cc49f5c805452ad94bc899c06d4fdaf98b2ff SHA1 3cc91315355b721b1959a8e9d7dc06587f3395af SHA256 929817ec7979d87432226245c687a1fdd211dcd3057c9d10dce72a933d80a69e
+DIST xf86-input-wacom-0.15.0.tar.bz2 528528 RMD160 132054aff24ae6fb8abef0189e7c23c7bc53e4c3 SHA1 6e8e4fa2ccc2448cae97119c6f2842fe283f9b29 SHA256 2e9b64c30fb223c46407bd0e105a54a1e83f378eb33ac68bd8a73fdbface000f
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
index 8522dd3f6b8f..240c44f976f1 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.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-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild,v 1.2 2012/06/22 20:40:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild,v 1.3 2012/06/24 19:03:03 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug"
 
 RDEPEND=">=x11-base/xorg-server-1.7
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild
new file mode 100644
index 000000000000..92888a49e5ee
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild,v 1.1 2012/06/23 19:30:40 ikelos Exp $
+
+EAPI=4
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
index 14b4ac349506..990fd1592228 100644
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
+++ b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.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-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild,v 1.3 2012/06/22 20:40:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild,v 1.4 2012/06/24 19:03:29 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Alliance ProMotion video driver"
 
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild
index fb6d69c6b379..cf2f71d3c7e1 100644
--- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild
+++ b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.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/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild,v 1.4 2012/06/22 20:40:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild,v 1.5 2012/06/24 19:03:56 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for ark cards"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild
index 5af76f1ab528..d27daa98a492 100644
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.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/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild,v 1.3 2012/06/22 20:41:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild,v 1.4 2012/06/24 19:04:21 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 LICENSE="MIT"
 IUSE=""
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
index 2585a66960dd..1714611137e8 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.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-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.5 2012/06/22 20:41:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.6 2012/06/24 19:05:06 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.33[video_cards_radeon]"
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
index 17b8d6a3d35c..2c9611ed27a6 100644
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.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/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild,v 1.3 2012/06/22 20:42:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild,v 1.4 2012/06/24 19:05:36 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild
index 1211a1285a78..f82d113af41d 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.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/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild,v 1.3 2012/06/22 20:42:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild,v 1.4 2012/06/24 19:06:09 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild
index 32bfc6a28bc3..d7569888eb3b 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.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/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild,v 1.3 2012/06/22 20:43:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild,v 1.4 2012/06/24 19:06:42 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="GLINT/Permedia video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
index 68c7a95ccd90..cea7a4b561ae 100644
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
+++ b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.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-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild,v 1.3 2012/06/22 20:43:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild,v 1.4 2012/06/24 19:07:08 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Number 9 I128 video driver"
 
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild
index 8883c65fd28f..6594d7e9ebec 100644
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild
+++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.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/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild,v 1.3 2012/06/22 20:43:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild,v 1.4 2012/06/24 19:07:34 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Intel i740 video driver"
 
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
index 1bf53cb55a32..621a6511ac8e 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.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-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.4 2012/06/22 20:44:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.5 2012/06/24 19:08:18 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.Org driver for Intel cards"
 
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd -x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd"
 IUSE="glamor sna"
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
index a3fdf34ee1e9..1be8d5dd4f3d 100644
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.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-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild,v 1.3 2012/06/22 20:44:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild,v 1.4 2012/06/24 19:08:55 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI Mach64 video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
index b1ddff70ea87..32f51ca7bf96 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.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-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild,v 1.3 2012/06/22 20:45:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild,v 1.4 2012/06/24 19:09:31 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.4"
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
index 36533891d225..42fce421339b 100644
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.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/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild,v 1.4 2012/06/22 20:45:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild,v 1.5 2012/06/24 19:10:03 ago Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild
index fd2470191254..c2e0a152b94d 100644
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.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/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild,v 1.3 2012/06/22 20:46:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild,v 1.4 2012/06/24 19:10:30 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
index cb7a928e4878..0005db76a1a1 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.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-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.3 2012/06/22 20:46:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.4 2012/06/24 19:10:59 ago Exp $
 
 EAPI=4
 XORG_EAUTORECONF="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="http://nouveau.freedesktop.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
index 76d0035b5979..937559f45853 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.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-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.2 2012/06/22 20:46:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.3 2012/06/24 11:16:53 ago Exp $
 
 EAPI=4
 XORG_DRI="dri"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.openchrome.org"
 SRC_URI="http://www.openchrome.org/releases/${P}.tar.bz2"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug viaregtool"
 
 RDEPEND=">=x11-base/xorg-server-1.9"
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild
index 74414e2040f3..f2368e679590 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.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/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild,v 1.2 2012/06/22 20:47:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild,v 1.3 2012/06/24 19:11:22 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="QEMU QXL paravirt video driver"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="xspice"
 
 RDEPEND="xspice? ( app-emulation/spice )
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
index 98175c49d559..90a47af03040 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.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/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild,v 1.2 2012/06/22 20:47:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild,v 1.3 2012/06/24 19:11:59 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild
index 2f22ca2f2cf4..741ab34bf5be 100644
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.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/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild,v 1.3 2012/06/22 20:48:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild,v 1.4 2012/06/24 19:12:29 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for s3 cards"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild
index f097a669dbd1..ba28a911184b 100644
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild
+++ b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.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/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild,v 1.3 2012/06/22 20:48:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild,v 1.4 2012/06/24 19:12:58 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="S3 ViRGE video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
index c21542ba4948..4ef9d6ecd8fa 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.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/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild,v 1.2 2012/06/22 20:49:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild,v 1.3 2012/06/24 19:13:33 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="S3 Savage video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild
index 170b056f6acc..4528509bc339 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.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/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild,v 1.3 2012/06/22 20:49:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild,v 1.4 2012/06/24 19:14:00 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Silicon Motion video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild
index 0e20a8494e71..2eb6af7f790d 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.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/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild,v 1.2 2012/06/22 20:49:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild,v 1.3 2012/06/24 19:14:26 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd"
 IUSE="dri"
 
 pkg_setup() {
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild
index 5bf561aa00d1..e7a76653ff9f 100644
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.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-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild,v 1.2 2012/06/22 20:50:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild,v 1.3 2012/06/24 19:14:53 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -8,7 +8,7 @@ XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="3Dfx video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild
index fcf5a04aa1c9..8f93b8bcaaa8 100644
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild
+++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.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/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild,v 1.3 2012/06/22 20:50:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild,v 1.4 2012/06/24 19:15:21 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Trident video driver"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
index 8068e3d4162b..790f2f83f588 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.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/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild,v 1.3 2012/06/22 20:50:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild,v 1.4 2012/06/24 19:15:49 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild
index a8301939ec4b..ed54b708f6fc 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.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-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild,v 1.2 2012/06/22 20:51:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild,v 1.3 2012/06/24 19:16:15 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ XORG_DRI=always
 inherit xorg-2
 
 DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
diff --git a/x11-libs/libFS/libFS-1.0.4.ebuild b/x11-libs/libFS/libFS-1.0.4.ebuild
index 77530538a637..e4b150b1fff1 100644
--- a/x11-libs/libFS/libFS-1.0.4.ebuild
+++ b/x11-libs/libFS/libFS-1.0.4.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/x11-libs/libFS/libFS-1.0.4.ebuild,v 1.2 2012/06/22 20:51:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.4.ebuild,v 1.3 2012/06/24 19:16:40 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
index 792a8693912b..ad6af18702b9 100644
--- a/x11-libs/libGLw/libGLw-8.0.0.ebuild
+++ b/x11-libs/libGLw/libGLw-8.0.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-libs/libGLw/libGLw-8.0.0.ebuild,v 1.2 2012/06/22 20:51:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libGLw/libGLw-8.0.0.ebuild,v 1.3 2012/06/24 19:16:58 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+motif static-libs"
 
 RDEPEND="
diff --git a/x11-libs/libICE/libICE-1.0.8.ebuild b/x11-libs/libICE/libICE-1.0.8.ebuild
index 5e829c03c13a..6e60103d7575 100644
--- a/x11-libs/libICE/libICE-1.0.8.ebuild
+++ b/x11-libs/libICE/libICE-1.0.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/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.3 2012/06/22 20:52:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.4 2012/06/24 19:17:30 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ICE library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libSM/libSM-1.2.1.ebuild b/x11-libs/libSM/libSM-1.2.1.ebuild
index fe20aa210948..9d2d4bc623b5 100644
--- a/x11-libs/libSM/libSM-1.2.1.ebuild
+++ b/x11-libs/libSM/libSM-1.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/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.3 2012/06/22 20:52:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.4 2012/06/24 19:18:03 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND=">=x11-libs/libICE-1.0.5
diff --git a/x11-libs/libX11/libX11-1.5.0.ebuild b/x11-libs/libX11/libX11-1.5.0.ebuild
index 0a1c0e771f6a..e84c7d711e1b 100644
--- a/x11-libs/libX11/libX11-1.5.0.ebuild
+++ b/x11-libs/libX11/libX11-1.5.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-libs/libX11/libX11-1.5.0.ebuild,v 1.2 2012/06/22 20:53:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.5.0.ebuild,v 1.3 2012/06/24 19:18:44 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.8.1
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
index 13a031bf7f48..950a932eda95 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.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/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.3 2012/06/22 20:53:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.4 2012/06/24 19:19:13 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
index f2f04f32d36a..9b3d18b9db0c 100644
--- a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
+++ b/x11-libs/libXTrap/libXTrap-1.0.0-r1.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/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild,v 1.3 2012/06/22 20:54:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild,v 1.4 2012/06/24 19:19:43 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org XTrap library"
 
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXau/libXau-1.0.7.ebuild b/x11-libs/libXau/libXau-1.0.7.ebuild
index aca05a16b17f..15828ab4008f 100644
--- a/x11-libs/libXau/libXau-1.0.7.ebuild
+++ b/x11-libs/libXau/libXau-1.0.7.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/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.3 2012/06/22 20:54:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.4 2012/06/24 19:20:10 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xau library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXaw/libXaw-1.0.11.ebuild b/x11-libs/libXaw/libXaw-1.0.11.ebuild
index 25fe2bba4d44..0460a8c13042 100644
--- a/x11-libs/libXaw/libXaw-1.0.11.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.11.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/libXaw/libXaw-1.0.11.ebuild,v 1.2 2012/06/22 20:55:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11.ebuild,v 1.3 2012/06/24 19:20:47 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcursor/libXcursor-1.1.13.ebuild b/x11-libs/libXcursor/libXcursor-1.1.13.ebuild
index 2adf81bbd363..e6006604172f 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.13.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.13.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/x11-libs/libXcursor/libXcursor-1.1.13.ebuild,v 1.3 2012/06/22 20:55:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.13.ebuild,v 1.4 2012/06/24 19:21:17 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
 
-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=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
index 224b077c9ccf..8a1aa9feda3a 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-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/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.3 2012/06/22 20:56:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.4 2012/06/24 19:21:48 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdmcp library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXext/libXext-1.3.1.ebuild b/x11-libs/libXext/libXext-1.3.1.ebuild
index b7140e046adc..e44d1fa15659 100644
--- a/x11-libs/libXext/libXext-1.3.1.ebuild
+++ b/x11-libs/libXext/libXext-1.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/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.3 2012/06/22 20:56:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.4 2012/06/24 19:22:22 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.2
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index f301dba39e69..2c31d4a8ce41 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,3 +1,2 @@
-DIST libXfont-1.4.3.tar.bz2 438358 RMD160 f1ad5b5f5e6d4c28aaaeedbe46f284408f267705 SHA1 191b40c566f80737cf6838747d86ebaee7b0c7d7 SHA256 f79245652901d20092092e942155d32b8dde15527637db3c09a1adc83672e9cc
 DIST libXfont-1.4.4.tar.bz2 440022 RMD160 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d SHA1 189dd7a3756cb80bcf41b779bf05ec3c366e3041 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
 DIST libXfont-1.4.5.tar.bz2 470879 RMD160 f7749eb4fb7f8e73921c45c5bdcb48fc5f9a0645 SHA1 0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e SHA256 bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
diff --git a/x11-libs/libXfont/libXfont-1.4.3.ebuild b/x11-libs/libXfont/libXfont-1.4.3.ebuild
deleted file mode 100644
index 9e30b3d27b10..000000000000
--- a/x11-libs/libXfont/libXfont-1.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.3.ebuild,v 1.10 2011/02/14 14:50:53 xarthisius Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc ipv6"
-
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	>=media-libs/freetype-2
-	app-arch/bzip2
-	x11-proto/xproto
-	x11-proto/fontsproto"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		--with-bzip2
-		--without-fop
-		--with-encodingsdir=${EPREFIX}/usr/share/fonts/encodings"
-}
diff --git a/x11-libs/libXfont/libXfont-1.4.4.ebuild b/x11-libs/libXfont/libXfont-1.4.4.ebuild
index 06437fa4a4aa..fe15470b0616 100644
--- a/x11-libs/libXfont/libXfont-1.4.4.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.4.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/x11-libs/libXfont/libXfont-1.4.4.ebuild,v 1.7 2011/08/15 15:24:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.4.ebuild,v 1.8 2012/06/23 20:24:47 scarabeus Exp $
 
 EAPI=4
 
@@ -28,6 +28,5 @@ pkg_setup() {
 		$(use_with doc xmlto)
 		--with-bzip2
 		--without-fop
-		--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
 	)
 }
diff --git a/x11-libs/libXfont/libXfont-1.4.5.ebuild b/x11-libs/libXfont/libXfont-1.4.5.ebuild
index 89d73a4b5235..a586421de1ea 100644
--- a/x11-libs/libXfont/libXfont-1.4.5.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.5.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/libXfont/libXfont-1.4.5.ebuild,v 1.4 2012/06/22 20:57:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5.ebuild,v 1.6 2012/06/24 19:22:58 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-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"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
@@ -20,14 +20,13 @@ RDEPEND="x11-libs/xtrans
 	x11-proto/fontsproto"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
 		--with-bzip2
 		--without-fop
-		--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
 	)
+	xorg-2_src_configure
 }
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
index 0eb10f236da5..f99b340d4c24 100644
--- a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
+++ b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.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/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild,v 1.2 2012/06/22 20:57:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild,v 1.3 2012/06/24 19:23:24 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xfontcache library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXft/libXft-2.3.1.ebuild b/x11-libs/libXft/libXft-2.3.1.ebuild
index 770bddf971d5..8c47c9042179 100644
--- a/x11-libs/libXft/libXft-2.3.1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.1.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/x11-libs/libXft/libXft-2.3.1.ebuild,v 1.2 2012/06/22 20:57:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.1.ebuild,v 1.3 2012/06/24 19:23:57 ago Exp $
 
 EAPI=4
 inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXi/libXi-1.6.1.ebuild b/x11-libs/libXi/libXi-1.6.1.ebuild
index 0c6abe6d9701..d80ba7c9b09f 100644
--- a/x11-libs/libXi/libXi-1.6.1.ebuild
+++ b/x11-libs/libXi/libXi-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/x11-libs/libXi/libXi-1.6.1.ebuild,v 1.3 2012/06/22 20:58:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.1.ebuild,v 1.4 2012/06/24 19:24:38 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.99.1
diff --git a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild b/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
index fcdea4f1f903..a0ef80f1267a 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.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/x11-libs/libXinerama/libXinerama-1.1.2.ebuild,v 1.3 2012/06/22 20:58:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.2.ebuild,v 1.4 2012/06/24 19:25:10 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
index 9c9f26cea74a..5b352bf175e9 100644
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ b/x11-libs/libXmu/libXmu-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/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.3 2012/06/22 20:59:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.4 2012/06/24 19:25:44 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-libs/libXpm/libXpm-3.5.10.ebuild b/x11-libs/libXpm/libXpm-3.5.10.ebuild
index 56f4ace10f8d..152c73bb3719 100644
--- a/x11-libs/libXpm/libXpm-3.5.10.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.10.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/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.4 2012/06/22 20:59:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.5 2012/06/24 19:26:16 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXrender/libXrender-0.9.7.ebuild b/x11-libs/libXrender/libXrender-0.9.7.ebuild
index 2766f35af353..dbb910740fc4 100644
--- a/x11-libs/libXrender/libXrender-0.9.7.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.7.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/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.3 2012/06/22 21:00:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.4 2012/06/24 19:26:45 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXres/libXres-1.0.6.ebuild b/x11-libs/libXres/libXres-1.0.6.ebuild
index 9fe234bbae9a..da678ef19c71 100644
--- a/x11-libs/libXres/libXres-1.0.6.ebuild
+++ b/x11-libs/libXres/libXres-1.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-libs/libXres/libXres-1.0.6.ebuild,v 1.3 2012/06/22 21:00:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.6.ebuild,v 1.4 2012/06/24 19:27:15 ago Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
 DESCRIPTION="X.Org XRes library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXt/libXt-1.1.3.ebuild b/x11-libs/libXt/libXt-1.1.3.ebuild
index 4be396d60d9c..ef01d4e4155b 100644
--- a/x11-libs/libXt/libXt-1.1.3.ebuild
+++ b/x11-libs/libXt/libXt-1.1.3.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/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.3 2012/06/22 21:01:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.4 2012/06/24 19:27:45 ago Exp $
 
 EAPI=4
 inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXtst/libXtst-1.2.1.ebuild b/x11-libs/libXtst/libXtst-1.2.1.ebuild
index fb691f4ed296..50fbb9771cab 100644
--- a/x11-libs/libXtst/libXtst-1.2.1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.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/x11-libs/libXtst/libXtst-1.2.1.ebuild,v 1.3 2012/06/22 21:01:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.2.1.ebuild,v 1.4 2012/06/24 19:28:23 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xtst library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXv/libXv-1.0.7.ebuild b/x11-libs/libXv/libXv-1.0.7.ebuild
index 6002601b8235..8149fb5c8117 100644
--- a/x11-libs/libXv/libXv-1.0.7.ebuild
+++ b/x11-libs/libXv/libXv-1.0.7.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/x11-libs/libXv/libXv-1.0.7.ebuild,v 1.3 2012/06/22 21:02:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.7.ebuild,v 1.4 2012/06/24 19:28:52 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXvMC/libXvMC-1.0.7.ebuild b/x11-libs/libXvMC/libXvMC-1.0.7.ebuild
index fd7afe360b2a..67fc86552587 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.7.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.7.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/x11-libs/libXvMC/libXvMC-1.0.7.ebuild,v 1.3 2012/06/22 21:02:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.7.ebuild,v 1.4 2012/06/24 19:29:23 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org XvMC library"
 
-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 ~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 ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
index 3d690cf73025..9d02f14c2c67 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.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/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.4 2012/06/22 21:02:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.5 2012/06/24 19:29:55 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild
index 3f7e26968654..18362c35a6b0 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.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/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild,v 1.3 2012/06/22 21:03:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild,v 1.4 2012/06/24 19:30:25 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdmx/libdmx-1.1.2.ebuild b/x11-libs/libdmx/libdmx-1.1.2.ebuild
index 31593997e9cb..7848fa936506 100644
--- a/x11-libs/libdmx/libdmx-1.1.2.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.2.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/x11-libs/libdmx/libdmx-1.1.2.ebuild,v 1.3 2012/06/22 21:03:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdmx/libdmx-1.1.2.ebuild,v 1.4 2012/06/24 19:30:55 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx library"
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 06f289fc2de5..349b71735cbd 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,2 +1 @@
-DIST arandr-0.1.5.tar.gz 70143 RMD160 c8a10ebf182eb37f45cfc3853537ff185d7d2295 SHA1 46d6d513030153408620a17bab155e15269c6139 SHA256 d43e782a9a90e3189360ea45115617fd669edbc3ca7ed84bfa93b43f8b30ff34
 DIST arandr-0.1.6.tar.gz 76064 RMD160 dd9d6b6d16e1cb96e923bb0b00f70918e322180c SHA1 b13585ec5335e68209bb9ed77e34e551c3d55ada SHA256 252bbeab69dae3c8e2176883e09ccfa8b4309905964bc8a2aab26cec2b33743f
diff --git a/x11-misc/arandr/arandr-0.1.5.ebuild b/x11-misc/arandr/arandr-0.1.5.ebuild
deleted file mode 100644
index 9315287756ad..000000000000
--- a/x11-misc/arandr/arandr-0.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/arandr-0.1.5.ebuild,v 1.1 2011/11/16 16:15:03 jer Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="A simple visual frontend for XRandR 1.2/1.3"
-HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
-SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2
-	x11-apps/xrandr"
-DEPEND=">=dev-python/docutils-0.6"
-
-PYTHON_MODNAME=screenlayout
diff --git a/x11-misc/autocutsel/autocutsel-0.9.0.ebuild b/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
index ec30c3cf1b43..71b6b0ced0aa 100644
--- a/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.9.0.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/x11-misc/autocutsel/autocutsel-0.9.0.ebuild,v 1.7 2012/01/04 22:03:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/autocutsel/autocutsel-0.9.0.ebuild,v 1.8 2012/06/23 23:31:39 xmw Exp $
 
 DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
-HOMEPAGE="http://www.lepton.fr/tools/autocutsel/"
+HOMEPAGE="http://www.nongnu.org/autocutsel/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 IUSE=""
 
diff --git a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
deleted file mode 100644
index ef208a7f11af..000000000000
--- a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Install dir:
-    /usr/libexec/lightdm-guest-session-wrapper
-    /usr/libexec/lightdm-set-defaults
-    /usr/libexec/lightdm/gdmflexiserver
-
-Due to the following change, pkglibexec_SCRIPTS is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
- utils/Makefile.am |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 41df48b..ee527cf 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,6 +1,7 @@
- bin_PROGRAMS = dm-tool
- libexec_PROGRAMS = lightdm-set-defaults
--dist_pkglibexec_SCRIPTS = gdmflexiserver
-+ldmlibexecdir = $(libexecdir)/@PACKAGE@
-+dist_ldmlibexec_SCRIPTS = gdmflexiserver
- 
- dm_tool_SOURCES = \
- 	dm-tool.c
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
index 9d165d6d9cc5..decfba3438b7 100644
--- a/x11-misc/lightdm/files/lightdm-autologin
+++ b/x11-misc/lightdm/files/lightdm-autologin
@@ -1,10 +1,6 @@
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       required		pam_nologin.so
-auth       required		pam_permit.so
-account    include		system-login
-password   include		system-login
-session    include		system-auth
-# For the keyring to unlock with autologin, you need to set an empty
-# password on the keyring.
-#Keyring=session    optional		pam_gnome_keyring.so auto_start
+auth	optional	pam_env.so
+auth	required	pam_nologin.so
+auth	required	pam_permit.so
+
+account	include		system-local-login
+session	include		system-local-login
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild
deleted file mode 100644
index 7785dda2af4c..000000000000
--- a/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild,v 1.2 2012/06/04 23:23:38 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	sys-apps/accountsservice
-	virtual/pam
-	x11-libs/libxklavier
-	x11-libs/libX11
-	introspection? ( dev-libs/gobject-introspection )
-	qt4? ( x11-libs/qt-core:4
-		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( NEWS )
-
-src_prepare() {
-	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
-	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
-
-	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
-	epatch_user
-
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	# do the actual configuration
-	econf --localstatedir=/var \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Install missing files
-	insinto /etc/${PN}/
-	doins "${S}"/data/{${PN},users,keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# remove .la files
-	find "${ED}" -name "*.la" -exec rm -rf {} +
-	rm -Rf "${ED}"/etc/init || die
-
-	dopamd "${FILESDIR}"/${PN}
-	dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
-	elog
-	elog "You will need to install a greeter as actual GUI for LightDM."
-	elog
-	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
-	elog "most users, make sure you configure it to suit your needs"
-	elog "before using ${PN} for the first time."
-	elog "You can test the configuration file using the following"
-	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
-	elog "requires xorg-server to be built with the 'kdrive' useflag."
-	elog
-	elog "You can also set your own default values for LIGHTDM_GREETER,"
-	elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
-	elog
-}
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild
similarity index 85%
rename from x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
rename to x11-misc/lightdm/lightdm-1.2.2-r3.ebuild
index 96ed3129d1b0..aa345efa20d4 100644
--- a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.2.2-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/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.2 2012/06/21 07:37:15 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild,v 1.1 2012/06/24 12:29:34 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -21,10 +21,12 @@ COMMON_DEPEND="dev-libs/glib:2
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
-	introspection? ( dev-libs/gobject-introspection )
-	qt4? ( x11-libs/qt-core:4
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		x11-libs/qt-core:4
 		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
+		x11-libs/qt-gui:4
+		)"
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/pambase-20101024-r2"
 DEPEND="${COMMON_DEPEND}
@@ -41,7 +43,7 @@ src_prepare() {
 	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
 
 	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.2.0-fix-configure.patch
 	epatch_user
 
 	if has_version dev-libs/gobject-introspection; then
@@ -63,7 +65,8 @@ src_configure() {
 	einfo "Default session: ${_session}"
 	einfo "Greeter user: ${_user}"
 
-	econf --localstatedir=/var \
+	econf \
+		--localstatedir=/var \
 		--disable-static \
 		$(use_enable introspection) \
 		$(use_enable qt4 liblightdm-qt) \
@@ -76,19 +79,16 @@ src_configure() {
 src_install() {
 	default
 
-	# Install missing files
 	insinto /etc/${PN}
 	doins data/{${PN},users,keys}.conf
 	doins "${FILESDIR}"/Xsession
 	fperms +x /etc/${PN}/Xsession
 
-	# Remove unnecessary files
 	prune_libtool_files --all
 	rm -rf "${ED}"/etc/init
 
-	# Install proper pam files
-	pamd_mimic system-local-login ${PN} auth account session
-	pamd_mimic system-local-login ${PN}-autologin auth account session
+	pamd_mimic system-local-login ${PN} auth account session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
 }
 
 pkg_postinst() {
diff --git a/x11-misc/lightdm/lightdm-1.2.2.ebuild b/x11-misc/lightdm/lightdm-1.2.2.ebuild
deleted file mode 100644
index 80cfca3026a4..000000000000
--- a/x11-misc/lightdm/lightdm-1.2.2.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/x11-misc/lightdm/lightdm-1.2.2.ebuild,v 1.3 2012/06/04 23:23:38 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="dev-libs/glib:2
-	virtual/pam
-	x11-libs/libxklavier
-	x11-libs/libX11
-	dev-libs/libxml2
-	introspection? ( dev-libs/gobject-introspection )
-	sys-apps/accountsservice"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	sys-devel/gettext
-	dev-util/gtk-doc-am"
-PDEPEND="x11-misc/lightdm-gtk-greeter"
-
-DOCS=( NEWS )
-
-src_prepare() {
-	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
-	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
-
-	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch_user
-
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Maybe in the future, we can support some automatic session and user
-	# recognition. Until then, use default values
-	local default=gnome user=root greeter
-
-	# There is no qt greeter, so use gtk anyway
-	# use gtk && greeter=lightdm-gtk-greeter
-	greeter=lightdm-gtk-greeter
-
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${greeter}"
-	einfo "Default session: ${default}"
-	einfo "Greeter user: ${user}"
-
-	# do the actual configuration
-	econf --localstatedir=/var \
-		--disable-static \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		--with-user-session=${user} \
-		--with-greeter-session=${greeter} \
-		--with-greeter-user=${user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Install missing files
-	insinto /etc/${PN}/
-	doins "${S}"/data/{${PN},users,keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# remove .la files
-	find "${ED}" -name "*.la" -exec rm -rf {} +
-	rm -Rf "${ED}"/etc/init || die
-
-	dopamd "${FILESDIR}"/${PN}
-	dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
-	elog
-	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
-	elog "most users, make sure you configure it to suit your needs"
-	elog "before using ${PN} for the first time."
-	elog "You can test the configuration file using the following"
-	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
-	elog "requires xorg-server to be built with the 'kdrive' useflag."
-	elog
-}
diff --git a/x11-misc/slim/slim-1.3.3.ebuild b/x11-misc/slim/slim-1.3.3.ebuild
index 8a4f3a3df048..4f26ad9bbd2f 100644
--- a/x11-misc/slim/slim-1.3.3.ebuild
+++ b/x11-misc/slim/slim-1.3.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-misc/slim/slim-1.3.3.ebuild,v 1.5 2012/05/19 13:03:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.6 2012/06/23 20:25:30 lu_zero Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
index a85974816ecd..3711795ccfcb 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-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/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild,v 1.4 2012/05/05 04:53:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild,v 1.5 2012/06/23 23:28:43 xmw Exp $
 
 inherit eutils
 
 DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl/"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="http://tomas.styblo.name/wmctrl/"
+SRC_URI="http://tomas.styblo.name/${PN}/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/wmctrl/wmctrl-1.07.ebuild b/x11-misc/wmctrl/wmctrl-1.07.ebuild
index 1421b0bb7d97..52249210325f 100644
--- a/x11-misc/wmctrl/wmctrl-1.07.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07.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/x11-misc/wmctrl/wmctrl-1.07.ebuild,v 1.8 2012/05/05 04:53:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmctrl/wmctrl-1.07.ebuild,v 1.9 2012/06/23 23:28:43 xmw Exp $
 
 DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl/"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="http://tomas.styblo.name/wmctrl/"
+SRC_URI="http://tomas.styblo.name/${PN}/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xosview/xosview-1.9.3.ebuild b/x11-misc/xosview/xosview-1.9.3.ebuild
index 1e574fed4b24..b76540a898ab 100644
--- a/x11-misc/xosview/xosview-1.9.3.ebuild
+++ b/x11-misc/xosview/xosview-1.9.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-misc/xosview/xosview-1.9.3.ebuild,v 1.2 2012/04/25 18:02:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.9.3.ebuild,v 1.3 2012/06/24 10:36:45 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild
index 53deaa32a038..819a34f91360 100644
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r6.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/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild,v 1.3 2011/05/27 11:19:33 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/slim-themes/slim-themes-1.2.3a-r6.ebuild,v 1.4 2012/06/23 20:22:09 lu_zero Exp $
 
 EAPI=2
 inherit eutils
@@ -31,7 +31,7 @@ SRC_URI="mirror://berlios/slim/slim-1.2.3-themepack1a.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-misc/slim"